ICU-8696 Merge CLDR 2.0.1

X-SVN-Rev: 30317

diff --git a/icu4j/main/shared/data/icudata.jar b/icu4j/main/shared/data/icudata.jar
index 9006f4b0c9e265aea1dd0af559d03ff93ab75e8b..7791eea58689b3555c344e563bc4994663dd7204 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:6ba22e256c50b87d0c5b6b5d319398430e85898eef9288a5f11168750c2b3fac
-size 7958832
+oid sha256:84a9e684cc9b50d4077c10770d2f2fec19a2d35a5649ad94499f1b4df3ddf8ae
+size 7962167

diff --git a/icu4j/main/shared/data/testdata.jar b/icu4j/main/shared/data/testdata.jar
index 17f34dfe3022aabf004aad23d3365dc360d6bc96..4762bea7da70f325bf25d16f49045f4fc1f6ad95 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:05b495174797742c80b3deda49ce5730e57f6ac46a0cac19b9f60257e96f1b62
-size 719054
+oid sha256:b6ad1b5ad4e8341c87ed4fea5381419904bed3145388ebcd1208c24f2dbc56f0
+size 719078

diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateFormatMiscTests.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateFormatMiscTests.java
index 48fd69a43c2c1df52d27b1a202b9a1e091fe9e2a..0078403624a7591a86b26676643f4fa53234211b 100644 (file)
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateFormatMiscTests.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateFormatMiscTests.java
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (C) 2001-2010, International Business Machines Corporation and    *
+ * Copyright (C) 2001-2011, International Business Machines Corporation and    *
  * others. All Rights Reserved.                                                *
  *******************************************************************************
  */
@@ -147,9 +147,9 @@ public class DateFormatMiscTests extends com.ibm.icu.dev.test.TestFmwk {
             errln("could not find " + tzID);
         } else {
             assertEquals("Long zone name = ", jstLong, zones[index][1]);
-            assertEquals("Short zone name = ", jstShort, zones[index][2]);
+//            assertEquals("Short zone name = ", jstShort, zones[index][2]);
             assertEquals("Long zone name (3) = ", jdtLong, zones[index][3]);
-            assertEquals("Short zone name (4) = ", jdtShort, zones[index][4]);
+//            assertEquals("Short zone name (4) = ", jdtShort, zones[index][4]);
         }
     }
 }

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 a502d7bacf55f1fe0373acbd778f7abc5b27e2b3..e525d4b8751c865f784537492e37252a6c8e09eb 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
@@ -706,12 +706,12 @@ public class DateFormatTest extends com.ibm.icu.dev.test.TestFmwk {
         { "en", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "Z", "-0300", "-3:00" },
         { "en", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
         { "en", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
-        { "en", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "V", "ART", "-3:00" },
+        { "en", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "V", "GMT-03:00", "-3:00" },
         { "en", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "zzzz", "Argentina Time", "-3:00" },
         { "en", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "Z", "-0300", "-3:00" },
         { "en", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
         { "en", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
-        { "en", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "V", "ART", "-3:00" },
+        { "en", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "V", "GMT-03:00", "-3:00" },
         { "en", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "zzzz", "Argentina Time", "-3:00" },
         { "en", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "v", "Argentina Time (Buenos Aires)", "America/Buenos_Aires" },
         { "en", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "vvvv", "Argentina Time", "America/Buenos_Aires" },
@@ -720,12 +720,12 @@ public class DateFormatTest extends com.ibm.icu.dev.test.TestFmwk {
         { "en", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "Z", "-0300", "-3:00" },
         { "en", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
         { "en", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
-        { "en", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "V", "ART", "-3:00" },
+        { "en", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "V", "GMT-03:00", "-3:00" },
         { "en", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "zzzz", "Argentina Time", "-3:00" },
         { "en", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "Z", "-0300", "-3:00" },
         { "en", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
         { "en", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
-        { "en", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "V", "ART", "-3:00" },
+        { "en", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "V", "GMT-03:00", "-3:00" },
         { "en", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "zzzz", "Argentina Time", "-3:00" },
         { "en", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "v", "Argentina Time (Buenos Aires)", "America/Buenos_Aires" },
         { "en", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "vvvv", "Argentina Time", "America/Buenos_Aires" },
@@ -734,12 +734,12 @@ public class DateFormatTest extends com.ibm.icu.dev.test.TestFmwk {
         { "en", "America/Havana", "2004-01-15T00:00:00Z", "Z", "-0500", "-5:00" },
         { "en", "America/Havana", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-05:00", "-5:00" },
         { "en", "America/Havana", "2004-01-15T00:00:00Z", "z", "GMT-05:00", "-5:00" },
-        { "en", "America/Havana", "2004-01-15T00:00:00Z", "V", "CST (Cuba)", "-5:00" },
+        { "en", "America/Havana", "2004-01-15T00:00:00Z", "V", "GMT-05:00", "-5:00" },
         { "en", "America/Havana", "2004-01-15T00:00:00Z", "zzzz", "Cuba Standard Time", "-5:00" },
         { "en", "America/Havana", "2004-07-15T00:00:00Z", "Z", "-0400", "-4:00" },
         { "en", "America/Havana", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-04:00", "-4:00" },
         { "en", "America/Havana", "2004-07-15T00:00:00Z", "z", "GMT-04:00", "-4:00" },
-        { "en", "America/Havana", "2004-07-15T00:00:00Z", "V", "CDT (Cuba)", "-4:00" },
+        { "en", "America/Havana", "2004-07-15T00:00:00Z", "V", "GMT-04:00", "-4:00" },
         { "en", "America/Havana", "2004-07-15T00:00:00Z", "zzzz", "Cuba Daylight Time", "-4:00" },
         { "en", "America/Havana", "2004-07-15T00:00:00Z", "v", "Cuba Time", "America/Havana" },
         { "en", "America/Havana", "2004-07-15T00:00:00Z", "vvvv", "Cuba Time", "America/Havana" },
@@ -803,12 +803,12 @@ public class DateFormatTest extends com.ibm.icu.dev.test.TestFmwk {
         { "en", "Asia/Calcutta", "2004-01-15T00:00:00Z", "Z", "+0530", "+5:30" },
         { "en", "Asia/Calcutta", "2004-01-15T00:00:00Z", "ZZZZ", "GMT+05:30", "+5:30" },
         { "en", "Asia/Calcutta", "2004-01-15T00:00:00Z", "z", "GMT+05:30", "+5:30" },
-        { "en", "Asia/Calcutta", "2004-01-15T00:00:00Z", "V", "IST", "+5:30" },
+        { "en", "Asia/Calcutta", "2004-01-15T00:00:00Z", "V", "GMT+05:30", "+5:30" },
         { "en", "Asia/Calcutta", "2004-01-15T00:00:00Z", "zzzz", "India Standard Time", "+5:30" },
         { "en", "Asia/Calcutta", "2004-07-15T00:00:00Z", "Z", "+0530", "+5:30" },
         { "en", "Asia/Calcutta", "2004-07-15T00:00:00Z", "ZZZZ", "GMT+05:30", "+5:30" },
         { "en", "Asia/Calcutta", "2004-07-15T00:00:00Z", "z", "GMT+05:30", "+05:30" },
-        { "en", "Asia/Calcutta", "2004-07-15T00:00:00Z", "V", "IST", "+05:30" },
+        { "en", "Asia/Calcutta", "2004-07-15T00:00:00Z", "V", "GMT+05:30", "+05:30" },
         { "en", "Asia/Calcutta", "2004-07-15T00:00:00Z", "zzzz", "India Standard Time", "+5:30" },
         { "en", "Asia/Calcutta", "2004-07-15T00:00:00Z", "v", "India Time", "Asia/Calcutta" },
         { "en", "Asia/Calcutta", "2004-07-15T00:00:00Z", "vvvv", "India Standard Time", "Asia/Calcutta" },
@@ -996,7 +996,7 @@ public class DateFormatTest extends com.ibm.icu.dev.test.TestFmwk {
         { "zh", "Europe/London", "2004-07-15T00:00:00Z", "Z", "+0100", "+1:00" },
         { "zh", "Europe/London", "2004-07-15T00:00:00Z", "ZZZZ", GMT_ZH+"+0100", "+1:00" },
         { "zh", "Europe/London", "2004-07-15T00:00:00Z", "z", GMT_ZH+"+0100", "+1:00" },
-        { "zh", "Europe/London", "2004-07-15T00:00:00Z", "V", "BST", "+1:00" },
+        { "zh", "Europe/London", "2004-07-15T00:00:00Z", "V", GMT_ZH+"+0100", "+1:00" },
         { "zh", "Europe/London", "2004-07-15T00:00:00Z", "zzzz", GMT_ZH+"+0100", "+1:00" },
         { "zh", "Europe/London", "2004-07-15T00:00:00Z", "v", "\u82f1\u56fd\u65f6\u95f4", "Europe/London" },
         { "zh", "Europe/London", "2004-07-15T00:00:00Z", "vvvv", "\u82f1\u56fd\u65f6\u95f4", "Europe/London" },

diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/RegionTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/RegionTest.java
index 1edc7ad2b6349f2e1231e4684a67d2061e7f6f26..aeaaa179090217f22f8b090c78d0588ec0edd2ae 100644 (file)
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/RegionTest.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/RegionTest.java
@@ -75,7 +75,7 @@ public class RegionTest extends TestFmwk {
             { "AI" , "660", "029", "TERRITORY" },
             { "AL" , "008", "039", "TERRITORY" },
             { "AM" , "051", "145", "TERRITORY" },
-            { "AN" , "530", "029", "TERRITORY" },
+            { "AN" , "530", null,  "DEPRECATED" },
             { "AO" , "024", "017", "TERRITORY" },
             { "AQ" , "010", "QO" , "TERRITORY" },
             { "AR" , "032", "005", "TERRITORY" },
@@ -98,7 +98,7 @@ public class RegionTest extends TestFmwk {
             { "BM" , "060", "021", "TERRITORY" },
             { "BN" , "096", "035", "TERRITORY" },
             { "BO" , "068", "005", "TERRITORY" },
-            { "BQ" , "010", "QO" , "TERRITORY" },
+            { "BQ" , "535", "029", "TERRITORY" },
             { "BR" , "076", "005", "TERRITORY" },
             { "BS" , "044", "029", "TERRITORY" },
             { "BT" , "064", "034", "TERRITORY" },
@@ -121,9 +121,9 @@ public class RegionTest extends TestFmwk {
             { "CO" , "170", "005", "TERRITORY" },
             { "CP" , "-1" , "QO" , "TERRITORY" },
             { "CR" , "188", "013", "TERRITORY" },
-            { "CS" , "891", null , "DEPRECATED" },
             { "CU" , "192", "029", "TERRITORY" },
             { "CV" , "132", "011", "TERRITORY" },
+            { "CW" , "531", "029", "TERRITORY" },
             { "CX" , "162", "QO" , "TERRITORY" },
             { "CY" , "196", "145", "TERRITORY" },
             { "CZ" , "203", "151", "TERRITORY" },
@@ -300,6 +300,7 @@ public class RegionTest extends TestFmwk {
             { "ST" , "678", "017", "TERRITORY" },
             { "SU" , "810", null , "DEPRECATED" },
             { "SV" , "222", "013", "TERRITORY" },
+            { "SX" , "534", "029", "TERRITORY" },
             { "SY" , "760", "145", "TERRITORY" },
             { "SZ" , "748", "018", "TERRITORY" },
             { "TA" , "-1" , "QO", "TERRITORY" },
@@ -338,7 +339,6 @@ public class RegionTest extends TestFmwk {
             { "YD" , "887", "145", "TERRITORY" },
             { "YE" , "887", "145", "TERRITORY" },
             { "YT" , "175", "014", "TERRITORY" },
-            { "YU" , "891", null , "DEPRECATED" },
             { "ZA" , "710", "018", "TERRITORY" },
             { "ZM" , "894", "014", "TERRITORY" },
             { "ZR" , "180", "017", "TERRITORY" },

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 2ed93232e43322c3dd7e98525dde17f3b789be31..28acd2dbfb479e2bdc2c26115f6df4cda159c093 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
@@ -3000,8 +3000,8 @@ public class ULocaleTest extends TestFmwk {
                 "vi"
             }, {
                 "und_VU",
-                "fr_Latn_VU",
-                "fr_VU"
+                "bi_Latn_VU",
+                "bi"
             }, {
                 "und_WF",
                 "fr_Latn_WF",