ICU-9890 Merge CLDR23 data

X-SVN-Rev: 33354

diff --git a/icu4j/main/shared/data/icudata.jar b/icu4j/main/shared/data/icudata.jar
index b09dbe7bafa4677221f10eed1772a1a4caac410e..1ab2ffb1cf1b05b7afd52b763f83b891702133d0 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:1271f8ebcfce1cb24f71d2090314d92fe7dcce5ea345f1c4862f0dd19cdfe28a
-size 9901544
+oid sha256:7bc1ac1831460d7de3a3112fba4e7fd098e45d73aeb585341f61dc4379175ddb
+size 10569507

diff --git a/icu4j/main/shared/data/icutzdata.jar b/icu4j/main/shared/data/icutzdata.jar
index 5328644fc4d7fb3e7e541637a4489914da7044e3..bfe018bb7093cc0ab8265fc6b61a9644c19af0f0 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:1eede573d8b4f89f3915c138c5264ed02355531f3c21dc9d423e362399f26066
-size 97789
+oid sha256:1988dcc04cd3d74831c064c414687c847133cd975d4c6e8589419ac83662c715
+size 97800

diff --git a/icu4j/main/shared/data/testdata.jar b/icu4j/main/shared/data/testdata.jar
index ca31851c7232074496441a905149415b8d6298fa..98ba9a573a2b6e1d144ee23775ca6dae2ec2fe34 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:1d43b83731b620a9bc4592b8f815478bec2b771409036d5061380f2112634351
-size 724509
+oid sha256:dd3e534139349212c01c25ae94a7eca361651265112b24a8570acda5ae5d44f8
+size 724516

diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/ULocaleTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/ULocaleTest.java
index b47b708f617b1a32902251994eb8b0ae75f3992a..27cf648a78657343b5d798acc8695550eda0b268 100644 (file)
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/ULocaleTest.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/ULocaleTest.java
@@ -494,7 +494,7 @@ public class ULocaleTest extends TestFmwk {
         /* display name (English) */
         {   "English (United States)", "French (France)", "Catalan (Spain)",
             "Greek (Greece)", "Norwegian (Norway, NY)", "Chinese (Simplified Han, China)",
-            "German (Germany, Collation=Phonebook Order)", "Spanish (Collation=Traditional)", "Japanese (Japan, Calendar=Japanese Calendar)" },
+            "German (Germany, Collation=Phonebook Sort Order)", "Spanish (Collation=Traditional)", "Japanese (Japan, Calendar=Japanese Calendar)" },
 
         /* display language (French) */
         {   "anglais",  "fran\\u00E7ais",   "catalan", "grec",    "norv\\u00E9gien",    "chinois", "allemand", "espagnol", "japonais"     },
@@ -1178,7 +1178,7 @@ public class ULocaleTest extends TestFmwk {
     public void TestDisplayKeyword() {
         //prepare testing data
         initHashtable();
-        String[] data = {"en_US@collation=direct;calendar=islamic-civil",
+        String[] data = {"en_US@collation=phonebook;calendar=islamic-civil",
              "zh_Hans@collation=pinyin;calendar=chinese",
              "foo_Bar_BAZ@collation=traditional;calendar=buddhist"};
 
@@ -1317,11 +1317,10 @@ public class ULocaleTest extends TestFmwk {
         h[0].put("collation", "Sort Order");
         h[0].put("calendar", "Calendar");
         h[0].put("currency", "Currency");
-        h[0].put("phonebook", "Phonebook Order");
+        h[0].put("phonebook", "Phonebook Sort Order");
         h[0].put("pinyin", "Pinyin Sort Order");
         h[0].put("traditional", "Traditional Sort Order");
         h[0].put("stroke", "Stroke Order");
-        h[0].put("direct", "direct"); // Direct sort order is deprecated in CLDR
         h[0].put("japanese", "Japanese Calendar");
         h[0].put("buddhist", "Buddhist Calendar");
         h[0].put("islamic", "Islamic Calendar");
@@ -1334,8 +1333,7 @@ public class ULocaleTest extends TestFmwk {
         h[1].put("collation", "\u6392\u5E8F\u987A\u5E8F");
         h[1].put("calendar", "\u65E5\u5386");
         h[1].put("currency", "\u8D27\u5E01");
-        h[1].put("direct", "\u76F4\u63A5"); // Direct sort order is deprecated in CLDR
-        h[1].put("phonebook", "\u7535\u8BDD\u7C3F\u987A\u5E8F");
+        h[1].put("phonebook", "\u7535\u8BDD\u7C3F\u6392\u5E8F\u987A\u5E8F");
         h[1].put("pinyin", "\u62FC\u97F3\u6392\u5E8F");
         h[1].put("stroke", "\u7B14\u5212\u987A\u5E8F");
         h[1].put("traditional", "\u4F20\u7EDF\u6392\u5E8F\u987A\u5E8F");
@@ -2468,8 +2466,8 @@ public class ULocaleTest extends TestFmwk {
                 "es"
             }, {
                 "und_ET",
-                "en_Latn_ET",
-                "en_ET"
+                "am_Ethi_ET",
+                "am"
             }, {
                 "und_Ethi",
                 "am_Ethi_ET",
@@ -3208,8 +3206,8 @@ public class ULocaleTest extends TestFmwk {
                 "zh_HK"
             }, {
                 "und_AQ",
-                "en_Latn_AQ",
-                "en_AQ"
+                "und_Latn_AQ",
+                "und_AQ"
             }, {
                 "und_Zzzz",
                 "en_Latn_US",
@@ -3232,8 +3230,8 @@ public class ULocaleTest extends TestFmwk {
                 "zh_HK"
             }, {
                 "und_Zzzz_AQ",
-                "en_Latn_AQ",
-                "en_AQ"
+                "und_Latn_AQ",
+                "und_AQ"
             }, {
                 "und_Latn",
                 "en_Latn_US",
@@ -3248,16 +3246,16 @@ public class ULocaleTest extends TestFmwk {
                 "za"
             }, {
                 "und_Latn_TW",
-                "zh_Latn_TW",
-                "zh_Latn_TW"
+                "trv_Latn_TW",
+                "trv"
             }, {
                 "und_Latn_HK",
                 "zh_Latn_HK",
                 "zh_Latn_HK"
             }, {
                 "und_Latn_AQ",
-                "en_Latn_AQ",
-                "en_AQ"
+                "und_Latn_AQ",
+                "und_AQ"
             }, {
                 "und_Hans",
                 "zh_Hans_CN",
@@ -3328,8 +3326,8 @@ public class ULocaleTest extends TestFmwk {
                 "zh_Moon_HK"
             }, {
                 "und_Moon_AQ",
-                "en_Moon_AQ",
-                "en_Moon_AQ"
+                "und_Moon_AQ",
+                "und_Moon_AQ"
             }, {
                 "es",
                 "es_Latn_ES",