From 9a171c895a6b57d1d1425c41e9128bfe88ee2a7b Mon Sep 17 00:00:00 2001 From: Peter Edberg Date: Thu, 14 Feb 2013 09:47:03 +0000 Subject: [PATCH] ICU-9925 CLDR 23 pre-integration part 3, batch 3 (J) X-SVN-Rev: 33216 --- icu4j/main/shared/data/icudata.jar | 4 ++-- icu4j/main/shared/data/icutzdata.jar | 2 +- .../dev/test/calendar/CalendarRegression.java | 4 ++-- .../icu/dev/test/format/DateFormatTest.java | 6 ++--- .../test/format/DateTimeGeneratorTest.java | 24 +++++++++---------- 5 files changed, 19 insertions(+), 21 deletions(-) diff --git a/icu4j/main/shared/data/icudata.jar b/icu4j/main/shared/data/icudata.jar index 0edc0f8e6cf..345638f616f 100755 --- 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:251e4d66838acc33f7c1ff44b7d67df9f74754997bd73bb7412be3a8176fa277 -size 9892561 +oid sha256:a2f1ba51e7c7e10f2b4eba69b837682b22e560e50a6a4139e2018e941d925842 +size 9886234 diff --git a/icu4j/main/shared/data/icutzdata.jar b/icu4j/main/shared/data/icutzdata.jar index 759e64cd9a6..8505c906bbb 100755 --- 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:7d6b8b2960462c0b321a15649ac87ba7ceaf6f59b23b9eca46d1a6404eed31d2 +oid sha256:0170b27eb556b2a9d0f4b683039f2cdee84a6cbc88ffcc7d6373e8dfdb1f4e83 size 97786 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/calendar/CalendarRegression.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/calendar/CalendarRegression.java index 22a1fee2cbd..88fd6771031 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/calendar/CalendarRegression.java +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/calendar/CalendarRegression.java @@ -1,6 +1,6 @@ /** ******************************************************************************* - * Copyright (C) 2000-2012, International Business Machines Corporation and * + * Copyright (C) 2000-2013, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ @@ -2115,7 +2115,7 @@ public class CalendarRegression extends com.ibm.icu.dev.test.TestFmwk { {"th@calendar=gregorian", "buddhist", "gregorian"}, {"en@calendar=islamic", "gregorian"}, {"zh_TW", "gregorian", "roc", "chinese"}, - {"ar_IR", "gregorian", "persian", "islamic", "islamic-civil"}, + {"ar_IR", "persian", "gregorian", "islamic", "islamic-civil"}, }; String[] ALL = Calendar.getKeywordValuesForLocale("calendar", ULocale.getDefault(), false); 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 87a81931115..49397bdcbc2 100644 --- 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 @@ -3972,14 +3972,14 @@ public class DateFormatTest extends com.ibm.icu.dev.test.TestFmwk { } }; final MonthPatternItem[] items = { - new MonthPatternItem( "root@calendar=chinese", DateFormat.LONG, "ren-chen month4 2", "ren-chen month4bis 2", "ren-chen month5 2" ), + new MonthPatternItem( "root@calendar=chinese", DateFormat.LONG, "ren-chen Month4 2", "ren-chen Month4bis 2", "ren-chen Month5 2" ), new MonthPatternItem( "root@calendar=chinese", DateFormat.SHORT, "29-04-02", "29-04bis-02", "29-05-02" ), new MonthPatternItem( "root@calendar=chinese", -1, "29-4-2", "29-4bis-2", "29-5-2" ), new MonthPatternItem( "root@calendar=chinese", -2, "78x29-4-2", "78x29-4bis-2", "78x29-5-2" ), new MonthPatternItem( "root@calendar=chinese", -3, "ren-chen-4-2", "ren-chen-4bis-2", "ren-chen-5-2" ), - new MonthPatternItem( "root@calendar=chinese", -4, "ren-chen month4 2", "ren-chen month4bis 2", "ren-chen month5 2" ), + new MonthPatternItem( "root@calendar=chinese", -4, "ren-chen Month4 2", "ren-chen Month4bis 2", "ren-chen Month5 2" ), new MonthPatternItem( "en@calendar=gregorian", -3, "2012-4-22", "2012-5-22", "2012-6-20" ), - new MonthPatternItem( "en@calendar=chinese", DateFormat.LONG, "month4 2, ren-chen", "month4bis 2, ren-chen", "month5 2, ren-chen" ), + new MonthPatternItem( "en@calendar=chinese", DateFormat.LONG, "Month4 2, ren-chen", "Month4bis 2, ren-chen", "Month5 2, ren-chen" ), new MonthPatternItem( "en@calendar=chinese", DateFormat.SHORT, "4/2/29", "4bis/2/29", "5/2/29" ), new MonthPatternItem( "zh@calendar=chinese", DateFormat.LONG, "\u58EC\u8FB0\u5E74\u56DB\u6708\u4E8C\u65E5", "\u58EC\u8FB0\u5E74\u95F0\u56DB\u6708\u4E8C\u65E5", 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 1f06417aad3..b88161e077e 100644 --- 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 @@ -286,23 +286,21 @@ public class DateTimeGeneratorTest extends TestFmwk { new String[] {"Ed", "13 Wed"}, new String[] {"jmmssSSS", "11:58:59.123 PM"}, new ULocale("en_US@calendar=japanese"), // (new locale for testing ticket 6872<-5702) - // with current changes for CLDR #5385 this is getting data from root - // will need to redo some of these when that is fixed - new String[] {"yM", "H 11-01"}, // root style - new String[] {"yMMM", "Heisei 11 Jan"}, // root style - new String[] {"yMd", "H 11-01-13"}, // root style - new String[] {"yMMMd", "Heisei 11 Jan 13"}, // root style - new String[] {"Md", "01-13"}, // root style + new String[] {"yM", "1/11 H"}, + new String[] {"yMMM", "Jan 11 Heisei"}, + new String[] {"yMd", "1/13/11 H"}, + new String[] {"yMMMd", "Jan 13, 11 Heisei"}, + new String[] {"Md", "1/13"}, new String[] {"MMMd", "Jan 13"}, new String[] {"MMMMd", "January 13"}, - new String[] {"yQQQ", "Heisei 11 Q1"}, // root style + new String[] {"yQQQ", "Q1 11 Heisei"}, new String[] {"hhmm", "11:58 PM"}, new String[] {"HHmm", "23:58"}, new String[] {"jjmm", "11:58 PM"}, new String[] {"mmss", "58:59"}, - new String[] {"yyyyMMMM", "Heisei 11 January"}, // root style - new String[] {"MMMEd", "Jan 13, Wed"}, // root style - new String[] {"Ed", "13, Wed"}, // root style + new String[] {"yyyyMMMM", "January 11 Heisei"}, + new String[] {"MMMEd", "Wed, Jan 13"}, + new String[] {"Ed", "13 Wed"}, new String[] {"jmmssSSS", "11:58:59.123 PM"}, new ULocale("de_DE"), new String[] {"yM", "1.1999"}, @@ -385,7 +383,7 @@ public class DateTimeGeneratorTest extends TestFmwk { new String[] {"HHmm", "23:58"}, new String[] {"jjmm", "23:58"}, new String[] {"mmss", "58:59"}, - new String[] {"yyyyMMMM", "\u5E73\u62100011\u5E741\u6708"}, + new String[] {"yyyyMMMM", "\u5E73\u621011\u5E741\u6708"}, new String[] {"MMMEd", "1\u670813\u65E5(\u6C34)"}, new String[] {"Ed", "13\u65E5\u6C34"}, new String[] {"jmmssSSS", "23:58:59.123"}, @@ -419,7 +417,7 @@ public class DateTimeGeneratorTest extends TestFmwk { new String[] {"HHmm", "23:58"}, new String[] {"jjmm", "\u4E0B\u534811:58"}, new String[] {"mmss", "58:59"}, - new String[] {"yyyyMMMM", "\u6C11\u570B0088\u5E741\u6708"}, + new String[] {"yyyyMMMM", "\u6C11\u570B88\u5E741\u6708"}, new String[] {"MMMEd", "1\u670813\u65E5\u9031\u4E09"}, new String[] {"Ed", "13\u65E5\uFF08\u9031\u4E09\uFF09"}, new String[] {"jmmssSSS", "\u4E0B\u534811:58:59.123"}, -- 2.40.0