ICU-7734 Merge CLDR 1.9M1 data into ICU
X-SVN-Rev: 28166
This commit is contained in:
John Emmons
parent
4a78a91fa1
commit
aef7b19644
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ba4a9b08ebdbec4f7510ffa0704bb6c748fcadb4f8a49f4de7d90b42ededc4ef
|
||||
size 7027448
|
||||
oid sha256:6e148de4e4260e4639294fbdc0715c7448a37f00baaa6ee479d79b38677c4928
|
||||
size 7045639
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:1dea73d1676cfc9f31b96919e9b007c3b0d72a5537f6a4d7df64dcb1809008e7
|
||||
size 718508
|
||||
oid sha256:17a69e715fdce1fe970399ecb445272a1b582e4e70ba62779556127dee1b7698
|
||||
size 718507
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
/*
|
||||
*******************************************************************************
|
||||
* Copyright (C) 2002-2009, International Business Machines Corporation and *
|
||||
* Copyright (C) 2002-2010, International Business Machines Corporation and *
|
||||
* others. All Rights Reserved. *
|
||||
*******************************************************************************
|
||||
*/
|
||||
@ -1036,12 +1036,11 @@ public class CollationAPITest extends TestFmwk {
|
||||
"[aAbB\u0430\u0410\u0433\u0413]"
|
||||
},
|
||||
{ "uk",
|
||||
"[{\u0474\u030F}{\u0475\u030F}{\u04D8\u0308}{\u04D9\u0308}{\u04E8\u0308}{\u04E9\u0308}"+
|
||||
"{\u0430\u0306}{\u0410\u0306}{\u0430\u0308}{\u0410\u0306}{\u0433\u0301}{\u0413\u0301}]",
|
||||
"[]",
|
||||
"[{\u0406\u0308}{\u0456\u0308}{\u0418\u0306}{\u0438\u0306}]",
|
||||
"[\u0407\u0419\u0439\u0457]",
|
||||
"[\u00e6]",
|
||||
"[a]",
|
||||
"[\u0474\u0475\u04D8\u04D9\u04E8\u04E9\u0430\u0410\u0433\u0413]",
|
||||
"[ae]",
|
||||
"[\u0406\u0456\u0418\u0438]",
|
||||
"[aAbBxv]",
|
||||
},
|
||||
{ "sh",
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
/*
|
||||
*******************************************************************************
|
||||
* Copyright (C) 2003-2009, International Business Machines Corporation and *
|
||||
* Copyright (C) 2003-2010, International Business Machines Corporation and *
|
||||
* others. All Rights Reserved. *
|
||||
*******************************************************************************
|
||||
*/
|
||||
@ -393,7 +393,7 @@ public class CollationServiceTest extends TestFmwk {
|
||||
"nl_BE@collation=pinyin", "root", "t",
|
||||
"nl_BE@collation=big5han", "root", "t",
|
||||
"nl_BE@collation=phonebook", "root", "t",
|
||||
"en_US_VALLEYGIRL","en","f"
|
||||
"en_US_VALLEYGIRL","root","f"
|
||||
};
|
||||
final int DATA_COUNT=(DATA.length/3);
|
||||
|
||||
|
||||
@ -1019,10 +1019,9 @@ public class DateFormatRegressionTest extends com.ibm.icu.dev.test.TestFmwk {
|
||||
s = df.format(new Date(0)); /* 31/12/1969 */
|
||||
what = "ar_IQ, Japanese Calendar, getInstance";
|
||||
logln(what+ ": " + s);
|
||||
// Note: The default date pattern for Japanese calendar starts with era in CLDR 1.7
|
||||
char last = s.charAt(s.length() - 1);
|
||||
if(last<kArabicZero || last>(kArabicZero+9)) {
|
||||
errln(what + " wrong digit but got " + s + " (integer digit value " + new Integer((int)last).toString());
|
||||
first = s.charAt(0);
|
||||
if(first<kArabicZero || first>(kArabicZero+9)) {
|
||||
errln(what + " wrong digit but got " + s + " (integer digit value " + new Integer((int)first).toString());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -451,7 +451,7 @@ public class DateIntervalFormatTest extends com.ibm.icu.dev.test.TestFmwk {
|
||||
|
||||
"zh", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "hmz", "2007\\u5e7411\\u670810\\u65e5 \\u4e0a\\u534810:10 \\u683c\\u6797\\u5c3c\\u6cbb\\u6807\\u51c6\\u65f6\\u95f4-0800\\u20132007\\u5e7411\\u670820\\u65e5 \\u4e0a\\u534810:10 \\u683c\\u6797\\u5c3c\\u6cbb\\u6807\\u51c6\\u65f6\\u95f4-0800",
|
||||
|
||||
"zh", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "h", "2007\\u5e7411\\u670810\\u65e5 \\u4e0a\\u534810\\u20132007\\u5e7411\\u670820\\u65e5 \\u4e0a\\u534810",
|
||||
"zh", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "h", "2007\\u5e7411\\u670810\\u65e5 \\u4e0a\\u534810\\u65f6\\u20132007\\u5e7411\\u670820\\u65e5 \\u4e0a\\u534810\\u65f6",
|
||||
|
||||
"zh", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "EEEEdMMMMy", "2007\\u5e741\\u670810\\u65e5\\u661f\\u671f\\u4e09", // (fixed expected result per ticket 6872<-6626)
|
||||
|
||||
@ -473,15 +473,15 @@ public class DateIntervalFormatTest extends com.ibm.icu.dev.test.TestFmwk {
|
||||
|
||||
"zh", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "hmv", "\\u7f8e\\u56fd (\\u6d1b\\u6749\\u77f6)\\u4e0a\\u534810:00\\u81f310:20",
|
||||
|
||||
"zh", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "h", "\\u4e0a\\u534810",
|
||||
"zh", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "h", "\\u4e0a\\u534810\\u65f6",
|
||||
|
||||
"zh", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "hz", "\\u4e0a\\u534810 \\u683c\\u6797\\u5c3c\\u6cbb\\u6807\\u51c6\\u65f6\\u95f4-0800",
|
||||
"zh", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "hz", "\\u4e0a\\u534810\\u65f6 \\u683c\\u6797\\u5c3c\\u6cbb\\u6807\\u51c6\\u65f6\\u95f4-0800",
|
||||
|
||||
"zh", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "EEEEdMMMMy", "2007\\u5e741\\u670810\\u65e5\\u661f\\u671f\\u4e09", // (fixed expected result per ticket 6872<-6626)
|
||||
|
||||
"zh", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "hm", "\\u4e0a\\u534810:10",
|
||||
|
||||
"zh", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "h", "\\u4e0a\\u534810",
|
||||
"zh", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "h", "\\u4e0a\\u534810\\u65f6",
|
||||
|
||||
"de", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "EEEEdMMMy", "Mittwoch, 10. Okt 2007 - Freitag, 10. Okt 2008",
|
||||
|
||||
@ -584,13 +584,13 @@ public class DateIntervalFormatTest extends com.ibm.icu.dev.test.TestFmwk {
|
||||
|
||||
"de", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "MMMy", "Jan 2007",
|
||||
|
||||
"de", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "EEEEdMMM", "Mittwoch 10. Jan",
|
||||
"de", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "EEEEdMMM", "Mittwoch, 10. Jan",
|
||||
|
||||
"de", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "hmz", "10:00 vorm. - 2:10 nachm. GMT-08:00",
|
||||
|
||||
"de", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "h", "10 vorm. - 2 nachm.",
|
||||
|
||||
"de", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "EEEEdMMM", "Mittwoch 10. Jan",
|
||||
"de", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "EEEEdMMM", "Mittwoch, 10. Jan",
|
||||
|
||||
"de", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "hm", "10:00-10:20 vorm.",
|
||||
|
||||
|
||||
@ -282,18 +282,18 @@ public class DateTimeGeneratorTest extends TestFmwk {
|
||||
new String[] {"mmss", "58:59"},
|
||||
new String[] {"yyyyMMMM", "January 1999"}, // (new item for testing 6872<-5702)
|
||||
new ULocale("en_US@calendar=japanese"), // (new locale for testing ticket 6872<-5702)
|
||||
new String[] {"yM", "H 11-01"},
|
||||
new String[] {"yMMM", "H 11 Jan"},
|
||||
new String[] {"yM", "1/11 Heisei"},
|
||||
new String[] {"yMMM", "Jan 11 Heisei"},
|
||||
new String[] {"yMd", "H 11-01-13"},
|
||||
new String[] {"yMMMd", "H 11 Jan 13"},
|
||||
new String[] {"Md", "1-13"},
|
||||
new String[] {"Md", "1/13"},
|
||||
new String[] {"MMMd", "Jan 13"},
|
||||
new String[] {"yQQQ", "H 11 Q1"},
|
||||
new String[] {"yQQQ", "Q1 11 Heisei"},
|
||||
new String[] {"hhmm", "11:58 PM"},
|
||||
new String[] {"HHmm", "23:58"},
|
||||
new String[] {"jjmm", "23:58"},
|
||||
new String[] {"jjmm", "11:58 PM"},
|
||||
new String[] {"mmss", "58:59"},
|
||||
new String[] {"yyyyMMMM", "H 11 January"},
|
||||
new String[] {"yyyyMMMM", "January 11 Heisei"},
|
||||
new ULocale("zh_Hans_CN"),
|
||||
new String[] {"yM", "1999-1"},
|
||||
new String[] {"yMMM", "1999\u5E741\u6708"}, // (fixed expected result per ticket 6872<-6626)
|
||||
|
||||
@ -1212,8 +1212,8 @@ public class ULocaleTest extends TestFmwk {
|
||||
h[1] = new HashMap<String, String>();
|
||||
|
||||
//display in English
|
||||
h[0].put("collation", "collation");
|
||||
h[0].put("calendar", "calendar");
|
||||
h[0].put("collation", "Collation");
|
||||
h[0].put("calendar", "Calendar");
|
||||
h[0].put("currency", "Currency");
|
||||
h[0].put("phonebook", "Phonebook Order");
|
||||
h[0].put("pinyin", "Simplified Chinese Pinyin Sort Order");
|
||||
|
||||
Loading…
Reference in New Issue
Block a user