organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-16 02:07:15 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 10

ICU-8639 Merging #8696 CLDR 2.0.1 (r30317 + icudata.jar/testdata.jar generated from ICU4C maint-4-8 r30341) into ICU4J maint-4-8

Browse source 
X-SVN-Rev: 30344
This commit is contained in:
Yoshito Umaoka 2011-07-14 17:22:35 +00:00
parent ac4775e16d
commit 93a8736a0e
6 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
main/shared/data/icudata.jar
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b1da5fc1b8d3ab160d72e0c23dff191eba5ff9d9dfd4a62df6cf810c2e256dcc
size 7958244
oid sha256:67bf5c668c5b3ad76c86caf2e0bc95c0d0361e1c6a25e20dcefb43ae52ee0588
size 7961830

4
main/shared/data/testdata.jar
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f9f02a9114fdca353732992ad3567a64efe8ea995ecb61bb0dc0d4fcf70731b3
size 719054
oid sha256:ab116d3f8b6292f871f019ef2331ec17f66d752c322118bc17ba8b6c3b5767e8
size 719074

6
main/tests/core/src/com/ibm/icu/dev/test/format/DateFormatMiscTests.java
View file

@ -1,6 +1,6 @@
/*
*******************************************************************************
* Copyright (C) 2001-2010, International Business Machines Corporation and *
* Copyright (C) 2001-2011, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/
@ -147,9 +147,9 @@ public class DateFormatMiscTests extends com.ibm.icu.dev.test.TestFmwk {
errln("could not find " + tzID);
} else {
assertEquals("Long zone name = ", jstLong, zones[index][1]);
assertEquals("Short zone name = ", jstShort, zones[index][2]);
// assertEquals("Short zone name = ", jstShort, zones[index][2]);
assertEquals("Long zone name (3) = ", jdtLong, zones[index][3]);
assertEquals("Short zone name (4) = ", jdtShort, zones[index][4]);
// assertEquals("Short zone name (4) = ", jdtShort, zones[index][4]);
}
}
}

18
main/tests/core/src/com/ibm/icu/dev/test/format/DateFormatTest.java
View file

@ -705,12 +705,12 @@ public class DateFormatTest extends com.ibm.icu.dev.test.TestFmwk {
{ "en", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "Z", "-0300", "-3:00" },
{ "en", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
{ "en", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
{ "en", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "V", "ART", "-3:00" },
{ "en", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "V", "GMT-03:00", "-3:00" },
{ "en", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "zzzz", "Argentina Time", "-3:00" },
{ "en", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "Z", "-0300", "-3:00" },
{ "en", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
{ "en", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
{ "en", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "V", "ART", "-3:00" },
{ "en", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "V", "GMT-03:00", "-3:00" },
{ "en", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "zzzz", "Argentina Time", "-3:00" },
{ "en", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "v", "Argentina Time (Buenos Aires)", "America/Buenos_Aires" },
{ "en", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "vvvv", "Argentina Time", "America/Buenos_Aires" },
@ -719,12 +719,12 @@ public class DateFormatTest extends com.ibm.icu.dev.test.TestFmwk {
{ "en", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "Z", "-0300", "-3:00" },
{ "en", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
{ "en", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
{ "en", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "V", "ART", "-3:00" },
{ "en", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "V", "GMT-03:00", "-3:00" },
{ "en", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "zzzz", "Argentina Time", "-3:00" },
{ "en", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "Z", "-0300", "-3:00" },
{ "en", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
{ "en", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "z", "GMT-03:00", "-3:00" },
{ "en", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "V", "ART", "-3:00" },
{ "en", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "V", "GMT-03:00", "-3:00" },
{ "en", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "zzzz", "Argentina Time", "-3:00" },
{ "en", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "v", "Argentina Time (Buenos Aires)", "America/Buenos_Aires" },
{ "en", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "vvvv", "Argentina Time", "America/Buenos_Aires" },
@ -733,12 +733,12 @@ public class DateFormatTest extends com.ibm.icu.dev.test.TestFmwk {
{ "en", "America/Havana", "2004-01-15T00:00:00Z", "Z", "-0500", "-5:00" },
{ "en", "America/Havana", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-05:00", "-5:00" },
{ "en", "America/Havana", "2004-01-15T00:00:00Z", "z", "GMT-05:00", "-5:00" },
{ "en", "America/Havana", "2004-01-15T00:00:00Z", "V", "CST (Cuba)", "-5:00" },
{ "en", "America/Havana", "2004-01-15T00:00:00Z", "V", "GMT-05:00", "-5:00" },
{ "en", "America/Havana", "2004-01-15T00:00:00Z", "zzzz", "Cuba Standard Time", "-5:00" },
{ "en", "America/Havana", "2004-07-15T00:00:00Z", "Z", "-0400", "-4:00" },
{ "en", "America/Havana", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-04:00", "-4:00" },
{ "en", "America/Havana", "2004-07-15T00:00:00Z", "z", "GMT-04:00", "-4:00" },
{ "en", "America/Havana", "2004-07-15T00:00:00Z", "V", "CDT (Cuba)", "-4:00" },
{ "en", "America/Havana", "2004-07-15T00:00:00Z", "V", "GMT-04:00", "-4:00" },
{ "en", "America/Havana", "2004-07-15T00:00:00Z", "zzzz", "Cuba Daylight Time", "-4:00" },
{ "en", "America/Havana", "2004-07-15T00:00:00Z", "v", "Cuba Time", "America/Havana" },
{ "en", "America/Havana", "2004-07-15T00:00:00Z", "vvvv", "Cuba Time", "America/Havana" },
@ -802,12 +802,12 @@ public class DateFormatTest extends com.ibm.icu.dev.test.TestFmwk {
{ "en", "Asia/Calcutta", "2004-01-15T00:00:00Z", "Z", "+0530", "+5:30" },
{ "en", "Asia/Calcutta", "2004-01-15T00:00:00Z", "ZZZZ", "GMT+05:30", "+5:30" },
{ "en", "Asia/Calcutta", "2004-01-15T00:00:00Z", "z", "GMT+05:30", "+5:30" },
{ "en", "Asia/Calcutta", "2004-01-15T00:00:00Z", "V", "IST", "+5:30" },
{ "en", "Asia/Calcutta", "2004-01-15T00:00:00Z", "V", "GMT+05:30", "+5:30" },
{ "en", "Asia/Calcutta", "2004-01-15T00:00:00Z", "zzzz", "India Standard Time", "+5:30" },
{ "en", "Asia/Calcutta", "2004-07-15T00:00:00Z", "Z", "+0530", "+5:30" },
{ "en", "Asia/Calcutta", "2004-07-15T00:00:00Z", "ZZZZ", "GMT+05:30", "+5:30" },
{ "en", "Asia/Calcutta", "2004-07-15T00:00:00Z", "z", "GMT+05:30", "+05:30" },
{ "en", "Asia/Calcutta", "2004-07-15T00:00:00Z", "V", "IST", "+05:30" },
{ "en", "Asia/Calcutta", "2004-07-15T00:00:00Z", "V", "GMT+05:30", "+05:30" },
{ "en", "Asia/Calcutta", "2004-07-15T00:00:00Z", "zzzz", "India Standard Time", "+5:30" },
{ "en", "Asia/Calcutta", "2004-07-15T00:00:00Z", "v", "India Time", "Asia/Calcutta" },
{ "en", "Asia/Calcutta", "2004-07-15T00:00:00Z", "vvvv", "India Standard Time", "Asia/Calcutta" },
@ -995,7 +995,7 @@ public class DateFormatTest extends com.ibm.icu.dev.test.TestFmwk {
{ "zh", "Europe/London", "2004-07-15T00:00:00Z", "Z", "+0100", "+1:00" },
{ "zh", "Europe/London", "2004-07-15T00:00:00Z", "ZZZZ", GMT_ZH+"+0100", "+1:00" },
{ "zh", "Europe/London", "2004-07-15T00:00:00Z", "z", GMT_ZH+"+0100", "+1:00" },
{ "zh", "Europe/London", "2004-07-15T00:00:00Z", "V", "BST", "+1:00" },
{ "zh", "Europe/London", "2004-07-15T00:00:00Z", "V", GMT_ZH+"+0100", "+1:00" },
{ "zh", "Europe/London", "2004-07-15T00:00:00Z", "zzzz", GMT_ZH+"+0100", "+1:00" },
{ "zh", "Europe/London", "2004-07-15T00:00:00Z", "v", "\u82f1\u56fd\u65f6\u95f4", "Europe/London" },
{ "zh", "Europe/London", "2004-07-15T00:00:00Z", "vvvv", "\u82f1\u56fd\u65f6\u95f4", "Europe/London" },

8
main/tests/core/src/com/ibm/icu/dev/test/util/RegionTest.java
View file

@ -75,7 +75,7 @@ public class RegionTest extends TestFmwk {
{ "AI" , "660", "029", "TERRITORY" },
{ "AL" , "008", "039", "TERRITORY" },
{ "AM" , "051", "145", "TERRITORY" },
{ "AN" , "530", "029", "TERRITORY" },
{ "AN" , "530", null, "DEPRECATED" },
{ "AO" , "024", "017", "TERRITORY" },
{ "AQ" , "010", "QO" , "TERRITORY" },
{ "AR" , "032", "005", "TERRITORY" },
@ -98,7 +98,7 @@ public class RegionTest extends TestFmwk {
{ "BM" , "060", "021", "TERRITORY" },
{ "BN" , "096", "035", "TERRITORY" },
{ "BO" , "068", "005", "TERRITORY" },
{ "BQ" , "010", "QO" , "TERRITORY" },
{ "BQ" , "535", "029", "TERRITORY" },
{ "BR" , "076", "005", "TERRITORY" },
{ "BS" , "044", "029", "TERRITORY" },
{ "BT" , "064", "034", "TERRITORY" },
@ -121,9 +121,9 @@ public class RegionTest extends TestFmwk {
{ "CO" , "170", "005", "TERRITORY" },
{ "CP" , "-1" , "QO" , "TERRITORY" },
{ "CR" , "188", "013", "TERRITORY" },
{ "CS" , "891", null , "DEPRECATED" },
{ "CU" , "192", "029", "TERRITORY" },
{ "CV" , "132", "011", "TERRITORY" },
{ "CW" , "531", "029", "TERRITORY" },
{ "CX" , "162", "QO" , "TERRITORY" },
{ "CY" , "196", "145", "TERRITORY" },
{ "CZ" , "203", "151", "TERRITORY" },
@ -300,6 +300,7 @@ public class RegionTest extends TestFmwk {
{ "ST" , "678", "017", "TERRITORY" },
{ "SU" , "810", null , "DEPRECATED" },
{ "SV" , "222", "013", "TERRITORY" },
{ "SX" , "534", "029", "TERRITORY" },
{ "SY" , "760", "145", "TERRITORY" },
{ "SZ" , "748", "018", "TERRITORY" },
{ "TA" , "-1" , "QO", "TERRITORY" },
@ -338,7 +339,6 @@ public class RegionTest extends TestFmwk {
{ "YD" , "887", "145", "TERRITORY" },
{ "YE" , "887", "145", "TERRITORY" },
{ "YT" , "175", "014", "TERRITORY" },
{ "YU" , "891", null , "DEPRECATED" },
{ "ZA" , "710", "018", "TERRITORY" },
{ "ZM" , "894", "014", "TERRITORY" },
{ "ZR" , "180", "017", "TERRITORY" },

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

@ -3000,8 +3000,8 @@ public class ULocaleTest extends TestFmwk {
"vi"
}, {
"und_VU",
"fr_Latn_VU",
"fr_VU"
"bi_Latn_VU",
"bi"
}, {
"und_WF",
"fr_Latn_WF",