ICU-9071 Merge data from CLDR release-21-d01

X-SVN-Rev: 31308

diff --git a/icu4j/main/shared/data/icudata.jar b/icu4j/main/shared/data/icudata.jar
index ab7ee7f467a8b44c716afe9d6cfcd8a082b36896..f159f62abde544eae4b6beabbf71264749d397c3 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:6b9e35face3400e77f2c95f8974c9a513a24dd31286926afa0d7cb74084c409e
-size 7924456
+oid sha256:e312d3b7402cb5bc103f78a32dd7df1fdc75ff6db8a803b746fd63bca1e849e2
+size 7929130

diff --git a/icu4j/main/shared/data/icutzdata.jar b/icu4j/main/shared/data/icutzdata.jar
index e3c30094e36dc44264843c2908922f57e893d46b..74314e61b2dad8861de745a532fba0fd006c7674 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:f6b1605b0f4e1ebcba71fed221e068b234523523e5ccf28cde167d486f873719
-size 92640
+oid sha256:d96e53aa304de0ddc53f8ce0b0c23944efa83365c4ba52f1ad7c86861296dc70
+size 92708

diff --git a/icu4j/main/shared/data/testdata.jar b/icu4j/main/shared/data/testdata.jar
index 9c26e1693fe1c4c4a9445ec631f752834b161177..f8c3121996c4b13e33fdb6abd18fc20cdeb90432 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:9189e830f39d6cfb36008f3d389e784a3f0fa211ddaf01d6f4503188a2c46d55
-size 719348
+oid sha256:d09d693ded672b026fcf27ffab1e98aafc517a339cbc4d67628e7685ef83f589
+size 719364

diff --git a/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/collator/CollationServiceTest.java b/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/collator/CollationServiceTest.java
index 57453648b67cabd81530fc1284e3e23fb182dfe9..2e333e64d17ce1f26142558ecd0bf462552b5b8a 100644 (file)
--- a/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/collator/CollationServiceTest.java
+++ b/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/collator/CollationServiceTest.java
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (C) 2003-2011, International Business Machines Corporation and    *
+ * Copyright (C) 2003-2012, International Business Machines Corporation and    *
  * others. All Rights Reserved.                                                *
  *******************************************************************************
  */
@@ -444,22 +444,22 @@ public class CollationServiceTest extends TestFmwk {
     
     public void TestGetKeywordValues(){
         final String[][] PREFERRED = {
-            {"und",             "standard", "ducet", "eor", "search"},
-            {"en_US",           "standard", "ducet", "eor", "search"},
-            {"en_029",          "standard", "ducet", "eor", "search"},
-            {"de_DE",           "standard", "phonebook", "search", "ducet", "eor"},
-            {"de_Latn_DE",      "standard", "phonebook", "search", "ducet", "eor"},
-            {"zh",              "pinyin", "big5han", "gb2312han", "standard", "stroke", "ducet", "eor", "search"},
-            {"zh_Hans",         "pinyin", "big5han", "gb2312han", "standard", "stroke", "ducet", "eor", "search"},
-            {"zh_CN",           "pinyin", "big5han", "gb2312han", "standard", "stroke", "ducet", "eor", "search"},
-            {"zh_Hant",         "stroke", "big5han", "gb2312han", "pinyin", "standard", "ducet", "eor", "search"},
-            {"zh_TW",           "stroke", "big5han", "gb2312han", "pinyin", "standard", "ducet", "eor", "search"},
-            {"zh__PINYIN",      "pinyin", "big5han", "gb2312han", "standard", "stroke", "ducet", "eor", "search"},
-            {"es_ES",           "standard", "search", "traditional", "ducet", "eor"},
-            {"es__TRADITIONAL", "traditional", "search", "standard", "ducet", "eor"},
-            {"und@collation=phonebook",     "standard", "ducet", "eor", "search"},
-            {"de_DE@collation=big5han",     "standard", "phonebook", "search", "ducet", "eor"},
-            {"zzz@collation=xxx",           "standard", "ducet", "eor", "search"},
+            {"und",             "standard", "ducet", "search"},
+            {"en_US",           "standard", "ducet", "search"},
+            {"en_029",          "standard", "ducet", "search"},
+            {"de_DE",           "standard", "phonebook", "search", "ducet"},
+            {"de_Latn_DE",      "standard", "phonebook", "search", "ducet"},
+            {"zh",              "pinyin", "big5han", "gb2312han", "standard", "stroke", "ducet", "search"},
+            {"zh_Hans",         "pinyin", "big5han", "gb2312han", "standard", "stroke", "ducet", "search"},
+            {"zh_CN",           "pinyin", "big5han", "gb2312han", "standard", "stroke", "ducet", "search"},
+            {"zh_Hant",         "stroke", "big5han", "gb2312han", "pinyin", "standard", "ducet", "search"},
+            {"zh_TW",           "stroke", "big5han", "gb2312han", "pinyin", "standard", "ducet", "search"},
+            {"zh__PINYIN",      "pinyin", "big5han", "gb2312han", "standard", "stroke", "ducet", "search"},
+            {"es_ES",           "standard", "search", "traditional", "ducet"},
+            {"es__TRADITIONAL", "traditional", "search", "standard", "ducet"},
+            {"und@collation=phonebook",     "standard", "ducet", "search"},
+            {"de_DE@collation=big5han",     "standard", "phonebook", "search", "ducet"},
+            {"zzz@collation=xxx",           "standard", "ducet", "search"},
         };
 
         for (int i = 0; i < PREFERRED.length; i++) {

diff --git a/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/util/ICUResourceBundleCollationTest.java b/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/util/ICUResourceBundleCollationTest.java
index f6fcc78bb41a237cdddff340a49bb50f17459c8b..1d1d319a74bd3ace9249e2e6a7b51c43c27d90b4 100644 (file)
--- a/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/util/ICUResourceBundleCollationTest.java
+++ b/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/util/ICUResourceBundleCollationTest.java
@@ -1,6 +1,6 @@
 /**
  *******************************************************************************
- * Copyright (C) 2009, International Business Machines Corporation and         *
+ * Copyright (C) 2009-2012, International Business Machines Corporation and    *
  * others. All Rights Reserved.                                                *
  *******************************************************************************
  */
@@ -57,10 +57,7 @@ public final class ICUResourceBundleCollationTest extends TestFmwk {
            "t",     "zh_Hans_CN@collation=gb2312han",   "zh@collation=gb2312han",
            "t",     "zh@collation=big5han",             "zh@collation=big5han",
            "t",     "zh@collation=gb2312han",           "zh@collation=gb2312han",
-           "t",     "hi_IN@collation=direct",           "hi@collation=direct",
            "t",     "hi@collation=standard",            "hi",
-           "t",     "hi@collation=direct",              "hi@collation=direct",
-           "f",     "hi_AU@collation=direct;currency=CHF;calendar=buddhist",    "hi@collation=direct",
            "f",     "hi_AU@collation=standard;currency=CHF;calendar=buddhist",  "hi",
            "t",     "de_DE@collation=pinyin",           "de", /* bug 4582 tests */
            "f",     "de_DE_BONN@collation=pinyin",      "de",
@@ -175,4 +172,4 @@ public final class ICUResourceBundleCollationTest extends TestFmwk {
             }
         }
     }
-}
\ No newline at end of file
+}

diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateFormatTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateFormatTest.java
index 86807e3d750270c7cbb8ec1ce84672934fcb1877..dcfc2dde427ddaafe688db04b3b2a0449413221e 100644 (file)
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateFormatTest.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateFormatTest.java
@@ -1044,24 +1044,24 @@ public class DateFormatTest extends com.ibm.icu.dev.test.TestFmwk {
         { "hi", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "Z", "-0300", "-3:00" },
         { "hi", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
         { "hi", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
-        { "hi", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "zzzz", "\u0905\u0930\u094D\u091C\u0947\u0902\u091F\u0940\u0928\u093E \u0938\u092E\u092F", "-3:00" },
+        { "hi", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "zzzz", "\u0905\u0930\u094D\u091C\u0947\u0902\u091F\u0940\u0928\u093E \u092E\u093E\u0928\u0915 \u0938\u092E\u092F", "-3:00" },
         { "hi", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "Z", "-0300", "-3:00" },
         { "hi", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
         { "hi", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
-        { "hi", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "zzzz", "\u0905\u0930\u094D\u091C\u0947\u0902\u091F\u0940\u0928\u093E \u0938\u092E\u092F", "-3:00" },
+        { "hi", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "zzzz", "\u0905\u0930\u094D\u091C\u0947\u0902\u091F\u0940\u0928\u093E \u092E\u093E\u0928\u0915 \u0938\u092E\u092F", "-3:00" },
         { "hi", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "v", "\u0905\u0930\u094d\u091c\u0947\u0928\u094d\u091f\u0940\u0928\u093e \u0938\u092E\u092F (\u092c\u094d\u092f\u0942\u0928\u0938 \u0906\u092f\u0930\u0938)", "America/Buenos_Aires" },
-        { "hi", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "vvvv", "\u0905\u0930\u094D\u091C\u0947\u0902\u091F\u0940\u0928\u093E \u0938\u092E\u092F", "America/Buenos_Aires" },
+        { "hi", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "vvvv", "\u0905\u0930\u094D\u091C\u0947\u0902\u091F\u0940\u0928\u093E \u092E\u093E\u0928\u0915 \u0938\u092E\u092F", "America/Buenos_Aires" },
 
         { "hi", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "Z", "-0300", "-3:00" },
         { "hi", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
         { "hi", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
-        { "hi", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "zzzz", "\u0905\u0930\u094D\u091C\u0947\u0902\u091F\u0940\u0928\u093E \u0938\u092E\u092F", "-3:00" },
+        { "hi", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "zzzz", "\u0905\u0930\u094D\u091C\u0947\u0902\u091F\u0940\u0928\u093E \u092E\u093E\u0928\u0915 \u0938\u092E\u092F", "-3:00" },
         { "hi", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "Z", "-0300", "-3:00" },
         { "hi", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
         { "hi", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
-        { "hi", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "zzzz", "\u0905\u0930\u094D\u091C\u0947\u0902\u091F\u0940\u0928\u093E \u0938\u092E\u092F", "-3:00" },
+        { "hi", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "zzzz", "\u0905\u0930\u094D\u091C\u0947\u0902\u091F\u0940\u0928\u093E \u092E\u093E\u0928\u0915 \u0938\u092E\u092F", "-3:00" },
         { "hi", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "v", "\u0905\u0930\u094d\u091c\u0947\u0928\u094d\u091f\u0940\u0928\u093e \u0938\u092E\u092F (\u092c\u094d\u092f\u0942\u0928\u0938 \u0906\u092f\u0930\u0938)", "America/Buenos_Aires" },
-        { "hi", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "vvvv", "\u0905\u0930\u094D\u091C\u0947\u0902\u091F\u0940\u0928\u093E \u0938\u092E\u092F", "America/Buenos_Aires" },
+        { "hi", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "vvvv", "\u0905\u0930\u094D\u091C\u0947\u0902\u091F\u0940\u0928\u093E \u092E\u093E\u0928\u0915 \u0938\u092E\u092F", "America/Buenos_Aires" },
 
         { "hi", "America/Havana", "2004-01-15T00:00:00Z", "Z", "-0500", "-5:00" },
         { "hi", "America/Havana", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-05:00", "-5:00" },

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 d48c6e319b135bc27a0b9912743d1429d66d35b5..20971df5b47b845e314696b11e8c188425a98b81 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
@@ -79,7 +79,7 @@ public class DateTimeGeneratorTest extends TestFmwk {
         // modify it to change the zone.
         String newPattern = gen.replaceFieldTypes(pattern, "vvvv");
         format.applyPattern(newPattern);
-        assertEquals("full-date: modified zone", "Donnerstag, 14. Oktober 1999 08:58:59 Frankreich Zeit", format.format(sampleDate));
+        assertEquals("full-date: modified zone", "Donnerstag, 14. Oktober 1999 08:58:59 Mitteleurop\u00E4ische Zeit", format.format(sampleDate));
         
         // add test of basic cases
 
@@ -317,7 +317,7 @@ public class DateTimeGeneratorTest extends TestFmwk {
         new String[] {"mmss", "58:59"},
         new String[] {"yyyyMMMM", "Januar 1999"}, // (new item for testing 6872<-5702)
         new String[] {"MMMEd", "Mi., 13. Jan"},
-        new String[] {"Ed", "Mi. 13."},
+        new String[] {"Ed", "Mi., 13."},
         new String[] {"jmmssSSS", "23:58:59,123"},
         new ULocale("fi"),
         new String[] {"yM", "1.1999"}, // (fixed expected result per ticket 6872<-6626)
@@ -419,15 +419,15 @@ public class DateTimeGeneratorTest extends TestFmwk {
         new String[] {"mmss", "58:59"},
         new String[] {"yyyyMMMM", "\u6C11\u570B88\u5E741\u6708"},
         new String[] {"MMMEd", "1\u670813\u65E5\u9031\u4E09"},
-        new String[] {"Ed", "13\u65E5(\u9031\u4E09)"},
+        new String[] {"Ed", "13\u65E5\uFF08\u9031\u4E09\uFF09"},
         new String[] {"jmmssSSS", "\u4E0B\u534811:58:59.123"},
         new ULocale("ru"),
-        new String[] {"yM", "1.1999"},
+        new String[] {"yM", "01.1999"},
         new String[] {"yMMM", "\u042F\u043D\u0432. 1999"},
-        new String[] {"yMd", "13.1.1999"},
-        new String[] {"yMMMd", "13 \u044F\u043D\u0432 1999\u00A0\u0433."},
+        new String[] {"yMd", "13.01.1999"},
+        new String[] {"yMMMd", "13 \u044F\u043D\u0432. 1999\u00A0\u0433."},
         new String[] {"Md", "13.1"},
-        new String[] {"MMMd", "13 \u044F\u043D\u0432"},
+        new String[] {"MMMd", "13 \u044F\u043D\u0432."},
         new String[] {"MMMMd", "13 \u044F\u043D\u0432\u0430\u0440\u044F"},
         new String[] {"yQQQ", "1-\u0439 \u043A\u0432. 1999 \u0433."},
         new String[] {"hhmm", "11:58 \u043F\u043E\u0441\u043B\u0435 \u043F\u043E\u043B\u0443\u0434\u043D\u044F"},
@@ -435,7 +435,7 @@ public class DateTimeGeneratorTest extends TestFmwk {
         new String[] {"jjmm", "23:58"},
         new String[] {"mmss", "58:59"},
         new String[] {"yyyyMMMM", "\u042F\u043D\u0432\u0430\u0440\u044C 1999"},
-        new String[] {"MMMEd", "\u0421\u0440, 13 \u044F\u043D\u0432"},
+        new String[] {"MMMEd", "\u0421\u0440, 13 \u044F\u043D\u0432."},
         new String[] {"Ed", "\u0421\u0440, 13"},
         new String[] {"jmmssSSS", "23:58:59,123"},
     };

diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/timezone/TimeZoneTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/timezone/TimeZoneTest.java
index 4431ad9f1ba737f3372126507e3f564c845c7618..d6833d706fd3ad5df6c9580ef2d3ad0cf27d09b6 100644 (file)
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/timezone/TimeZoneTest.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/timezone/TimeZoneTest.java
@@ -1500,6 +1500,8 @@ public class TimeZoneTest extends TestFmwk
         // in Olson tzdata.
         final String[][] excluded1 = {
                 {"America/Shiprock", "America/Denver"}, // America/Shiprock is defined as a Link to America/Denver in tzdata
+                {"America/Kralendijk", "America/Curacao"},
+                {"America/Lower_Princes", "America/Curacao"},
                 {"America/Marigot", "America/Guadeloupe"},
                 {"America/St_Barthelemy", "America/Guadeloupe"},
                 {"Antarctica/South_Pole", "Antarctica/McMurdo"},

diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/DebugUtilitiesData.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/DebugUtilitiesData.java
index 447770afd5d4b64482a5af9b91dcb57c54364e33..d39e510741d66096bb3d19630a414657556ceb65 100644 (file)
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/DebugUtilitiesData.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/DebugUtilitiesData.java
@@ -1,4 +1,4 @@
-/** Copyright (C) 2007-2011, International Business Machines Corporation and Others. All Rights Reserved. **/
+/** Copyright (C) 2007-2012, International Business Machines Corporation and Others. All Rights Reserved. **/
 
 /* NOTE: this file is AUTOMATICALLY GENERATED by gentest.
  * See: {ICU4C}/source/data/icu4j-readme.txt for more information. 

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 b3df825da6d09cd61259700990b13d6e989c479d..b4eaafd2a06d2638cd70f231a08673195a5c59cb 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
@@ -1,6 +1,6 @@
 /*
 **********************************************************************
-* Copyright (c) 2004-2011, International Business Machines
+* Copyright (c) 2004-2012, International Business Machines
 * Corporation and others.  All Rights Reserved.
 **********************************************************************
 * Author: Alan Liu
@@ -1238,7 +1238,7 @@ public class ULocaleTest extends TestFmwk {
         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 Sort 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");
@@ -1251,7 +1251,7 @@ public class ULocaleTest extends TestFmwk {
         h[1].put("collation", "\u5BF9\u7167");
         h[1].put("calendar", "\u65E5\u5386");
         h[1].put("currency", "\u8D27\u5E01");
-        h[1].put("direct", "\u76F4\u63A5\u6392\u5E8F\u987A\u5E8F");
+        h[1].put("direct", "direct"); // Direct sort order is deprecated in CLDR
         h[1].put("phonebook", "\u7535\u8BDD\u7C3F\u987A\u5E8F");
         h[1].put("pinyin", "\u62FC\u97F3\u987a\u5e8f");
         h[1].put("stroke", "\u7B14\u5212\u987A\u5E8F");
@@ -1857,7 +1857,7 @@ public class ULocaleTest extends TestFmwk {
                 "kpe"
             }, {
                 "ku",
-                "ku_Arab_IQ",
+                "ku_Latn_TR",
                 "ku"
             }, {
                 "ky",