From: Yoshito Umaoka Date: Thu, 12 Oct 2017 12:24:55 +0000 (+0000) Subject: ICU-13419 Imported the latest CLDR 32 locale data, updated some test cases. X-Git-Tag: cldr-32-beta2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6873ed8e2c27d97bb6d51959973f5ea77b5915ff;p=icu ICU-13419 Imported the latest CLDR 32 locale data, updated some test cases. X-SVN-Rev: 40616 --- diff --git a/icu4c/source/data/curr/fi.txt b/icu4c/source/data/curr/fi.txt index dc6a46a1e05..2fd0e624a30 100644 --- a/icu4c/source/data/curr/fi.txt +++ b/icu4c/source/data/curr/fi.txt @@ -2504,5 +2504,5 @@ fi{ one{"{0} {1}"} other{"{0} {1}"} } - Version{"2.1.37.1"} + Version{"2.1.37.67"} } diff --git a/icu4c/source/data/lang/fi.txt b/icu4c/source/data/lang/fi.txt index 2bf7077bf5d..e072633c1ab 100644 --- a/icu4c/source/data/lang/fi.txt +++ b/icu4c/source/data/lang/fi.txt @@ -1117,7 +1117,7 @@ fi{ Variants%secondary{ FONUPA{"suomalais-ugrilainen tarkekirjoitus"} } - Version{"2.1.37.1"} + Version{"2.1.37.67"} characterLabelPattern{ all{"{0} – kaikki"} category-list{"{0}: {1}"} diff --git a/icu4c/source/data/locales/fi.txt b/icu4c/source/data/locales/fi.txt index eaa85697317..76ae568bef9 100644 --- a/icu4c/source/data/locales/fi.txt +++ b/icu4c/source/data/locales/fi.txt @@ -190,7 +190,7 @@ fi{ symbols{ decimal{","} exponential{"E"} - group{" "} + group{" "} infinity{"∞"} list{";"} minusSign{"−"} @@ -214,7 +214,7 @@ fi{ minimumGroupingDigits{"1"} native{"latn"} } - Version{"2.1.37.1"} + Version{"2.1.37.67"} calendar{ buddhist{ DateTimePatterns{ @@ -675,9 +675,9 @@ fi{ Ehm{"E h.mm a"} Ehms{"E h.mm.ss a"} Gy{"y G"} - GyMMM{"LLLL y G"} - GyMMMEd{"E d.M.y G"} - GyMMMd{"d.M.y G"} + GyMMM{"LLL y G"} + GyMMMEd{"E d. MMM y G"} + GyMMMd{"d. MMM y G"} H{"H"} Hm{"H.mm"} Hms{"H.mm.ss"} @@ -685,14 +685,14 @@ fi{ Hmv{"H.mm v"} M{"L"} MEd{"E d.M."} - MMM{"LLLL"} - MMMEd{"ccc d.M."} + MMM{"LLL"} + MMMEd{"ccc d. MMM"} MMMMW{ one{"LLLL'n' W. 'viikko'"} other{"LLLL'n' W. 'viikko'"} } MMMMd{"d. MMMM"} - MMMd{"d.M."} + MMMd{"d. MMM"} Md{"d.M."} d{"d"} h{"h a"} @@ -705,11 +705,11 @@ fi{ yM{"L.y"} yMEd{"E d.M.y"} yMM{"M.y"} - yMMM{"M.y"} - yMMMEd{"E d.M.y"} + yMMM{"LLL y"} + yMMMEd{"E d. MMM y"} yMMMM{"LLLL y"} yMMMMccccd{"cccc d. MMMM y"} - yMMMd{"d.M.y"} + yMMMd{"d. MMM y"} yMd{"d.M.y"} yQQQ{"QQQ y"} yQQQQ{"QQQQ y"} diff --git a/icu4c/source/data/region/fi.txt b/icu4c/source/data/region/fi.txt index feaaf5c268a..e902c1c412d 100644 --- a/icu4c/source/data/region/fi.txt +++ b/icu4c/source/data/region/fi.txt @@ -311,5 +311,5 @@ fi{ MK{"EJT Makedonia"} TL{"Timor-Leste"} } - Version{"2.1.37.1"} + Version{"2.1.37.67"} } diff --git a/icu4c/source/data/unit/fi.txt b/icu4c/source/data/unit/fi.txt index 87b05808dbc..12dec08c1dc 100644 --- a/icu4c/source/data/unit/fi.txt +++ b/icu4c/source/data/unit/fi.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html#License fi{ - Version{"2.1.37.1"} + Version{"2.1.37.67"} durationUnits{ hm{"h.mm"} hms{"h.mm.ss"} diff --git a/icu4c/source/data/zone/fi.txt b/icu4c/source/data/zone/fi.txt index d84c9d4b7aa..31d1e426477 100644 --- a/icu4c/source/data/zone/fi.txt +++ b/icu4c/source/data/zone/fi.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html#License fi{ - Version{"2.1.37.1"} + Version{"2.1.37.67"} zoneStrings{ "Africa:Abidjan"{ ec{"Abidjan"} diff --git a/icu4c/source/test/intltest/dtptngts.cpp b/icu4c/source/test/intltest/dtptngts.cpp index 739276ce76e..2ecd32c0c4e 100644 --- a/icu4c/source/test/intltest/dtptngts.cpp +++ b/icu4c/source/test/intltest/dtptngts.cpp @@ -143,11 +143,11 @@ void IntlTestDateTimePatternGeneratorAPI::testAPI(/*char *par*/) // fi // 3 fi UnicodeString("1.1999"), // 00: yM (fixed expected result per ticket:6626:) - UnicodeString("1.1999"), // 01: yMMM + UnicodeString("tammi 1999"), // 01: yMMM UnicodeString("13.1.1999"), // 02: yMd - UnicodeString("13.1.1999"), // 03: yMMMd + UnicodeString("13. tammik. 1999"), // 03: yMMMd UnicodeString("13.1."), // 04: Md - UnicodeString("13.1."), // 05: MMMd + UnicodeString("13. tammik."), // 05: MMMd UnicodeString("13. tammikuuta"), // 06: MMMMd UnicodeString("1. nelj. 1999"), // 07: yQQQ UnicodeString("11.58 ip."), // 08: hhmm @@ -155,7 +155,7 @@ void IntlTestDateTimePatternGeneratorAPI::testAPI(/*char *par*/) UnicodeString("23.58"), // 10: jjmm UnicodeString("58.59"), // 11: mmss UnicodeString("tammikuu 1999"), // 12: yyyyMMMM - UnicodeString("ke 13.1."), // 13: MMMEd -> EEE d. MMM + UnicodeString("ke 13. tammik."), // 13: MMMEd -> EEE d. MMM UnicodeString("ke 13."), // 14: Ed -> ccc d. UnicodeString("23.58.59,123"), // 15: jmmssSSS -> "H.mm.ss,SSS" UnicodeString("23.58"), // 16: JJmm diff --git a/icu4j/main/shared/data/icudata.jar b/icu4j/main/shared/data/icudata.jar index 4b16b7948a8..33c493ce966 100755 --- a/icu4j/main/shared/data/icudata.jar +++ b/icu4j/main/shared/data/icudata.jar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:af06fc6894d8a366d1d9a12f68d1562ca602ddbcf574673aadc0a017f01583a8 -size 12459424 +oid sha256:9d9e1962263203f4c7c071c58cc0da6f23212294b163f6a7047df4e858c908c8 +size 12459520 diff --git a/icu4j/main/shared/data/icutzdata.jar b/icu4j/main/shared/data/icutzdata.jar index 1ff46ae68b1..06f6e4f2a21 100755 --- a/icu4j/main/shared/data/icutzdata.jar +++ b/icu4j/main/shared/data/icutzdata.jar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:07ca360bece76117efc098b97cf6bf082df398e4afe6150081de59a9d8f1a940 +oid sha256:8fadf7128f36cdc4d838a57d07e526f08a91ed0de53500cfd5ea84f33c9ca67b size 92486 diff --git a/icu4j/main/shared/data/testdata.jar b/icu4j/main/shared/data/testdata.jar index 3c2fe03bcbd..d8e435742b9 100755 --- a/icu4j/main/shared/data/testdata.jar +++ b/icu4j/main/shared/data/testdata.jar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bc37dab789d1d29379040fa938b58d63a21d0e8bf5e7b6ec07a7e6e26fc0cab7 +oid sha256:49fc3149b6f7691682845386826d43267e196a0286eef1dc9ffaf7100690cab1 size 813106 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateTimeGeneratorTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateTimeGeneratorTest.java index c75727a45d1..fe4e9111097 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateTimeGeneratorTest.java +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateTimeGeneratorTest.java @@ -427,11 +427,11 @@ public class DateTimeGeneratorTest extends TestFmwk { new ULocale("fi"), new String[] {"yM", "1.1999"}, // (fixed expected result per ticket 6872<-6626) - new String[] {"yMMM", "1.1999"}, // (fixed expected result per ticket 6872<-7007) + new String[] {"yMMM", "tammi 1999"}, // (fixed expected result per ticket 6872<-7007) new String[] {"yMd", "13.1.1999"}, - new String[] {"yMMMd", "13.1.1999"}, + new String[] {"yMMMd", "13. tammik. 1999"}, new String[] {"Md", "13.1."}, - new String[] {"MMMd", "13.1."}, + new String[] {"MMMd", "13. tammik."}, new String[] {"MMMMd", "13. tammikuuta"}, new String[] {"yQQQ", "1. nelj. 1999"}, new String[] {"hhmm", "11.58 ip."}, @@ -439,7 +439,7 @@ public class DateTimeGeneratorTest extends TestFmwk { new String[] {"jjmm", "23.58"}, new String[] {"mmss", "58.59"}, new String[] {"yyyyMMMM", "tammikuu 1999"}, // (new item for testing 6872<-5702,7007) - new String[] {"MMMEd", "ke 13.1."}, + new String[] {"MMMEd", "ke 13. tammik."}, new String[] {"Ed", "ke 13."}, new String[] {"jmmssSSS", "23.58.59,123"}, new String[] {"JJmm", "23.58"},