]> granicus.if.org Git - icu/commitdiff
ICU-13005 Integrate data from CLDR final release-31; known issue with sw negative...
authorPeter Edberg <pedberg@unicode.org>
Mon, 20 Mar 2017 04:22:36 +0000 (04:22 +0000)
committerPeter Edberg <pedberg@unicode.org>
Mon, 20 Mar 2017 04:22:36 +0000 (04:22 +0000)
X-SVN-Rev: 39882

20 files changed:
icu4c/source/data/curr/my.txt
icu4c/source/data/curr/si.txt
icu4c/source/data/curr/sw.txt
icu4c/source/data/lang/my.txt
icu4c/source/data/lang/si.txt
icu4c/source/data/lang/sw.txt
icu4c/source/data/locales/my.txt
icu4c/source/data/locales/si.txt
icu4c/source/data/locales/sw.txt
icu4c/source/data/region/my.txt
icu4c/source/data/region/si.txt
icu4c/source/data/region/sw.txt
icu4c/source/data/unit/my.txt
icu4c/source/data/unit/si.txt
icu4c/source/data/unit/sw.txt
icu4c/source/data/zone/my.txt
icu4c/source/data/zone/si.txt
icu4c/source/data/zone/sw.txt
icu4j/main/shared/data/icudata.jar
icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/CompactDecimalFormatTest.java

index 6b2c626ef891573df18d953e981657c278f30242..2294223ca1fea3211ce44346b72681e36d61d5f8 100644 (file)
@@ -1301,5 +1301,5 @@ my{
             other{"ဇင်ဘာဘွေခွါးချာ"}
         }
     }
-    Version{"2.1.32.60"}
+    Version{"2.1.33.28"}
 }
index 379dddfe16fc667cb71a87f2c0f7c61b73294fc3..ddfa3c8a8e2fa141452305bde015c6d5ead1d79c 100644 (file)
@@ -1373,5 +1373,5 @@ si{
         one{"{1}{0}"}
         other{"{1}{0}"}
     }
-    Version{"2.1.31.96"}
+    Version{"2.1.33.28"}
 }
index 1bc8aecd92bc9d974cc3297daafef4f98eba76af..958b89c13124f5a427cba92945594f77fa1927f7 100644 (file)
@@ -1408,5 +1408,5 @@ sw{
         one{"{1} {0}"}
         other{"{1} {0}"}
     }
-    Version{"2.1.31.96"}
+    Version{"2.1.33.28"}
 }
index ed19b30f98881c5a67cececfce4cd16f0d8da877..6f3b1315dd8523c003c6d5916fb42b5b4835c8bf 100644 (file)
@@ -580,7 +580,7 @@ my{
         REVISED{"ပြန်လည်စီစစ်ထားသော ရေးထုံး"}
         SCOTLAND{"စကော့ စံ အင်္ဂလိပ်"}
     }
-    Version{"2.1.32.60"}
+    Version{"2.1.33.28"}
     characterLabelPattern{
         all{"{0} — အားလုံး"}
         category-list{"{0} − {1}"}
index 0b58fd6544e77c34ff4fc7bd4f9e07c21d84f83f..d20cb60dd0ad349034a555c61d792c40abeedf71 100644 (file)
@@ -547,7 +547,7 @@ si{
             tibt{"ටිබෙට ඉලක්කම්"}
         }
     }
-    Version{"2.1.31.96"}
+    Version{"2.1.33.28"}
     characterLabelPattern{
         all{"{0} — සියල්ල"}
         category-list{"{0}: {1}"}
index d2b542c6d1bfb836de203cd1665ccde4c50b2f1a..4a3fca30c873e8430243a80585091954a62b6937 100644 (file)
@@ -637,7 +637,7 @@ sw{
             vaii{"Dijiti za Vai"}
         }
     }
-    Version{"2.1.31.96"}
+    Version{"2.1.33.28"}
     characterLabelPattern{
         all{"{0} — Zote"}
         category-list{"{0}: {1}"}
index 852e661def8a625bd16ff4f210d77a86a7b16862..b90f629d457d90069e859959153c266192d7dc17 100644 (file)
@@ -131,19 +131,19 @@ my{
                         other{"00ကုဋေ"}
                     }
                     1000000000{
-                        other{"ကုဋေ000;ကုဋေ-000"}
+                        other{"ကုဋေ000"}
                     }
                     10000000000{
-                        other{"ကုဋေ0ထ;ကုဋေ-0ထ"}
+                        other{"ကုဋေ0ထ"}
                     }
                     100000000000{
-                        other{"ကုဋေ0သ;ကုဋေ-0သ"}
+                        other{"ကုဋေ0သ"}
                     }
                     1000000000000{
-                        other{"ဋေ0သိန်း;ဋေ-0သိန်း"}
+                        other{"ဋေ0သိန်း"}
                     }
                     10000000000000{
-                        other{"ဋေ0သန်း;ဋေ-0သန်း"}
+                        other{"ဋေ0သန်း"}
                     }
                     100000000000000{
                         other{"0ကောဋိ"}
@@ -192,7 +192,7 @@ my{
         }
         native{"mymr"}
     }
-    Version{"2.1.32.60"}
+    Version{"2.1.33.28"}
     calendar{
         generic{
             DateTimePatterns{
index 9f3ec58e90293b22762207a2386de38537eadfad..5a37c0b043c3b463168a0579a6590a2593a10b99 100644 (file)
@@ -41,52 +41,52 @@ si{
             patternsLong{
                 decimalFormat{
                     1000{
-                        one{"දහස 0;දහස -0"}
-                        other{"දහස 0;දහස -0"}
+                        one{"දහස 0"}
+                        other{"දහස 0"}
                     }
                     10000{
-                        one{"දහස 00;දහස -00"}
-                        other{"දහස 00;දහස -00"}
+                        one{"දහස 00"}
+                        other{"දහස 00"}
                     }
                     100000{
-                        one{"දහස 000;දහස -000"}
-                        other{"දහස 000;දහස -000"}
+                        one{"දහස 000"}
+                        other{"දහස 000"}
                     }
                     1000000{
-                        one{"මිලියන 0;මිලියන -0"}
-                        other{"මිලියන 0;මිලියන -0"}
+                        one{"මිලියන 0"}
+                        other{"මිලියන 0"}
                     }
                     10000000{
-                        one{"මිලියන 00;මිලියන -00"}
-                        other{"මිලියන 00;මිලියන -00"}
+                        one{"මිලියන 00"}
+                        other{"මිලියන 00"}
                     }
                     100000000{
-                        one{"මිලියන 000;මිලියන -000"}
-                        other{"මිලියන 000;මිලියන -000"}
+                        one{"මිලියන 000"}
+                        other{"මිලියන 000"}
                     }
                     1000000000{
-                        one{"බිලියන 0;බිලියන -0"}
-                        other{"බිලියන 0;බිලියන -0"}
+                        one{"බිලියන 0"}
+                        other{"බිලියන 0"}
                     }
                     10000000000{
-                        one{"බිලියන 00;බිලියන -00"}
-                        other{"බිලියන 00;බිලියන -00"}
+                        one{"බිලියන 00"}
+                        other{"බිලියන 00"}
                     }
                     100000000000{
-                        one{"බිලියන 000;බිලියන -000"}
-                        other{"බිලියන 000;බිලියන -000"}
+                        one{"බිලියන 000"}
+                        other{"බිලියන 000"}
                     }
                     1000000000000{
-                        one{"ට්‍රිලියන 0;ට්‍රිලියන -0"}
-                        other{"ට්‍රිලියන 0;ට්‍රිලියන -0"}
+                        one{"ට්‍රිලියන 0"}
+                        other{"ට්‍රිලියන 0"}
                     }
                     10000000000000{
-                        one{"ට්‍රිලියන 00;ට්‍රිලියන -00"}
-                        other{"ට්‍රිලියන 00;ට්‍රිලියන -00"}
+                        one{"ට්‍රිලියන 00"}
+                        other{"ට්‍රිලියන 00"}
                     }
                     100000000000000{
-                        one{"ට්‍රිලියන 000;ට්‍රිලියන -000"}
-                        other{"ට්‍රිලියන 000;ට්‍රිලියන -000"}
+                        one{"ට්‍රිලියන 000"}
+                        other{"ට්‍රිලියන 000"}
                     }
                 }
             }
@@ -218,7 +218,7 @@ si{
         minimumGroupingDigits{"1"}
         native{"latn"}
     }
-    Version{"2.1.31.96"}
+    Version{"2.1.33.28"}
     calendar{
         generic{
             DateTimePatterns{
index 21656c3bfed73042ce00a044f7f9a242d5c7910d..14fdf167527f53a48c062ce1fce040e7e1ce7b2a 100644 (file)
@@ -29,154 +29,154 @@ sw{
             patternsLong{
                 decimalFormat{
                     1000{
-                        one{"Elfu 0;Elfu -0"}
-                        other{"Elfu 0;Elfu -0"}
+                        one{"Elfu 0"}
+                        other{"Elfu 0"}
                     }
                     10000{
-                        one{"Elfu 00;Elfu -00"}
-                        other{"Elfu 00;Elfu -00"}
+                        one{"Elfu 00"}
+                        other{"Elfu 00"}
                     }
                     100000{
-                        one{"Elfu 000;Elfu -000"}
-                        other{"Elfu 000;Elfu -000"}
+                        one{"Elfu 000"}
+                        other{"Elfu 000"}
                     }
                     1000000{
-                        one{"Milioni 0;Milioni -0"}
-                        other{"Milioni 0;Milioni -0"}
+                        one{"Milioni 0"}
+                        other{"Milioni 0"}
                     }
                     10000000{
-                        one{"Milioni 00;Milioni -00"}
-                        other{"Milioni 00;Milioni -00"}
+                        one{"Milioni 00"}
+                        other{"Milioni 00"}
                     }
                     100000000{
-                        one{"Milioni 000;Milioni -000"}
-                        other{"Milioni 000;Milioni -000"}
+                        one{"Milioni 000"}
+                        other{"Milioni 000"}
                     }
                     1000000000{
-                        one{"Bilioni 0;Bilioni -0"}
-                        other{"Bilioni 0;Bilioni -0"}
+                        one{"Bilioni 0"}
+                        other{"Bilioni 0"}
                     }
                     10000000000{
-                        one{"Bilioni 00;Bilioni -00"}
-                        other{"Bilioni 00;Bilioni -00"}
+                        one{"Bilioni 00"}
+                        other{"Bilioni 00"}
                     }
                     100000000000{
-                        one{"Bilioni 000;Bilioni -000"}
-                        other{"Bilioni 000;Bilioni -000"}
+                        one{"Bilioni 000"}
+                        other{"Bilioni 000"}
                     }
                     1000000000000{
-                        one{"Trilioni 0;Trilioni -0"}
-                        other{"Trilioni 0;Trilioni -0"}
+                        one{"Trilioni 0"}
+                        other{"Trilioni 0"}
                     }
                     10000000000000{
-                        one{"Trilioni 00;Trilioni -00"}
-                        other{"Trilioni 00;Trilioni -00"}
+                        one{"Trilioni 00"}
+                        other{"Trilioni 00"}
                     }
                     100000000000000{
-                        one{"Trilioni 000;Trilioni -000"}
-                        other{"Trilioni 000;Trilioni -000"}
+                        one{"Trilioni 000"}
+                        other{"Trilioni 000"}
                     }
                 }
             }
             patternsShort{
                 currencyFormat{
                     1000{
-                        one{"¤elfu 0;¤elfu -0"}
-                        other{"¤elfu 0;¤elfu -0"}
+                        one{"¤elfu 0"}
+                        other{"¤elfu 0"}
                     }
                     10000{
-                        one{"¤elfu 00;¤elfu -00"}
-                        other{"¤elfu 00;¤elfu -00"}
+                        one{"¤elfu 00"}
+                        other{"¤elfu 00"}
                     }
                     100000{
-                        one{"¤laki 000;¤laki -000"}
-                        other{"¤laki 000;¤laki -000"}
+                        one{"¤laki 000"}
+                        other{"¤laki 000"}
                     }
                     1000000{
-                        one{"¤M0;¤M-0"}
-                        other{"¤M0;¤M-0"}
+                        one{"¤M0"}
+                        other{"¤M0"}
                     }
                     10000000{
-                        one{"¤M00;¤M-00"}
-                        other{"¤M00;¤M-00"}
+                        one{"¤M00"}
+                        other{"¤M00"}
                     }
                     100000000{
-                        one{"¤M000;¤M-000"}
-                        other{"¤M000;¤M-000"}
+                        one{"¤M000"}
+                        other{"¤M000"}
                     }
                     1000000000{
-                        one{"¤B0;¤B-0"}
-                        other{"¤B0;¤B-0"}
+                        one{"¤B0"}
+                        other{"¤B0"}
                     }
                     10000000000{
-                        one{"¤B00;¤B-00"}
-                        other{"¤B00;¤B-00"}
+                        one{"¤B00"}
+                        other{"¤B00"}
                     }
                     100000000000{
-                        one{"¤B000;¤B-000"}
-                        other{"¤B000;¤B-000"}
+                        one{"¤B000"}
+                        other{"¤B000"}
                     }
                     1000000000000{
-                        one{"¤T0;¤T-0"}
-                        other{"¤T0;¤T-0"}
+                        one{"¤T0"}
+                        other{"¤T0"}
                     }
                     10000000000000{
-                        one{"¤T00;¤T-00"}
-                        other{"¤T00;¤T-00"}
+                        one{"¤T00"}
+                        other{"¤T00"}
                     }
                     100000000000000{
-                        one{"¤T000;¤T-000"}
-                        other{"¤T000;¤T-000"}
+                        one{"¤T000"}
+                        other{"¤T000"}
                     }
                 }
                 decimalFormat{
                     1000{
-                        one{"elfu 0;elfu -0"}
-                        other{"elfu 0;elfu -0"}
+                        one{"elfu 0"}
+                        other{"elfu 0"}
                     }
                     10000{
-                        one{"elfu 00;elfu -00"}
-                        other{"elfu 00;elfu -00"}
+                        one{"elfu 00"}
+                        other{"elfu 00"}
                     }
                     100000{
-                        one{"elfu 000;elfu -000"}
-                        other{"elfu 000;elfu -000"}
+                        one{"elfu 000"}
+                        other{"elfu 000"}
                     }
                     1000000{
-                        one{"M0;M-0"}
-                        other{"M0;M-0"}
+                        one{"M0"}
+                        other{"M0"}
                     }
                     10000000{
-                        one{"M00;M-00"}
-                        other{"M00;M-00"}
+                        one{"M00"}
+                        other{"M00"}
                     }
                     100000000{
-                        one{"M000;M-000"}
-                        other{"M000;M-000"}
+                        one{"M000"}
+                        other{"M000"}
                     }
                     1000000000{
-                        one{"B0;B-0"}
-                        other{"B0;B-0"}
+                        one{"B0"}
+                        other{"B0"}
                     }
                     10000000000{
-                        one{"B00;B-00"}
-                        other{"B00;B-00"}
+                        one{"B00"}
+                        other{"B00"}
                     }
                     100000000000{
-                        one{"B000;B-000"}
-                        other{"B000;B-000"}
+                        one{"B000"}
+                        other{"B000"}
                     }
                     1000000000000{
-                        one{"T0;T-0"}
-                        other{"T0;T-0"}
+                        one{"T0"}
+                        other{"T0"}
                     }
                     10000000000000{
-                        one{"T00;T-00"}
-                        other{"T00;T-00"}
+                        one{"T00"}
+                        other{"T00"}
                     }
                     100000000000000{
-                        one{"T000;T-000"}
-                        other{"T000;T-000"}
+                        one{"T000"}
+                        other{"T000"}
                     }
                 }
             }
@@ -207,7 +207,7 @@ sw{
         minimumGroupingDigits{"1"}
         native{"latn"}
     }
-    Version{"2.1.31.96"}
+    Version{"2.1.33.28"}
     calendar{
         generic{
             DateTimePatterns{
index 0f25f4325f32d5c731d44acc05edfb1043283322..c994e6621fd27939b099797ce1781771e3a1682f 100644 (file)
@@ -309,5 +309,5 @@ my{
         FK{"ဖော့ကလန် ကျွန်းစု (အီလားစ် မောလ်ဗီနာစ်)"}
         MK{"မက်စီဒိုးနီးယား (ယခင် ယူဂိုစလားဗီးယား မက်စီဒိုးနီးယားပြည်ထောင်စု)"}
     }
-    Version{"2.1.32.60"}
+    Version{"2.1.33.28"}
 }
index a241d8178652906b3ab1f08e2232c465afc537f4..bf34cfdfbb237c597f31e1e1466f9f5ec4c3c8aa 100644 (file)
@@ -310,5 +310,5 @@ si{
         MK{"මැසිඩෝනියාව (FYROM)"}
         TL{"නැගෙනහිර ටිමෝරය"}
     }
-    Version{"2.1.31.96"}
+    Version{"2.1.33.28"}
 }
index ea6f3b4cbb240a3a75a46c6074bf159cf9dd915d..35a9da33e874274e3addd407cb4e574599debc21 100644 (file)
@@ -310,5 +310,5 @@ sw{
         MK{"Masedonia (FYROM)"}
         TL{"Timor ya Mashariki"}
     }
-    Version{"2.1.31.96"}
+    Version{"2.1.33.28"}
 }
index f03764a58432158d6e84214065a85b8a71e8aee3..f75923670413027972177bebf922ba2e05a9c47b 100644 (file)
@@ -1,7 +1,7 @@
 // © 2016 and later: Unicode, Inc. and others.
 // License & terms of use: http://www.unicode.org/copyright.html#License
 my{
-    Version{"2.1.32.60"}
+    Version{"2.1.33.28"}
     durationUnits{
         hm{"h:mm"}
         hms{"h:mm:ss"}
index 31da04cc0276048585ca8ec7558a616bba3a8925..413d627b037fda4b219afcdd47ac5fd038a54149 100644 (file)
@@ -1,7 +1,7 @@
 // © 2016 and later: Unicode, Inc. and others.
 // License & terms of use: http://www.unicode.org/copyright.html#License
 si{
-    Version{"2.1.31.96"}
+    Version{"2.1.33.28"}
     durationUnits{
         hm{"h.mm"}
         hms{"h.mm.ss"}
index c0dd3ef954a9dd7381bf2de74fb5fe18946402e5..95c1a7778d72b0995437906af329217952a138a0 100644 (file)
@@ -1,7 +1,7 @@
 // © 2016 and later: Unicode, Inc. and others.
 // License & terms of use: http://www.unicode.org/copyright.html#License
 sw{
-    Version{"2.1.31.96"}
+    Version{"2.1.33.28"}
     durationUnits{
         hm{"h:mm"}
         hms{"h:mm:ss"}
index 6f4e22b2dfcbf5a0b011f64122a744178f422ab2..ef0ab8a8a86c213b8069d01ddf3b1faf70181806 100644 (file)
@@ -1,7 +1,7 @@
 // © 2016 and later: Unicode, Inc. and others.
 // License & terms of use: http://www.unicode.org/copyright.html#License
 my{
-    Version{"2.1.32.60"}
+    Version{"2.1.33.28"}
     zoneStrings{
         "Africa:Abidjan"{
             ec{"အာဘီဂျန်"}
index 5f5fe5ebea7c32aeb494282b32af8da0b450b42f..e6c003e4198801711c482693b59e878d3c694013 100644 (file)
@@ -1,7 +1,7 @@
 // © 2016 and later: Unicode, Inc. and others.
 // License & terms of use: http://www.unicode.org/copyright.html#License
 si{
-    Version{"2.1.31.96"}
+    Version{"2.1.33.28"}
     zoneStrings{
         "Africa:Abidjan"{
             ec{"අබිජාන්"}
index c280816e4efc9979ed0b29776253be8ddf48bfa3..c3ac3351182ae15296ae92be063f53f0f5d72842 100644 (file)
@@ -1,7 +1,7 @@
 // © 2016 and later: Unicode, Inc. and others.
 // License & terms of use: http://www.unicode.org/copyright.html#License
 sw{
-    Version{"2.1.31.96"}
+    Version{"2.1.33.28"}
     zoneStrings{
         "Africa:Abidjan"{
             ec{"Abidjan"}
index caa786027c7bb2c9facb155cbdd19cc047cdad30..212846e99376a5b011f17dc502d5997b2d38e0fd 100755 (executable)
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b7b2a9e282f3f3296f80ef40391df4d5a6f161bdebe6270b73e7bcc68db124ac
-size 12155212
+oid sha256:44348bffa4a9b3d5abfeae42e4a404af5ea42348db996f5b4f190a7d0e89132c
+size 12156827
index 713fc74ad5f3a55e46b12630a7c4dc3c93a6a2ca..ac8e8aca4dd031ada2e340c3bb572325ddf4c82b 100644 (file)
@@ -242,18 +242,18 @@ public class CompactDecimalFormatTest extends TestFmwk {
             {-1f, "-1"},
             {-12f, "-12"},
             {-123f, "-120"},
-            {-1234f, "elfu\u00a0-1.2"},
-            {-12345f, "elfu\u00a0-12"},
-            {-123456f, "elfu\u00A0-120"},
-            {-1234567f, "M-1.2"},
-            {-12345678f, "M-12"},
-            {-123456789f, "M-120"},
-            {-1234567890f, "B-1.2"},
-            {-12345678901f, "B-12"},
-            {-123456789012f, "B-120"},
-            {-1234567890123f, "T-1.2"},
-            {-12345678901234f, "T-12"},
-            {-12345678901234567890f, "T-12,000,000"},
+            {-1234f, "-elfu\u00a01.2"}, // minus sign should precede numeric portion; CLDR 31 has incorrect data until ICU4C can handle
+            {-12345f, "-elfu\u00a012"}, // per above
+            {-123456f, "-elfu\u00a0120"}, // per above
+            {-1234567f, "-M1.2"}, // per above
+            {-12345678f, "-M12"}, // per above
+            {-123456789f, "-M120"}, // per above
+            {-1234567890f, "-B1.2"}, // per above
+            {-12345678901f, "-B12"}, // per above
+            {-123456789012f, "-B120"}, // per above
+            {-1234567890123f, "-T1.2"}, // per above
+            {-12345678901234f, "-T12"}, // per above
+            {-12345678901234567890f, "-T12,000,000"}, // per above
     };
 
     Object[][] TestACoreCompactFormatList = {