ICU-11173 CLDR tags/release-26-d03 into ICU4C trunk, remove logKnownIssue 11219, fix test for cldrbug:7868

X-SVN-Rev: 36377
This commit is contained in:
Peter Edberg 2014-09-06 06:15:08 +00:00
parent f35551771f
commit 92a7528223
11 changed files with 160 additions and 168 deletions

View file

@ -1689,5 +1689,5 @@ ko{
CurrencyUnitPatterns{
other{"{0} {1}"}
}
Version{"2.1.8.9"}
Version{"2.1.9.31"}
}

View file

@ -888,7 +888,7 @@ ko{
VAIDIKA{"바이디카"}
VALLADER{"발라더"}
}
Version{"2.1.8.9"}
Version{"2.1.9.31"}
codePatterns{
language{"언어: {0}"}
script{"스크립트: {0}"}

View file

@ -165,7 +165,7 @@ ko{
minimumGroupingDigits{"1"}
native{"latn"}
}
Version{"2.1.8.9"}
Version{"2.1.9.31"}
calendar{
buddhist{
eras{
@ -180,8 +180,8 @@ ko{
"a h시 m분 s초 z",
"a h:mm:ss",
"a h:mm",
"U년 M d일 EEEE",
"U년 M d일",
"U년 MMM d일 EEEE",
"U년 MMM d일",
"y. M. d.",
"y. M. d.",
"{1} {0}",
@ -200,7 +200,7 @@ ko{
GyMMMd{"U년 MMM d일"}
H{"H시"}
Hms{"H시 m분 s초"}
M{"M"}
M{"MMM"}
MEEEEd{"M. d. EEEE"}
MEd{"M. d. (E)"}
MMM{"LLL"}
@ -324,20 +324,68 @@ ko{
}
}
}
monthPatterns{
monthNames{
format{
wide{
leap{"윤{0}월"}
abbreviated{
"1월",
"2월",
"3월",
"4월",
"5월",
"6월",
"7월",
"8월",
"9월",
"10월",
"11월",
"12월",
}
}
numeric{
all{
leap{"윤{0}월"}
wide{
"1월",
"2월",
"3월",
"4월",
"5월",
"6월",
"7월",
"8월",
"9월",
"10월",
"11월",
"12월",
}
}
stand-alone{
narrow{
leap{"윤{0}월"}
"1",
"2",
"3",
"4",
"5",
"6",
"7",
"8",
"9",
"10",
"11",
"12",
}
}
}
monthPatterns{
format{
wide{
leap{"윤{0}"}
}
}
numeric{
all{
leap{"윤{0}"}
}
}
stand-alone{
narrow{
leap{"윤{0}"}
}
}
}
@ -401,8 +449,8 @@ ko{
"a h시 m분 s초 z",
"a h:mm:ss",
"a h:mm",
"U년 M d일 EEEE",
"U년 M d일",
"U년 MMM d일 EEEE",
"U년 MMM d일",
"y. M. d.",
"y. M. d.",
"{1} {0}",
@ -638,17 +686,17 @@ ko{
monthPatterns{
format{
wide{
leap{"윤{0}"}
leap{"윤{0}"}
}
}
numeric{
all{
leap{"윤{0}"}
leap{"윤{0}"}
}
}
stand-alone{
narrow{
leap{"윤{0}"}
leap{"윤{0}"}
}
}
}

View file

@ -183,6 +183,8 @@ likelySubtags:table(nofallback){
fr{"fr_Latn_FR"}
frc{"frc_Latn_US"}
frp{"frp_Latn_FR"}
frr{"frr_Latn_DE"}
frs{"frs_Latn_DE"}
fud{"fud_Latn_WF"}
fuq{"fuq_Latn_NE"}
fur{"fur_Latn_IT"}
@ -342,6 +344,7 @@ likelySubtags:table(nofallback){
ky_TR{"ky_Latn_TR"}
la{"la_Latn_VA"}
lab{"lab_Lina_GR"}
lad{"lad_Hebr_IL"}
lag{"lag_Latn_TZ"}
lah{"lah_Arab_PK"}
laj{"laj_Latn_UG"}

View file

@ -316,94 +316,97 @@ root{
"%hebrew:",
"-x: \u2212>>;",
"x.x: =#,##0.00=;",
"0: =%hebrew-item=\u05F3;",
"11: \u05D9\u05F4>%hebrew-item>;",
"0: \u05D0\u05E4\u05E1;",
"1: \u05D0\u05F3;",
"2: \u05D1\u05F3;",
"3: \u05D2\u05F3;",
"4: \u05D3\u05F3;",
"5: \u05D4\u05F3;",
"6: \u05D5\u05F3;",
"7: \u05D6\u05F3;",
"8: \u05D7\u05F3;",
"9: \u05D8\u05F3;",
"10: \u05D9\u05F3;",
"11: \u05D9[>%%hebrew-final>];",
"15: \u05D8\u05F4\u05D5;",
"16: \u05D8\u05F4\u05D6;",
"17: \u05D9\u05F4>%hebrew-item>;",
"17: \u05D9[>%%hebrew-final>];",
"20: \u05DB\u05F3;",
"21: \u05DB\u05F4>%hebrew-item>;",
"21: \u05DB[>%%hebrew-final>];",
"30: \u05DC\u05F3;",
"31: \u05DC\u05F4>%hebrew-item>;",
"31: \u05DC[>%%hebrew-final>];",
"40: \u05DE\u05F3;",
"41: \u05DE\u05F4>%hebrew-item>;",
"41: \u05DE[>%%hebrew-final>];",
"50: \u05E0\u05F3;",
"51: \u05E0\u05F4>%hebrew-item>;",
"51: \u05E0[>%%hebrew-final>];",
"60: \u05E1\u05F3;",
"61: \u05E1\u05F4>%hebrew-item>;",
"61: \u05E1[>%%hebrew-final>];",
"70: \u05E2\u05F3;",
"71: \u05E2\u05F4>%hebrew-item>;",
"71: \u05E2[>%%hebrew-final>];",
"80: \u05E4\u05F3;",
"81: \u05E4\u05F4>%hebrew-item>;",
"81: \u05E4[>%%hebrew-final>];",
"90: \u05E6\u05F3;",
"91: \u05E6\u05F4>%hebrew-item>;",
"100: \u05E7>%%hebrew-0-99>;",
"200: \u05E8>%%hebrew-0-99>;",
"298: \u05E8\u05D7\u05F4\u05E6;",
"299: \u05E8>%%hebrew-0-99>;",
"300: \u05E9>%%hebrew-0-99>;",
"304: \u05D3\u05F4\u05E9;",
"305: \u05E9>%%hebrew-0-99>;",
"344: \u05E9\u05D3\u05F4\u05DE;",
"345: \u05E9>%%hebrew-0-99>;",
"400: \u05EA>%%hebrew-0-99>;",
"91: \u05E6[>%%hebrew-final>];",
"100: \u05E7\u05F3;",
"101: \u05E7[>%%hebrew-final>];",
"200: \u05E8\u05F3;",
"201: \u05E8[>%%hebrew-final>];",
"300: \u05E9\u05F3;",
"301: \u05E9[>%%hebrew-final>];",
"400: \u05EA\u05F3;",
"401: \u05EA[>%%hebrew-final>];",
"500: \u05EA\u05F4\u05E7;",
"501: \u05EA\u05E7>%%hebrew-0-99>;",
"501: \u05EA\u05E7[>%%hebrew-final>];",
"600: \u05EA\u05F4\u05E8;",
"601: \u05EA\u05E8>%%hebrew-0-99>;",
"698: \u05EA\u05E8\u05D7\u05F4\u05E6;",
"699: \u05EA\u05E8>%%hebrew-0-99>;",
"601: \u05EA\u05E8[>%%hebrew-final>];",
"700: \u05EA\u05F4\u05E9;",
"701: \u05EA\u05E9>%%hebrew-0-99>;",
"744: \u05EA\u05E9\u05D3\u05F4\u05DE;",
"745: \u05EA\u05E9>%%hebrew-0-99>;",
"701: \u05EA\u05E9[>%%hebrew-final>];",
"800: \u05EA\u05F4\u05EA;",
"801: \u05EA\u05EA>%%hebrew-0-99>;",
"801: \u05EA\u05EA[>%%hebrew-final>];",
"900: \u05EA\u05EA\u05F4\u05E7;",
"901: \u05EA\u05EA\u05E7>%%hebrew-0-99>;",
"1000: <%hebrew<\u05F3 >>;",
"1000000/1000: <%hebrew<\u05F3 >>>;",
"1000000000/1000: <%hebrew<\u05F3 >>>;",
"1000000000000/1000: <%hebrew<\u05F3 >>>;",
"1000000000000000/1000: <%hebrew<\u05F3 >>>;",
"1000000000000000000: =#,##0=;",
"%hebrew-isolated:",
"-x: \u2212>>;",
"x.x: =#,##0.00=;",
"0: =%hebrew-item=;",
"1000: <<\u05F3 >>;",
"1000000/1000: <<\u05F3 >>>;",
"1000000000/1000: <<\u05F3 >>>;",
"1000000000000/1000: <<\u05F3 >>>;",
"1000000000000000/1000: <<\u05F3 >>>;",
"1000000000000000000: =#,##0=;",
"%%hebrew-0-99:",
"0: \u05F3;",
"1: \u05F4=%hebrew-item=;",
"11: \u05D9\u05F4>%hebrew-item>;",
"901: \u05EA\u05EA\u05E7[>%%hebrew-final>];",
"1000: \u05D0\u05DC\u05E3;",
"1001: <%%hebrew-thousands<[>>];",
"2000: \u05D0\u05DC\u05E4\u05D9\u05D9\u05DD;",
"2001: <%%hebrew-thousands<[>>];",
"3000: << \u05D0\u05DC\u05E4\u05D9\u05DD;",
"3001: <%%hebrew-thousands<[>>];",
"1000000: \u05D0\u05DC\u05E3 \u05D0\u05DC\u05E4\u05D9\u05DD;",
"1000001: =#,##0=;",
"%%hebrew-final:",
"0: \u05D0\u05E4\u05E1;",
"1: \u05F4\u05D0;",
"2: \u05F4\u05D1;",
"3: \u05F4\u05D2;",
"4: \u05F4\u05D3;",
"5: \u05F4\u05D4;",
"6: \u05F4\u05D5;",
"7: \u05F4\u05D6;",
"8: \u05F4\u05D7;",
"9: \u05F4\u05D8;",
"10: \u05F4\u05D9;",
"11: \u05D9\u05F4[>%%hebrew-digit>];",
"15: \u05D8\u05F4\u05D5;",
"16: \u05D8\u05F4\u05D6;",
"17: \u05D9\u05F4>%hebrew-item>;",
"17: \u05D9\u05F4[>%%hebrew-digit>];",
"20: \u05F4\u05DB;",
"21: \u05DB\u05F4>%hebrew-item>;",
"21: \u05DB\u05F4[>%%hebrew-digit>];",
"30: \u05F4\u05DC;",
"31: \u05DC\u05F4>%hebrew-item>;",
"31: \u05DC\u05F4[>%%hebrew-digit>];",
"40: \u05F4\u05DE;",
"41: \u05DE\u05F4>%hebrew-item>;",
"41: \u05DE\u05F4[>%%hebrew-digit>];",
"50: \u05F4\u05E0;",
"51: \u05E0\u05F4>%hebrew-item>;",
"51: \u05E0\u05F4[>%%hebrew-digit>];",
"60: \u05F4\u05E1;",
"61: \u05E1\u05F4>%hebrew-item>;",
"61: \u05E1\u05F4[>%%hebrew-digit>];",
"70: \u05F4\u05E2;",
"71: \u05E2\u05F4>%hebrew-item>;",
"71: \u05E2\u05F4[>%%hebrew-digit>];",
"80: \u05F4\u05E4;",
"81: \u05E4\u05F4>%hebrew-item>;",
"81: \u05E4\u05F4[>%%hebrew-digit>];",
"90: \u05F4\u05E6;",
"91: \u05E6\u05F4>%hebrew-item>;",
"%hebrew-item:",
"-x: \u2212>>;",
"x.x: =#,##0.00=;",
"0: \u05F4;",
"91: \u05E6\u05F4[>%%hebrew-digit>];",
"%%hebrew-digit:",
"0: \u05D0\u05E4\u05E1;",
"1: \u05D0;",
"2: \u05D1;",
"3: \u05D2;",
@ -413,79 +416,11 @@ root{
"7: \u05D6;",
"8: \u05D7;",
"9: \u05D8;",
"10: \u05D9[>>];",
"15: \u05D8\u05D5;",
"16: \u05D8\u05D6;",
"17: \u05D9>>;",
"20: \u05DB[>>];",
"30: \u05DC[>>];",
"40: \u05DE[>>];",
"50: \u05E0[>>];",
"60: \u05E1[>>];",
"70: \u05E2[>>];",
"80: \u05E4[>>];",
"90: \u05E6[>>];",
"100: \u05E7[>>];",
"200: \u05E8[>>];",
"298: \u05E8\u05D7\u05E6;",
"299: \u05E8>>;",
"300: \u05E9[>>];",
"304: \u05D3\u05E9;",
"305: \u05E9>>;",
"344: \u05E9\u05D3\u05DE;",
"345: \u05E9>>;",
"400: \u05EA[>>];",
"500: \u05EA\u05E7[>>];",
"600: \u05EA\u05E8[>>];",
"698: \u05EA\u05E8\u05D7\u05E6;",
"699: \u05EA\u05E8>>;",
"700: \u05EA\u05E9[>>];",
"744: \u05EA\u05E9\u05D3\u05DE;",
"745: \u05EA\u05E9>>;",
"800: \u05EA\u05EA[>>];",
"900: \u05EA\u05EA\u05E7[>>];",
"1000/100: \u05EA\u05EA\u05E8[>>];",
"1100/100: \u05EA\u05EA\u05E9[>>];",
"1200/100: \u05EA\u05EA\u05EA[>>];",
"1300/100: \u05EA\u05EA\u05EA\u05E7[>>];",
"1400/100: \u05EA\u05EA\u05EA\u05E8[>>];",
"1500/100: \u05EA\u05EA\u05EA\u05E9[>>];",
"1600/100: \u05EA\u05EA\u05EA\u05EA[>>];",
"1700/100: \u05EA\u05EA\u05EA\u05EA\u05E7[>>];",
"1800/100: \u05EA\u05EA\u05EA\u05EA\u05E8[>>];",
"1900/100: \u05EA\u05EA\u05EA\u05EA\u05E9[>>];",
"2000/100: \u05EA\u05EA\u05EA\u05EA\u05EA[>>];",
"2100: =#,##0=;",
"%hebrew-alternate:",
"-x: \u2212>>;",
"x.x: =#,##0.00=;",
"%%hebrew-thousands:",
"0: =%hebrew=;",
"500: \u05DA>%%hebrew-0-99>;",
"600: \u05DD>%%hebrew-0-99>;",
"700: \u05DF>%%hebrew-0-99>;",
"800: \u05E3>%%hebrew-0-99>;",
"900: \u05E5>%%hebrew-0-99>;",
"1000: <%hebrew-alternate-isolated<\u05F3 >>;",
"1000000/1000: <%hebrew-alternate-isolated<\u05F3 >>>;",
"1000000000/1000: <%hebrew-alternate-isolated<\u05F3 >>>;",
"1000000000000/1000: <%hebrew-alternate-isolated<\u05F3 >>>;",
"1000000000000000/1000: <%hebrew-alternate-isolated<\u05F3 >>>;",
"1000000000000000000: =#,##0=;",
"%hebrew-alternate-isolated:",
"-x: \u2212>>;",
"x.x: =#,##0.00=;",
"0: =%hebrew-item=;",
"500: \u05DA[>>];",
"600: \u05DD[>>];",
"700: \u05DF[>>];",
"800: \u05E3[>>];",
"900: \u05E5[>>];",
"1000: <<\u05F3 >>;",
"1000000/1000: <<\u05F3 >>>;",
"1000000000/1000: <<\u05F3 >>>;",
"1000000000000/1000: <<\u05F3 >>>;",
"1000000000000000/1000: <<\u05F3 >>>;",
"1000000000000000000: =#,##0=;",
"10: =%hebrew=[\u05F3];",
"100: =%hebrew=[\u05F3];",
"401: =%hebrew=\u05F3;",
"%roman-lower:",
"-x: \u2212>>;",
"x.x: =#,##0.00=;",
@ -620,5 +555,5 @@ root{
"0: =#,##0.#=.;",
}
}
Version{"2.1.0.74"}
Version{"2.1.9.45"}
}

View file

@ -315,5 +315,5 @@ ko{
PS{"팔레스타인"}
US{"미국"}
}
Version{"2.1.8.9"}
Version{"2.1.9.31"}
}

View file

@ -10,7 +10,7 @@
* ICU <specials> source: <path>/common/main/ko.xml
*/
ko{
Version{"2.1.8.9"}
Version{"2.1.9.31"}
zoneStrings{
"Africa:Abidjan"{
ec{"아비장"}

View file

@ -1439,6 +1439,21 @@ DateFormatSymbols::initializeData(const Locale& locale, const char *type, UError
initLeapMonthPattern(fLeapMonthPatterns, kLeapMonthPatternStandaloneNarrow, calData.getByKey3(gMonthPatternsTag, gNamesStandaloneTag, gNamesNarrowTag, tempStatus), tempStatus);
initLeapMonthPattern(fLeapMonthPatterns, kLeapMonthPatternNumeric, calData.getByKey3(gMonthPatternsTag, gNamesNumericTag, gNamesAllTag, tempStatus), tempStatus);
if (U_SUCCESS(tempStatus)) {
// Hack to fix bad C inheritance for dangi monthPatterns (OK in J); this should be handled by aliases in root, but isn't.
// The ordering of the following statements is important.
if (fLeapMonthPatterns[kLeapMonthPatternFormatAbbrev].isEmpty()) {
fLeapMonthPatterns[kLeapMonthPatternFormatAbbrev].setTo(fLeapMonthPatterns[kLeapMonthPatternFormatWide]);
};
if (fLeapMonthPatterns[kLeapMonthPatternFormatNarrow].isEmpty()) {
fLeapMonthPatterns[kLeapMonthPatternFormatNarrow].setTo(fLeapMonthPatterns[kLeapMonthPatternStandaloneNarrow]);
};
if (fLeapMonthPatterns[kLeapMonthPatternStandaloneWide].isEmpty()) {
fLeapMonthPatterns[kLeapMonthPatternStandaloneWide].setTo(fLeapMonthPatterns[kLeapMonthPatternFormatWide]);
};
if (fLeapMonthPatterns[kLeapMonthPatternStandaloneAbbrev].isEmpty()) {
fLeapMonthPatterns[kLeapMonthPatternStandaloneAbbrev].setTo(fLeapMonthPatterns[kLeapMonthPatternFormatAbbrev]);
};
// end of hack
fLeapMonthPatternsCount = kMonthPatternsCount;
} else {
delete[] fLeapMonthPatterns;

View file

@ -178,9 +178,6 @@ void DateFormatRoundTripTest::TestDateFormatRoundTrip()
// special locales
int32_t jCount = CalendarTest::testLocaleCount();
for (int32_t j=0; j < jCount; ++j) {
if (uprv_strcmp(CalendarTest::testLocaleID(j), "he_IL@calendar=hebrew") == 0 && logKnownIssue("11219", "Skip tests that depend on hebr numbers in the thousands")) {
continue;
}
test(Locale(CalendarTest::testLocaleID(j)));
}
#endif

View file

@ -3910,10 +3910,10 @@ void DateFormatTest::TestMonthPatterns()
{ "en@calendar=dangi", DateFormat::kLong, { UnicodeString("Month3bis 2, 29"), UnicodeString("Month4 2, 29"), UnicodeString("Month5 1, 29") } },
{ "en@calendar=dangi", DateFormat::kShort, { UnicodeString("3bis/2/29"), UnicodeString("4/2/29"), UnicodeString("5/1/29") } },
{ "en@calendar=dangi", -2, { UnicodeString("78x29-3bis-2"), UnicodeString("78x29-4-2"), UnicodeString("78x29-5-1") } },
{ "ko@calendar=dangi", DateFormat::kLong, { CharsToUnicodeString("\\uC784\\uC9C4\\uB144 \\uC7243\\uC6D4\\uC6D4 2\\uC77C"), // problem, see cldrbug 7868:
{ "ko@calendar=dangi", DateFormat::kLong, { CharsToUnicodeString("\\uC784\\uC9C4\\uB144 \\uC7243\\uC6D4 2\\uC77C"),
CharsToUnicodeString("\\uC784\\uC9C4\\uB144 4\\uC6D4 2\\uC77C"),
CharsToUnicodeString("\\uC784\\uC9C4\\uB144 5\\uC6D4 1\\uC77C") } },
{ "ko@calendar=dangi", DateFormat::kShort, { CharsToUnicodeString("29. \\uC7243\\uC6D4. 2."), // possible problem, see cldrbug 7868:
{ "ko@calendar=dangi", DateFormat::kShort, { CharsToUnicodeString("29. \\uC7243. 2."),
CharsToUnicodeString("29. 4. 2."),
CharsToUnicodeString("29. 5. 1.") } },
// terminator
@ -4115,9 +4115,6 @@ void DateFormatTest::TestNonGregoFmtParse()
};
const TestNonGregoItem * itemPtr;
for (itemPtr = items; itemPtr->locale != NULL; itemPtr++) {
if (uprv_strcmp(itemPtr->locale, "he@calendar=hebrew") == 0 && logKnownIssue("11219", "Skip tests that depend on hebr numbers in the thousands")) {
continue;
}
Locale locale = Locale::createFromName(itemPtr->locale);
DateFormat * dfmt = NULL;
UErrorCode status = U_ZERO_ERROR;

View file

@ -3139,9 +3139,6 @@ void NumberFormatTest::TestNumberingSystems() {
const TestNumberingSystemItem *item;
for (item = DATA; item->localeName != NULL; item++) {
if (uprv_strcmp(item->localeName, "en_US@numbers=hebr") == 0 && logKnownIssue("11219", "Skip tests that depend on hebr numbers in the thousands")) {
continue;
}
ec = U_ZERO_ERROR;
Locale loc = Locale::createFromName(item->localeName);