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 dc6a46a1e057c5773640566e50dd464866fb3960..2fd0e624a30275dc87ed10ad8566f9e7db48f308 100644 (file)
--- 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 2bf7077bf5d9807cefdbe3f9886dc15f7fb503e3..e072633c1aba5083f7b7fba82d59de068384a6ff 100644 (file)
--- 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 eaa85697317d7c15f1b1d5f238a50a36b2a0de7e..76ae568bef9906a7b68f25e2ad2f3506e2777f32 100644 (file)
--- 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 feaaf5c268a71caefd7cdc0ccdea94b8056db9a4..e902c1c412d3c396067010de68c8af253b1dbf96 100644 (file)
--- 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 87b05808dbcc2459ceb8056a76686a810bcd8a58..12dec08c1dc1ad25bf3025df758c708d0e192239 100644 (file)
--- 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 d84c9d4b7aab9fca196418142f0c53fb34bf004b..31d1e4264774c104eb66289d9de7dca75ab4b9da 100644 (file)
--- 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 739276ce76e663aeac34060051d0c6f22b53bae4..2ecd32c0c4ef487ecfb904339d608764cdafe947 100644 (file)
--- 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 4b16b7948a88b667804b79f65043e709adbc311c..33c493ce9660a33834b90ed610d1a735ee8ba433 100755 (executable)
--- 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 1ff46ae68b198f5dc5c8f151b7e390956d73ea6a..06f6e4f2a2138e8a6bde9ae27f2effc370e9b9c9 100755 (executable)
--- 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 3c2fe03bcbd3ee3e4695c63bcb221530d01b9247..d8e435742b9548a1b646e5335719ae464255f2c4 100755 (executable)
--- 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 c75727a45d1a74c531e611f4684954729d451c47..fe4e9111097a0d7da88736f3b1b289b82e22f613 100644 (file)
--- 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"},