ICU-9876 Pre-integrate some CLDR 23 additions/changes (J), part 2c through CLDR r8106

X-SVN-Rev: 33117

diff --git a/icu4j/main/shared/data/icudata.jar b/icu4j/main/shared/data/icudata.jar
index 78800fc8f0e4089ee55096cab19981d13f050a41..26b5dc08991d5abc2427e5afa7740d66e49d10b6 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:38e0b75dbee62ba7caa6c8d5a74fcc4ebb7a102d9719590b679cdac9fa69bed1
-size 9812916
+oid sha256:734ec967ec9711f77c42f352753f4c2bf99dde2730138a163319da09865758a7
+size 9862065

diff --git a/icu4j/main/shared/data/icutzdata.jar b/icu4j/main/shared/data/icutzdata.jar
index ea7e224c93e86521f75aaceaa80bec6de3148dd1..99d2c91a2ade35677e7c808ebace680001548b84 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:b42770fcf338eb872b8ac021209fb6f3f50b773f7b3baa4bf9b45639f5cfdc8b
-size 97803
+oid sha256:cb660ff605bd77b969a865a080b411ed5a19ea367cfb78f227f5d34c520cc767
+size 97792

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 628420cffb9d7a6327dd15ab19bf42a9e44a35ab..f15e4a85012af1bacd7ea8985b2f7188fcf7090f 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
@@ -449,12 +449,12 @@ public class CollationServiceTest extends TestFmwk {
             {"en_029",          "standard", "search"},
             {"de_DE",           "standard", "phonebook", "search"},
             {"de_Latn_DE",      "standard", "phonebook", "search"},
-            {"zh",              "pinyin", "big5han", "gb2312han", "standard", "stroke", "zhuyin", "search"},
-            {"zh_Hans",         "pinyin", "big5han", "gb2312han", "standard", "stroke", "zhuyin", "search"},
-            {"zh_CN",           "pinyin", "big5han", "gb2312han", "standard", "stroke", "zhuyin", "search"},
-            {"zh_Hant",         "stroke", "big5han", "gb2312han", "pinyin", "standard", "zhuyin", "search"},
-            {"zh_TW",           "stroke", "big5han", "gb2312han", "pinyin", "standard", "zhuyin", "search"},
-            {"zh__PINYIN",      "pinyin", "big5han", "gb2312han", "standard", "stroke", "zhuyin", "search"},
+            {"zh",              "pinyin", "big5han", "gb2312han", "stroke", "zhuyin", "search", "standard"},
+            {"zh_Hans",         "pinyin", "big5han", "gb2312han", "stroke", "zhuyin", "search", "standard"},
+            {"zh_CN",           "pinyin", "big5han", "gb2312han", "stroke", "zhuyin", "search", "standard"},
+            {"zh_Hant",         "stroke", "big5han", "gb2312han", "pinyin", "zhuyin", "search", "standard"},
+            {"zh_TW",           "stroke", "big5han", "gb2312han", "pinyin", "zhuyin", "search", "standard"},
+            {"zh__PINYIN",      "pinyin", "big5han", "gb2312han", "stroke", "zhuyin", "search", "standard"},
             {"es_ES",           "standard", "search", "traditional"},
             {"es__TRADITIONAL", "traditional", "search", "standard"},
             {"und@collation=phonebook",     "standard", "search"},

diff --git a/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/AnyScriptTest.java b/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/AnyScriptTest.java
index 8549e7332a407d3df18052c7f94336f356f6c58e..7beb555a25a8484ae8a3d46b5d514e6058c9a7ce 100644 (file)
--- a/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/AnyScriptTest.java
+++ b/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/AnyScriptTest.java
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (C) 2009, Google, International Business Machines Corporation and         *
+ * Copyright (C) 2009-2013, Google, International Business Machines Corporation and         *
  * others. All Rights Reserved.                                                *
  *******************************************************************************
  */
@@ -106,9 +106,10 @@ public class AnyScriptTest extends TestFmwk {
         back = latin.transform(widePunctOnly);
         assertEquals("Should be ascii", punctOnly, back);
        
-        Transliterator t2 = Transliterator.getInstance("any-Han");
-        back = t2.transform(widePunctOnly);
-        assertEquals("Should be same", widePunctOnly, back);
+        // Han-Latin is now forward-only per CLDR ticket #5630
+        //Transliterator t2 = Transliterator.getInstance("any-Han");
+        //back = t2.transform(widePunctOnly);
+        //assertEquals("Should be same", widePunctOnly, back);
 
 
     }