From 8aa0a3c3766b40bf4661355d142f642b0a6c6304 Mon Sep 17 00:00:00 2001 From: Peter Edberg Date: Wed, 18 Jan 2012 03:28:45 +0000 Subject: [PATCH] ICU-9055 Integrate Chinese cal pattern updates from cldrbug 4237, update tests (C) X-SVN-Rev: 31220 --- icu4c/source/data/locales/fr.txt | 10 +- icu4c/source/data/locales/ja.txt | 272 ++++++++++++++++++++---- icu4c/source/data/locales/ko.txt | 88 +++++++- icu4c/source/data/locales/root.txt | 16 +- icu4c/source/data/locales/zh.txt | 26 +-- icu4c/source/data/locales/zh_Hant.txt | 34 +-- icu4c/source/test/intltest/dtfmttst.cpp | 40 ++-- 7 files changed, 377 insertions(+), 109 deletions(-) diff --git a/icu4c/source/data/locales/fr.txt b/icu4c/source/data/locales/fr.txt index 337370eabc4..07dc2a46651 100644 --- a/icu4c/source/data/locales/fr.txt +++ b/icu4c/source/data/locales/fr.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2011 International Business Machines +// * Copyright (C) 2012 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java // * Source File:/common/main/fr.xml @@ -43,7 +43,7 @@ fr{ } } } - Version{"2.0.62.75"} + Version{"2.0.63.60"} calendar{ buddhist{ DateTimePatterns{ @@ -113,9 +113,9 @@ fr{ "HH:mm:ss z", "HH:mm:ss", "HH:mm", - "EEEE d MMMM y", - "d MMMM y", - "d MMM y", + "EEEE d MMMM U", + "d MMMM U", + "d MMM U", "d/M/y", "{1} {0}", "{1} {0}", diff --git a/icu4c/source/data/locales/ja.txt b/icu4c/source/data/locales/ja.txt index 31ea2d52db7..295429968c9 100644 --- a/icu4c/source/data/locales/ja.txt +++ b/icu4c/source/data/locales/ja.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2011 International Business Machines +// * Copyright (C) 2012 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java // * Source File:/common/main/ja.xml @@ -89,7 +89,7 @@ ja{ } } } - Version{"2.0.61.77"} + Version{"2.0.63.66"} calendar{ buddhist{ DateTimePatterns{ @@ -97,18 +97,18 @@ ja{ "H:mm:ss z", "H:mm:ss", "H:mm", - "Gy年M月d日EEEE", - "Gy年M月d日", + "GGGGy年M月d日EEEE", + "GGGGy年M月d日", "Gy/MM/dd", "Gy/MM/dd", "{1} {0}", - "{1}{0}", - "{1}{0}", + "{1} {0}", + "{1} {0}", "{1} {0}", "{1} {0}", } availableFormats{ - Ed{"d日(EEE)"} + Ed{"d日(E)"} GGGGyMd{"GGGGy年M月d日"} Gy{"Gy年"} H{"H時"} @@ -126,15 +126,216 @@ ja{ hm{"aK:mm"} hms{"aK:mm:ss"} ms{"mm:ss"} - y{"Gy年"} - yyyy{"Gy年"} - yyyyMEd{"Gyy/M/d(E)"} - yyyyMM{"Gyy/MM"} - yyyyMMM{"Gy年M月"} - yyyyMMMEd{"Gy年M月d日(EEE)"} - yyyyMMMd{"Gy年M月d日"} - yyyyMd{"Gyy/M/d"} - yyyyQ{"Gyy/Q"} + y{"GGGGy年"} + yyyy{"GGGGy年"} + yyyyMEd{"Gy/M/d(E)"} + yyyyMM{"Gy/MM"} + yyyyMMM{"GGGGy年M月"} + yyyyMMMEd{"GGGGy年M月d日(E)"} + yyyyMMMd{"GGGGy年M月d日"} + yyyyMd{"Gy/M/d"} + yyyyQ{"Gy/Q"} + } + eras{ + wide{ + "仏暦", + } + } + } + chinese{ + DateTimePatterns{ + "H時mm分ss秒 zzzz", + "H:mm:ss z", + "H:mm:ss", + "H:mm", + { + "U年MMMd日EEEE", + "hanidec", + } + { + "U年MMMd日", + "hanidec", + } + { + "U年MMMd日", + "hanidec", + } + "U-M-d", + "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + } + availableFormats{ + EEEd{"d日(E)"} + M{"MMM"} + MEd{"M-d(E)"} + MMMEd{"M月d日(E)"} + MMMd{"M月d日"} + d{"d日"} + y{"U年"} + yM{"U年M月"} + yMEd{"U年M月d日(E)"} + yMMM{"U年M月"} + yMMMEd{"U年M月d日(E)"} + yMMMd{"U年M月d日"} + yMd{"U年M月d日"} + } + cyclicNameSets{ + dayParts{ + format{ + abbreviated{ + "子", + "丑", + "寅", + "卯", + "辰", + "巳", + "午", + "未", + "申", + "酉", + "戌", + "亥", + } + } + } + years{ + format{ + abbreviated{ + "甲子", + "乙丑", + "丙寅", + "丁卯", + "戊辰", + "己巳", + "庚午", + "辛未", + "壬申", + "癸酉", + "甲戌", + "乙亥", + "丙子", + "丁丑", + "戊寅", + "己卯", + "庚辰", + "辛巳", + "壬午", + "癸未", + "甲申", + "乙酉", + "丙戌", + "丁亥", + "戊子", + "己丑", + "庚寅", + "辛卯", + "壬辰", + "癸巳", + "甲午", + "乙未", + "丙申", + "丁酉", + "戊戌", + "己亥", + "庚子", + "辛丑", + "壬寅", + "癸卯", + "甲辰", + "乙巳", + "丙午", + "丁未", + "戊申", + "己酉", + "庚戌", + "辛亥", + "壬子", + "癸丑", + "甲寅", + "乙卯", + "丙辰", + "丁巳", + "戊午", + "己未", + "庚申", + "辛酉", + "壬戌", + "癸亥", + } + } + } + zodiacs{ + format{ + abbreviated{ + "鼠", + "牛", + "虎", + "兎", + "竜", + "蛇", + "馬", + "羊", + "猿", + "鶏", + "犬", + "猪", + } + } + } + } + monthNames{ + format{ + wide{ + "正月", + "二月", + "三月", + "四月", + "五月", + "六月", + "七月", + "八月", + "九月", + "十月", + "十一月", + "十二月", + } + } + stand-alone{ + narrow{ + "正", + "二", + "三", + "四", + "五", + "六", + "七", + "八", + "九", + "十", + "十一", + "十二", + } + } + } + monthPatterns{ + format{ + wide{ + leap{"閏{0}"} + } + } + numeric{ + all{ + leap{"閏{0}"} + } + } + stand-alone{ + narrow{ + leap{"閏{0}"} + } + } } } coptic{ @@ -286,16 +487,15 @@ ja{ "y年M月d日EEEE", "y年M月d日", "yyyy/MM/dd", - "yy/MM/dd", + "yyyy/MM/dd", + "{1} {0}", + "{1} {0}", "{1} {0}", - "{1}{0}", - "{1}{0}", "{1} {0}", "{1} {0}", } availableFormats{ - EEEd{"d日(EEE)"} - Ed{"d日(EEE)"} + EEEd{"d日(E)"} GGGGyMd{"GGGGy年M月d日"} H{"H時"} Hm{"H:mm"} @@ -314,9 +514,9 @@ ja{ ms{"mm:ss"} y{"y年"} yM{"y/M"} - yMEd{"y/M/d(EEE)"} + yMEd{"y/M/d(E)"} yMMM{"y年M月"} - yMMMEd{"y年M月d日(EEE)"} + yMMMEd{"y年M月d日(E)"} yMMMd{"y年M月d日"} yMd{"y/M/d"} yQ{"y/Q"} @@ -847,14 +1047,14 @@ ja{ "{1} {0}", } availableFormats{ - Ed{"d日(EEE)"} + Ed{"d日(E)"} Gy{"Gy年"} H{"H時"} Hm{"H:mm"} Hms{"H:mm:ss"} M{"M月"} MEd{"M/d(E)"} - MMMEd{"M月d日(EEE)"} + MMMEd{"M月d日(E)"} MMMd{"M月d日"} Md{"M/d"} d{"d日"} @@ -863,12 +1063,12 @@ ja{ hms{"aK:mm:ss"} y{"Gy年"} yyyy{"Gy年"} - yyyyMEd{"Gyy/M/d(E)"} + yyyyMEd{"Gy/M/d(E)"} yyyyMM{"Gyy/MM"} yyyyMMM{"Gy年M月"} - yyyyMMMEd{"Gy年M月d日(EEE)"} + yyyyMMMEd{"Gy年M月d日(E)"} yyyyMMMd{"Gy年M月d日"} - yyyyMd{"Gyy/M/d"} + yyyyMd{"Gy/M/d"} yyyyQ{"Gy/Q"} yyyyQQQ{"Gy/QQQ"} } @@ -1188,13 +1388,13 @@ ja{ "Gy/MM/dd", "Gy/MM/dd", "{1} {0}", - "{1}{0}", - "{1}{0}", + "{1} {0}", + "{1} {0}", "{1} {0}", "{1} {0}", } availableFormats{ - Ed{"d日(EEE)"} + Ed{"d日(E)"} Gy{"Gy年"} H{"H時"} Hm{"H:mm"} @@ -1202,7 +1402,7 @@ ja{ M{"M月"} MEd{"M/d(E)"} MMM{"M月"} - MMMEd{"M月d日(EEE)"} + MMMEd{"M月d日(E)"} MMMd{"M月d日"} Md{"M/d"} d{"d日"} @@ -1211,12 +1411,12 @@ ja{ hms{"aK:mm:ss"} y{"Gy年"} yyyy{"Gy年"} - yyyyMEd{"Gyy/M/d(E)"} - yyyyMM{"Gyy/MM"} + yyyyMEd{"Gy/M/d(E)"} + yyyyMM{"Gy/MM"} yyyyMMM{"Gy年M月"} - yyyyMMMEd{"Gy年M月d日(EEE)"} + yyyyMMMEd{"Gy年M月d日(E)"} yyyyMMMd{"Gy年M月d日"} - yyyyMd{"Gyy/M/d"} + yyyyMd{"Gy/M/d"} yyyyQ{"Gy/Q"} yyyyQQQ{"Gy/QQQ"} } diff --git a/icu4c/source/data/locales/ko.txt b/icu4c/source/data/locales/ko.txt index 00f2272de61..dda5cdb5d0a 100644 --- a/icu4c/source/data/locales/ko.txt +++ b/icu4c/source/data/locales/ko.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2011 International Business Machines +// * Copyright (C) 2012 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java // * Source File:/common/main/ko.xml @@ -61,7 +61,7 @@ ko{ } } } - Version{"2.0.62.55"} + Version{"2.0.63.64"} calendar{ buddhist{ DateTimePatterns{ @@ -80,6 +80,7 @@ ko{ "{1} {0}", } availableFormats{ + EEEEd{"d일 EEEE"} EEEd{"d일 (EEE)"} Gy{"G y년"} H{"H시"} @@ -87,6 +88,7 @@ ko{ Hm{"HH:mm"} Hms{"H시 m분 s초"} M{"M월"} + MEEEEd{"M. d. EEEE"} MEd{"M. d. (E)"} MMM{"LLL"} MMMEd{"MMM d일 (E)"} @@ -126,16 +128,84 @@ ko{ "a h시 m분 s초 z", "a h:mm:ss", "a h:mm", - "y-M-d EEEE", - "y-M-d", - "y-M-d", - "y-M-d", + "U년 M월 d일 EEEE", + "U년 M월 d일", + "y. M. d.", + "y. M. d.", "{1} {0}", "{1} {0}", "{1} {0}", "{1} {0}", "{1} {0}", } + cyclicNameSets{ + years{ + format{ + abbreviated{ + "갑자", + "을축", + "병인", + "정묘", + "무진", + "기사", + "경오", + "신미", + "임신", + "계유", + "갑술", + "을해", + "병자", + "정축", + "무인", + "기묘", + "경진", + "신사", + "임오", + "계미", + "갑신", + "을유", + "병술", + "정해", + "무자", + "기축", + "경인", + "신묘", + "임진", + "계사", + "갑오", + "을미", + "병신", + "정유", + "무술", + "기해", + "경자", + "신축", + "임인", + "계묘", + "갑진", + "을사", + "병오", + "정미", + "무신", + "기유", + "경술", + "신해", + "임자", + "계축", + "갑인", + "을묘", + "병진", + "정사", + "무오", + "기미", + "경신", + "신유", + "임술", + "계해", + } + } + } + } } gregorian{ AmPmMarkers{ @@ -158,12 +228,14 @@ ko{ "{1} {0}", } availableFormats{ + EEEEd{"d일 EEEE"} EEEd{"d일 (EEE)"} H{"H시"} HHmmss{"HH:mm:ss"} Hm{"HH:mm"} Hms{"H시 m분 s초"} M{"M월"} + MEEEEd{"M. d. EEEE"} MEd{"M. d. (E)"} MMM{"LLL"} MMMEd{"MMM d일 (E)"} @@ -472,6 +544,7 @@ ko{ "{1} {0}", } availableFormats{ + EEEEd{"d일 EEEE"} EEEd{"d일 (EEE)"} Gy{"G yy년"} H{"H시"} @@ -479,6 +552,7 @@ ko{ Hm{"HH:mm"} Hms{"H시 m분 s초"} M{"M월"} + MEEEEd{"M. d. EEEE"} MEd{"M. d. (E)"} MMM{"LLL"} MMMEd{"MMM d일 (E)"} @@ -764,12 +838,14 @@ ko{ "{1} {0}", } availableFormats{ + EEEEd{"d일 EEEE"} EEEd{"d일 (EEE)"} H{"H시"} HHmmss{"HH:mm:ss"} Hm{"HH:mm"} Hms{"H시 m분 s초"} M{"M월"} + MEEEEd{"M. d. EEEE"} MEd{"M. d. (E)"} MMM{"LLL"} MMMEd{"MMM d일 (E)"} diff --git a/icu4c/source/data/locales/root.txt b/icu4c/source/data/locales/root.txt index 603122edd36..53c10d3a731 100644 --- a/icu4c/source/data/locales/root.txt +++ b/icu4c/source/data/locales/root.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2011 International Business Machines +// * Copyright (C) 2012 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java // * Source File:/common/main/root.xml @@ -73,7 +73,7 @@ root{ 297, 210, } - Version{"2.0.62.84"} + Version{"2.0.63.66"} calendar{ buddhist{ AmPmMarkers:alias{"/LOCALE/calendar/gregorian/AmPmMarkers"} @@ -151,9 +151,9 @@ root{ "HH:mm:ss z", "HH:mm:ss", "HH:mm", - "EEEE, y-M-d", - "y-M-d", - "y-M-d", + "EEEE, U MMMM dd", + "U MMMM d", + "U MMM d", "y-M-d", "{1} {0}", "{1} {0}", @@ -258,10 +258,6 @@ root{ } dayNames:alias{"/LOCALE/calendar/gregorian/dayNames"} intervalFormats:alias{"/LOCALE/calendar/gregorian/intervalFormats"} - isLeapMonth{ - "", - "*", - } monthNames{ default{"format"} format{ @@ -318,7 +314,7 @@ root{ stand-alone{ abbreviated:alias{"/LOCALE/calendar/chinese/monthPatterns/format/abbreviated"} narrow{ - leap{"{0}bis"} + leap{"{0}b"} } wide:alias{"/LOCALE/calendar/chinese/monthPatterns/format/wide"} } diff --git a/icu4c/source/data/locales/zh.txt b/icu4c/source/data/locales/zh.txt index 6c5c71ab382..a5efa5912b0 100644 --- a/icu4c/source/data/locales/zh.txt +++ b/icu4c/source/data/locales/zh.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2011 International Business Machines +// * Copyright (C) 2012 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java // * Source File:/common/main/zh.xml @@ -87,7 +87,7 @@ zh{ } } } - Version{"2.0.62.76"} + Version{"2.0.63.60"} calendar{ buddhist{ DateTimePatterns{ @@ -148,18 +148,18 @@ zh{ "ah:mm:ss", "ah:mm", { - "y年MMMd日EEEE", + "U年MMMd日EEEE", "hanidec", } { - "y年MMMd日", + "U年MMMd日", "hanidec", } { - "y年MMMd日", + "U年MMMd日", "hanidec", } - "yy-M-d", + "U-M-d", "{1} {0}", "{1}{0}", "{1}{0}", @@ -173,13 +173,13 @@ zh{ MMMEd{"M月d日E"} MMMd{"M月d日"} d{"d日"} - y{"y年"} - yM{"y年M月"} - yMEd{"y年M月d日，E"} - yMMM{"y年M月"} - yMMMEd{"y年M月d日EEE"} - yMMMd{"y年M月d日"} - yMd{"y年M月d日"} + y{"U年"} + yM{"U年M月"} + yMEd{"U年M月d日，E"} + yMMM{"U年M月"} + yMMMEd{"U年M月d日EEE"} + yMMMd{"U年M月d日"} + yMd{"U年M月d日"} } cyclicNameSets{ dayParts{ diff --git a/icu4c/source/data/locales/zh_Hant.txt b/icu4c/source/data/locales/zh_Hant.txt index 3818592149a..1f1d3c87f3e 100644 --- a/icu4c/source/data/locales/zh_Hant.txt +++ b/icu4c/source/data/locales/zh_Hant.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2011 International Business Machines +// * Copyright (C) 2012 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java // * Source File:/common/main/zh_Hant.xml @@ -85,7 +85,7 @@ zh_Hant{ } } } - Version{"2.0.62.76"} + Version{"2.0.63.67"} calendar{ buddhist{ DateTimePatterns{ @@ -149,18 +149,18 @@ zh_Hant{ "ah:mm:ss", "ah:mm", { - "y年MMMd日EEEE", + "U年MMMd日EEEE", "hanidec", } { - "y年MMMd日", + "U年MMMd日", "hanidec", } { - "y年MMMd日", + "U年MMMd日", "hanidec", } - "yy-M-d", + "U-M-d", "{1} {0}", "{1}{0}", "{1}{0}", @@ -174,13 +174,13 @@ zh_Hant{ MMMEd{"M月d日E"} MMMd{"M月d日"} d{"d日"} - y{"y年"} - yM{"y年M月"} - yMEd{"y年M月d日，E"} - yMMM{"y年M月"} - yMMMEd{"y年M月d日EEE"} - yMMMd{"y年M月d日"} - yMd{"y年M月d日"} + y{"U年"} + yM{"U年M月"} + yMEd{"U年M月d日，E"} + yMMM{"U年M月"} + yMMMEd{"U年M月d日EEE"} + yMMMd{"U年M月d日"} + yMd{"U年M月d日"} } cyclicNameSets{ dayParts{ @@ -305,7 +305,7 @@ zh_Hant{ } stand-alone{ narrow{ - "正", + "一", "二", "三", "四", @@ -323,17 +323,17 @@ zh_Hant{ monthPatterns{ format{ wide{ - leap{"闰{0}"} + leap{"閏{0}"} } } numeric{ all{ - leap{"闰{0}"} + leap{"閏{0}"} } } stand-alone{ narrow{ - leap{"闰{0}"} + leap{"閏{0}"} } } } diff --git a/icu4c/source/test/intltest/dtfmttst.cpp b/icu4c/source/test/intltest/dtfmttst.cpp index 0a241ef7130..ba6be163570 100644 --- a/icu4c/source/test/intltest/dtfmttst.cpp +++ b/icu4c/source/test/intltest/dtfmttst.cpp @@ -3390,20 +3390,12 @@ void DateFormatTest::Test6726(void) strs = fmts->format(dt, strs); -/* Locale data is not yet updated - if (strf.charAt(13) == UChar(0x20)) { - errln((UnicodeString)"FAIL: Improper formatted date: " + strf); - } - if (strl.charAt(10) == UChar(0x20)) { - errln((UnicodeString)"FAIL: Improper formatted date: " + strl); - } -*/ logln("strm.charAt(10)=%04X wanted 0x20\n", strm.charAt(10)); if (strm.charAt(10) != UChar(0x0020)) { errln((UnicodeString)"FAIL: Improper formatted date: " + strm ); } logln("strs.charAt(10)=%04X wanted 0x20\n", strs.charAt(8)); - if (strs.charAt(8) != UChar(0x0020)) { + if (strs.charAt(10) != UChar(0x0020)) { errln((UnicodeString)"FAIL: Improper formatted date: " + strs); } @@ -3738,31 +3730,35 @@ void DateFormatTest::TestMonthPatterns() const MonthPatternItem items[] = { // locale date style; expected formats for the 3 dates above - { "root@calendar=chinese", DateFormat::kLong, { UnicodeString("29-4-2"), UnicodeString("29-4bis-2"), UnicodeString("29-5-2") } }, + { "root@calendar=chinese", DateFormat::kLong, { UnicodeString("ren-chen 4 2"), UnicodeString("ren-chen 4bis 2"), UnicodeString("ren-chen 5 2") } }, { "root@calendar=chinese", DateFormat::kShort, { UnicodeString("29-4-2"), UnicodeString("29-4bis-2"), UnicodeString("29-5-2") } }, { "root@calendar=chinese", -1, { UnicodeString("29-4-2"), UnicodeString("29-4bis-2"), UnicodeString("29-5-2") } }, { "root@calendar=chinese", -2, { UnicodeString("78x29-4-2"), UnicodeString("78x29-4bis-2"), UnicodeString("78x29-5-2") } }, { "root@calendar=chinese", -3, { UnicodeString("ren-chen-4-2"), UnicodeString("ren-chen-4bis-2"), UnicodeString("ren-chen-5-2") } }, { "root@calendar=chinese", -4, { UnicodeString("ren-chen 4 2"), UnicodeString("ren-chen 4bis 2"), UnicodeString("ren-chen 5 2") } }, - { "en@calendar=chinese", DateFormat::kLong, { UnicodeString("29-4-2"), UnicodeString("29-4bis-2"), UnicodeString("29-5-2") } }, + { "en@calendar=chinese", DateFormat::kLong, { UnicodeString("ren-chen 4 2"), UnicodeString("ren-chen 4bis 2"), UnicodeString("ren-chen 5 2") } }, { "en@calendar=chinese", DateFormat::kShort, { UnicodeString("29-4-2"), UnicodeString("29-4bis-2"), UnicodeString("29-5-2") } }, - { "zh@calendar=chinese", DateFormat::kLong, { CharsToUnicodeString("\\u4E8C\\u4E5D\\u5E74\\u56DB\\u6708\\u4E8C\\u65E5"), - CharsToUnicodeString("\\u4E8C\\u4E5D\\u5E74\\u95F0\\u56DB\\u6708\\u4E8C\\u65E5"), - CharsToUnicodeString("\\u4E8C\\u4E5D\\u5E74\\u4E94\\u6708\\u4E8C\\u65E5") } }, - { "zh@calendar=chinese", DateFormat::kShort, { UnicodeString("29-4-2"), CharsToUnicodeString("29-\\u95F04-2"), UnicodeString("29-5-2") } }, + { "zh@calendar=chinese", DateFormat::kLong, { CharsToUnicodeString("\\u58EC\\u8FB0\\u5E74\\u56DB\\u6708\\u4E8C\\u65E5"), + CharsToUnicodeString("\\u58EC\\u8FB0\\u5E74\\u95F0\\u56DB\\u6708\\u4E8C\\u65E5"), + CharsToUnicodeString("\\u58EC\\u8FB0\\u5E74\\u4E94\\u6708\\u4E8C\\u65E5") } }, + { "zh@calendar=chinese", DateFormat::kShort, { CharsToUnicodeString("\\u58EC\\u8FB0-4-2"), + CharsToUnicodeString("\\u58EC\\u8FB0-\\u95F04-2"), + CharsToUnicodeString("\\u58EC\\u8FB0-5-2") } }, { "zh@calendar=chinese", -3, { CharsToUnicodeString("\\u58EC\\u8FB0-4-2"), CharsToUnicodeString("\\u58EC\\u8FB0-\\u95F04-2"), CharsToUnicodeString("\\u58EC\\u8FB0-5-2") } }, { "zh@calendar=chinese", -4, { CharsToUnicodeString("\\u58EC\\u8FB0 \\u56DB\\u6708 2"), CharsToUnicodeString("\\u58EC\\u8FB0 \\u95F0\\u56DB\\u6708 2"), CharsToUnicodeString("\\u58EC\\u8FB0 \\u4E94\\u6708 2") } }, - { "zh_Hant@calendar=chinese", DateFormat::kLong, { CharsToUnicodeString("\\u4E8C\\u4E5D\\u5E74\\u56DB\\u6708\\u4E8C\\u65E5"), - CharsToUnicodeString("\\u4E8C\\u4E5D\\u5E74\\u95F0\\u56DB\\u6708\\u4E8C\\u65E5"), - CharsToUnicodeString("\\u4E8C\\u4E5D\\u5E74\\u4E94\\u6708\\u4E8C\\u65E5") } }, - { "zh_Hant@calendar=chinese", DateFormat::kShort, { UnicodeString("29-4-2"), CharsToUnicodeString("29-\\u95F04-2"), UnicodeString("29-5-2") } }, - { "fr@calendar=chinese", DateFormat::kLong, { CharsToUnicodeString("2 s\\u00ECyu\\u00E8 29"), - CharsToUnicodeString("2 s\\u00ECyu\\u00E8bis 29"), - CharsToUnicodeString("2 w\\u01D4yu\\u00E8 29") } }, + { "zh_Hant@calendar=chinese", DateFormat::kLong, { CharsToUnicodeString("\\u58EC\\u8FB0\\u5E74\\u56DB\\u6708\\u4E8C\\u65E5"), + CharsToUnicodeString("\\u58EC\\u8FB0\\u5E74\\u958F\\u56DB\\u6708\\u4E8C\\u65E5"), + CharsToUnicodeString("\\u58EC\\u8FB0\\u5E74\\u4E94\\u6708\\u4E8C\\u65E5") } }, + { "zh_Hant@calendar=chinese", DateFormat::kShort, { CharsToUnicodeString("\\u58EC\\u8FB0-4-2"), + CharsToUnicodeString("\\u58EC\\u8FB0-\\u958F4-2"), + CharsToUnicodeString("\\u58EC\\u8FB0-5-2") } }, + { "fr@calendar=chinese", DateFormat::kLong, { CharsToUnicodeString("2 s\\u00ECyu\\u00E8 ren-chen"), + CharsToUnicodeString("2 s\\u00ECyu\\u00E8bis ren-chen"), + CharsToUnicodeString("2 w\\u01D4yu\\u00E8 ren-chen") } }, { "fr@calendar=chinese", DateFormat::kShort, { UnicodeString("2/4/29"), UnicodeString("2/4bis/29"), UnicodeString("2/5/29") } }, // terminator { NULL, 0, { UnicodeString(""), UnicodeString(""), UnicodeString("") } } -- 2.40.0