AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-9676 Merge CLDR release-22-1-d01

Browse Source 
X-SVN-Rev: 32667
This commit is contained in:
John Emmons 2012-10-19 04:01:09 +00:00
parent 340b47c297
commit 4f2c5ef059
10 changed files with 34 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
icu4j/main/shared/data/icudata.jar
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:31223900b03f678693b59e2d5f3a0419ad8e3389253388ae688615d1b49b578a
size 9831138
oid sha256:62ba5461bb2410a05da00f4a57d8c161e5aa856bbabf30239a225d1da2e2450e
size 9823392

2
icu4j/main/shared/data/icutzdata.jar
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:77b68a4f8c71cc06be4ad7bb944d31795567daefeaf00c0e4e2bdabdc17bf3ef
oid sha256:eaae73f8f048f3eaaa107e2f1c5e1c0939eeb694333b27fa78f354ec311091f9
size 97677

4
icu4j/main/shared/data/testdata.jar
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:96ceef2e7397c583c580cc63c5c428a74cee3dd0c87fff95a8eea2fbe9559b8d
size 723668
oid sha256:c9a0327a2efa441d6cb71bbc6e8b8954de73cbd806f5be2ec5223b7cb4ae4a2d
size 723680

11
icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/CompactDecimalFormatTest.java
View File

@ -147,9 +147,9 @@ public class CompactDecimalFormatTest extends TestFmwk {
};
Object[][] SkTestDataLong = {
{1000, "1000"},
{1572, "1600"},
{5184, "5200"},
{1000, "1 tis\u00edc"},
{1572, "1,6 tis\u00edc"},
{5184, "5,2 tis\u00edc"},
};
Object[][] SwahiliTestDataNegative = {
@ -197,11 +197,6 @@ public class CompactDecimalFormatTest extends TestFmwk {
}
public void TestSkLong() {
// For this Locale, we have
// 1000 {
// few{"0"}
// one{"0"}
// other{"0"}
checkLocale(ULocale.forLanguageTag("sk"), CompactStyle.LONG, SkTestDataLong);
}

32
icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateFormatTest.java
View File

@ -1401,8 +1401,8 @@ public class DateFormatTest extends com.ibm.icu.dev.test.TestFmwk {
{ "ti", "America/Los_Angeles", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-07:00", "-7:00" },
{ "ti", "America/Los_Angeles", "2004-07-15T00:00:00Z", "z", "GMT-07:00", "-7:00" },
{ "ti", "America/Los_Angeles", "2004-07-15T00:00:00Z", "zzzz", "GMT-07:00", "-7:00" },
{ "ti", "America/Los_Angeles", "2004-07-15T00:00:00Z", "v", "(Los Angeles)", "America/Los_Angeles" },
{ "ti", "America/Los_Angeles", "2004-07-15T00:00:00Z", "vvvv", "(Los Angeles)", "America/Los_Angeles" },
{ "ti", "America/Los_Angeles", "2004-07-15T00:00:00Z", "v", "Los Angeles", "America/Los_Angeles" },
{ "ti", "America/Los_Angeles", "2004-07-15T00:00:00Z", "vvvv", "Los Angeles", "America/Los_Angeles" },
{ "ti", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "Z", "-0300", "-3:00" },
{ "ti", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
@ -1412,8 +1412,8 @@ public class DateFormatTest extends com.ibm.icu.dev.test.TestFmwk {
{ "ti", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
{ "ti", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
{ "ti", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "zzzz", "GMT-03:00", "-3:00" },
{ "ti", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "v", "(Buenos Aires)", "America/Buenos_Aires" },
{ "ti", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "vvvv", "(Buenos Aires)", "America/Buenos_Aires" },
{ "ti", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "v", "Buenos Aires", "America/Buenos_Aires" },
{ "ti", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "vvvv", "Buenos Aires", "America/Buenos_Aires" },
{ "ti", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "Z", "-0300", "-3:00" },
{ "ti", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
@ -1423,8 +1423,8 @@ public class DateFormatTest extends com.ibm.icu.dev.test.TestFmwk {
{ "ti", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
{ "ti", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
{ "ti", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "zzzz", "GMT-03:00", "-3:00" },
{ "ti", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "v", "(Buenos Aires)", "America/Buenos_Aires" },
{ "ti", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "vvvv", "(Buenos Aires)", "America/Buenos_Aires" },
{ "ti", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "v", "Buenos Aires", "America/Buenos_Aires" },
{ "ti", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "vvvv", "Buenos Aires", "America/Buenos_Aires" },
{ "ti", "America/Havana", "2004-01-15T00:00:00Z", "Z", "-0500", "-5:00" },
{ "ti", "America/Havana", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-05:00", "-5:00" },
@ -1434,8 +1434,8 @@ public class DateFormatTest extends com.ibm.icu.dev.test.TestFmwk {
{ "ti", "America/Havana", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-04:00", "-4:00" },
{ "ti", "America/Havana", "2004-07-15T00:00:00Z", "z", "GMT-04:00", "-4:00" },
{ "ti", "America/Havana", "2004-07-15T00:00:00Z", "zzzz", "GMT-04:00", "-4:00" },
{ "ti", "America/Havana", "2004-07-15T00:00:00Z", "v", "(CU)", "America/Havana" },
{ "ti", "America/Havana", "2004-07-15T00:00:00Z", "vvvv", "(CU)", "America/Havana" },
{ "ti", "America/Havana", "2004-07-15T00:00:00Z", "v", "CU", "America/Havana" },
{ "ti", "America/Havana", "2004-07-15T00:00:00Z", "vvvv", "CU", "America/Havana" },
{ "ti", "Australia/ACT", "2004-01-15T00:00:00Z", "Z", "+1100", "+11:00" },
{ "ti", "Australia/ACT", "2004-01-15T00:00:00Z", "ZZZZ", "GMT+11:00", "+11:00" },
@ -1445,8 +1445,8 @@ public class DateFormatTest extends com.ibm.icu.dev.test.TestFmwk {
{ "ti", "Australia/ACT", "2004-07-15T00:00:00Z", "ZZZZ", "GMT+10:00", "+10:00" },
{ "ti", "Australia/ACT", "2004-07-15T00:00:00Z", "z", "GMT+10:00", "+10:00" },
{ "ti", "Australia/ACT", "2004-07-15T00:00:00Z", "zzzz", "GMT+10:00", "+10:00" },
{ "ti", "Australia/ACT", "2004-07-15T00:00:00Z", "v", "(Sydney)", "Australia/Sydney" },
{ "ti", "Australia/ACT", "2004-07-15T00:00:00Z", "vvvv", "(Sydney)", "Australia/Sydney" },
{ "ti", "Australia/ACT", "2004-07-15T00:00:00Z", "v", "Sydney", "Australia/Sydney" },
{ "ti", "Australia/ACT", "2004-07-15T00:00:00Z", "vvvv", "Sydney", "Australia/Sydney" },
{ "ti", "Australia/Sydney", "2004-01-15T00:00:00Z", "Z", "+1100", "+11:00" },
{ "ti", "Australia/Sydney", "2004-01-15T00:00:00Z", "ZZZZ", "GMT+11:00", "+11:00" },
@ -1456,8 +1456,8 @@ public class DateFormatTest extends com.ibm.icu.dev.test.TestFmwk {
{ "ti", "Australia/Sydney", "2004-07-15T00:00:00Z", "ZZZZ", "GMT+10:00", "+10:00" },
{ "ti", "Australia/Sydney", "2004-07-15T00:00:00Z", "z", "GMT+10:00", "+10:00" },
{ "ti", "Australia/Sydney", "2004-07-15T00:00:00Z", "zzzz", "GMT+10:00", "+10:00" },
{ "ti", "Australia/Sydney", "2004-07-15T00:00:00Z", "v", "(Sydney)", "Australia/Sydney" },
{ "ti", "Australia/Sydney", "2004-07-15T00:00:00Z", "vvvv", "(Sydney)", "Australia/Sydney" },
{ "ti", "Australia/Sydney", "2004-07-15T00:00:00Z", "v", "Sydney", "Australia/Sydney" },
{ "ti", "Australia/Sydney", "2004-07-15T00:00:00Z", "vvvv", "Sydney", "Australia/Sydney" },
{ "ti", "Europe/London", "2004-01-15T00:00:00Z", "Z", "+0000", "+0:00" },
{ "ti", "Europe/London", "2004-01-15T00:00:00Z", "ZZZZ", "GMT", "+0:00" },
@ -1467,8 +1467,8 @@ public class DateFormatTest extends com.ibm.icu.dev.test.TestFmwk {
{ "ti", "Europe/London", "2004-07-15T00:00:00Z", "ZZZZ", "GMT+01:00", "+1:00" },
{ "ti", "Europe/London", "2004-07-15T00:00:00Z", "z", "GMT+01:00", "+1:00" },
{ "ti", "Europe/London", "2004-07-15T00:00:00Z", "zzzz", "GMT+01:00", "+1:00" },
{ "ti", "Europe/London", "2004-07-15T00:00:00Z", "v", "(GB)", "Europe/London" },
{ "ti", "Europe/London", "2004-07-15T00:00:00Z", "vvvv", "(GB)", "Europe/London" },
{ "ti", "Europe/London", "2004-07-15T00:00:00Z", "v", "GB", "Europe/London" },
{ "ti", "Europe/London", "2004-07-15T00:00:00Z", "vvvv", "GB", "Europe/London" },
{ "ti", "Etc/GMT+3", "2004-01-15T00:00:00Z", "Z", "-0300", "-3:00" },
{ "ti", "Etc/GMT+3", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
@ -1490,8 +1490,8 @@ public class DateFormatTest extends com.ibm.icu.dev.test.TestFmwk {
{ "ti", "Asia/Calcutta", "2004-07-15T00:00:00Z", "ZZZZ", "GMT+05:30", "+5:30" },
{ "ti", "Asia/Calcutta", "2004-07-15T00:00:00Z", "z", "GMT+05:30", "+05:30" },
{ "ti", "Asia/Calcutta", "2004-07-15T00:00:00Z", "zzzz", "GMT+05:30", "+5:30" },
{ "ti", "Asia/Calcutta", "2004-07-15T00:00:00Z", "v", "(IN)", "Asia/Calcutta" },
{ "ti", "Asia/Calcutta", "2004-07-15T00:00:00Z", "vvvv", "(IN)", "Asia/Calcutta" },
{ "ti", "Asia/Calcutta", "2004-07-15T00:00:00Z", "v", "IN", "Asia/Calcutta" },
{ "ti", "Asia/Calcutta", "2004-07-15T00:00:00Z", "vvvv", "IN", "Asia/Calcutta" },
// Ticket#8589 Partial location name to use country name if the zone is the golden
// zone for the time zone's country.

8
icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateTimeGeneratorTest.java
View File

@ -327,7 +327,7 @@ public class DateTimeGeneratorTest extends TestFmwk {
new String[] {"Md", "13.1."},
new String[] {"MMMd", "13. tammikuuta"},
new String[] {"MMMMd", "13. tammikuuta"},
new String[] {"yQQQ", "1. nelj./1999"}, // 1. nelj. 1999 // *** get "expected result" but it seems incorrect, needs investigation
new String[] {"yQQQ", "1. nelj. 1999"},
new String[] {"hhmm", "11.58 ip."},
new String[] {"HHmm", "23.58"},
new String[] {"jjmm", "23.58"},
@ -395,7 +395,7 @@ public class DateTimeGeneratorTest extends TestFmwk {
new String[] {"Md", "1/13"},
new String[] {"MMMd", "1\u670813\u65E5"}, // (fixed expected result per ticket 6872<-6626)
new String[] {"MMMMd", "1\u670813\u65E5"},
new String[] {"yQQQ", "1999\u5E74\u7B2C1\u5B63\u5EA6\u5B63\u5EA6"},
new String[] {"yQQQ", "1999\u5E74\u7B2C1\u5B63\u5EA6"},
new String[] {"hhmm", "\u4E0B\u534811:58"},
new String[] {"HHmm", "23:58"},
new String[] {"jjmm", "\u4E0B\u534811:58"},
@ -425,7 +425,7 @@ public class DateTimeGeneratorTest extends TestFmwk {
new String[] {"yM", "01.1999"},
new String[] {"yMMM", "\u042F\u043D\u0432. 1999"},
new String[] {"yMd", "13.01.1999"},
new String[] {"yMMMd", "13 \u044F\u043D\u0432. 1999\u00A0\u0433."},
new String[] {"yMMMd", "13 \u044F\u043D\u0432. 1999 \u0433."},
new String[] {"Md", "13.1"},
new String[] {"MMMd", "13 \u044F\u043D\u0432."},
new String[] {"MMMMd", "13 \u044F\u043D\u0432\u0430\u0440\u044F"},
@ -447,7 +447,7 @@ public class DateTimeGeneratorTest extends TestFmwk {
new String[] {"Md", "11-26"},
new String[] {"MMMd", "\u5341\u4E00\u670826\u65E5"},
new String[] {"MMMMd", "\u5341\u4E00\u670826\u65E5"},
new String[] {"yQQQ", "\u620A\u5BC5\u5E744\u5B63\u5EA6"},
new String[] {"yQQQ", "\u620A\u5BC5\u5E74\u7B2C\u56DB\u5B63\u5EA6"},
new String[] {"hhmm", "\u4E0B\u534811:58"},
new String[] {"HHmm", "23:58"},
new String[] {"jjmm", "\u4E0B\u534811:58"},

4
icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/RBNFParseTest.java
View File

@ -1,6 +1,6 @@
/*
*******************************************************************************
* Copyright (C) 2004-2010, International Business Machines Corporation and *
* Copyright (C) 2004-2012, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/
@ -138,7 +138,7 @@ public class RBNFParseTest extends TestFmwk {
String[][] lists = {
{ "1,2", "twelve", "un virgule deux" },
{ "1,2 million", "twelve million", "un virgule deux" },
{ "1,2 millions", "twelve million", "un million deux-cents-mille" },
{ "1,2 millions", "twelve million", "un million deux-cent-mille" },
{ "1.2", "one point two", "douze" },
{ "1.2 million", "one million two hundred thousand", "douze" },
{ "1.2 millions", "one million two hundred thousand", "douze millions" },

2
icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/RbnfTest.java
View File

@ -656,7 +656,7 @@ public class RbnfTest extends TestFmwk {
{ "21,001", "tjugo\u00adet\u00adtusen ett" }
};
formatter.setDefaultRuleSet("%spellout-cardinal-neutre");
formatter.setDefaultRuleSet("%spellout-cardinal-neuter");
logln("testing neutrum rules");
doTest(formatter, testDataNeutrum, true);

2
icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/DebugUtilitiesData.java
View File

@ -7,7 +7,7 @@
package com.ibm.icu.dev.test.util;
public class DebugUtilitiesData extends Object {
public static final String ICU4C_VERSION="50.0.2";
public static final String ICU4C_VERSION="50.1";
public static final int UDebugEnumType = 0;
public static final int UCalendarDateFields = 1;
public static final int UCalendarMonths = 2;

4
icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/ULocaleTest.java
View File

@ -2996,8 +2996,8 @@ public class ULocaleTest extends TestFmwk {
"si"
}, {
"und_Syrc",
"syr_Syrc_145",
"syr_Syrc_145"
"syr_Syrc_SY",
"syr_Syrc_SY"
}, {
"und_TD",
"fr_Latn_TD",