From 9450ae0f6112f969f6ffa2fec36f61f8d66eb015 Mon Sep 17 00:00:00 2001 From: Peter Edberg Date: Tue, 19 Feb 2013 19:51:20 +0000 Subject: [PATCH] ICU-9925 Pick up the non-gregorian date format fixes from CLDR 8218 (J) X-SVN-Rev: 33272 --- icu4j/main/shared/data/icudata.jar | 4 ++-- icu4j/main/shared/data/icutzdata.jar | 2 +- .../com/ibm/icu/dev/test/format/DateTimeGeneratorTest.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/icu4j/main/shared/data/icudata.jar b/icu4j/main/shared/data/icudata.jar index 7358a558327..8658b8d19f0 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:e822856ec45e8ac873e1f8f8c8599632c31a9bd86e9df64de5d7d3c0886daf4c -size 9896872 +oid sha256:3cc70552bb5d5d5ce86ae4bafbb5e1854d15db7a14b0c87557a6ea3c6d459368 +size 9897633 diff --git a/icu4j/main/shared/data/icutzdata.jar b/icu4j/main/shared/data/icutzdata.jar index b4a7f79d808..5598c8ceaf3 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:5c470e4c5d0ee360393b47436b0688344291f28c253bb3337e06c9a10cc510e1 +oid sha256:0bceeb53847ff1aebe1066113370a609a2bd323aeb2348f3e27de42d149a0599 size 97789 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 b88161e077e..3af6a38f008 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 @@ -384,7 +384,7 @@ public class DateTimeGeneratorTest extends TestFmwk { new String[] {"jjmm", "23:58"}, new String[] {"mmss", "58:59"}, new String[] {"yyyyMMMM", "\u5E73\u621011\u5E741\u6708"}, - new String[] {"MMMEd", "1\u670813\u65E5(\u6C34)"}, + new String[] {"MMMEd", "1\u670813\u65E5\u6C34"}, // different than ICU4C's correct result, ICU4J code bug? #9952 new String[] {"Ed", "13\u65E5\u6C34"}, new String[] {"jmmssSSS", "23:58:59.123"}, new ULocale("zh_Hans_CN"), @@ -412,7 +412,7 @@ public class DateTimeGeneratorTest extends TestFmwk { new String[] {"Md", "1/13"}, new String[] {"MMMd", "1\u670813\u65E5"}, new String[] {"MMMMd", "1\u670813\u65E5"}, - new String[] {"yQQQ", "\u6C11\u570B88 1\u5B63"}, + new String[] {"yQQQ", "\u6C11\u570B88\u5E741\u5B63"}, new String[] {"hhmm", "\u4E0B\u534811:58"}, new String[] {"HHmm", "23:58"}, new String[] {"jjmm", "\u4E0B\u534811:58"}, -- 2.40.0