From 478fb8b161e0e0200f618261cd26070c68279782 Mon Sep 17 00:00:00 2001 From: John Emmons Date: Fri, 20 Jun 2008 22:22:00 +0000 Subject: [PATCH] ICU-6256 Integrate CLDR 1.6 release 1-6-d01 + a few minor fixes X-SVN-Rev: 24258 --- icu4j/src/com/ibm/icu/dev/data/testdata.jar | 4 ++-- .../dev/test/calendar/IBMCalendarTest.java | 6 ++--- .../icu/dev/test/format/DateFormatTest.java | 6 ++--- .../format/GlobalizationPreferencesTest.java | 20 ++++++++-------- .../icu/dev/test/format/NumberFormatTest.java | 24 +++++++++---------- .../icu/dev/test/format/NumberRegression.java | 18 +++++++------- .../dev/test/format/TestMessageFormat.java | 6 ++--- icu4j/src/com/ibm/icu/impl/data/icudata.jar | 4 ++-- 8 files changed, 44 insertions(+), 44 deletions(-) diff --git a/icu4j/src/com/ibm/icu/dev/data/testdata.jar b/icu4j/src/com/ibm/icu/dev/data/testdata.jar index 862d5baa1e..2d86dd2058 100644 --- a/icu4j/src/com/ibm/icu/dev/data/testdata.jar +++ b/icu4j/src/com/ibm/icu/dev/data/testdata.jar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8ced59cd051f06243849694085067729eba7086bf78a703c4a5902a37d4423f4 -size 764842 +oid sha256:b7bcc3d344f5d694d9dd5f84cee3b08e082c4b54fc1568d3009b4e3ea600f89a +size 764853 diff --git a/icu4j/src/com/ibm/icu/dev/test/calendar/IBMCalendarTest.java b/icu4j/src/com/ibm/icu/dev/test/calendar/IBMCalendarTest.java index f95779b7f0..eaefad399c 100644 --- a/icu4j/src/com/ibm/icu/dev/test/calendar/IBMCalendarTest.java +++ b/icu4j/src/com/ibm/icu/dev/test/calendar/IBMCalendarTest.java @@ -41,7 +41,7 @@ public class IBMCalendarTest extends CalendarTest { // NOTE // This test tests for specific locale data. This is probably okay - // as far as US data is concerned, but if the Arabic/Bahrain data + // as far as US data is concerned, but if the Arabic/Yemen data // changes, this test will have to be updated. // Test specific days @@ -56,7 +56,7 @@ public class IBMCalendarTest extends CalendarTest { 2000, Calendar.MARCH, 20, 0, 0, 0, // Mon 00:00 2000, Calendar.MARCH, 20, 8, 0, 0, // Mon 08:00 }, - new Locale("ar", "BH"), new int[] { // Thursday:Friday + new Locale("ar", "YE"), new int[] { // Thursday:Friday 2000, Calendar.MARCH, 15, 23, 0, 0, // Wed 23:00 2000, Calendar.MARCH, 16, 0, -1, 0, // Wed 23:59:59.999 2000, Calendar.MARCH, 16, 0, 0, 1, // Thu 00:00 @@ -76,7 +76,7 @@ public class IBMCalendarTest extends CalendarTest { Calendar.SATURDAY, Calendar.WEEKEND, Calendar.SUNDAY, Calendar.WEEKEND_CEASE, }, - new Locale("ar", "BH"), new int[] { // Thursday:Friday + new Locale("ar", "YE"), new int[] { // Thursday:Friday Calendar.WEDNESDAY,Calendar.WEEKDAY, Calendar.SATURDAY, Calendar.WEEKDAY, Calendar.THURSDAY, Calendar.WEEKEND, diff --git a/icu4j/src/com/ibm/icu/dev/test/format/DateFormatTest.java b/icu4j/src/com/ibm/icu/dev/test/format/DateFormatTest.java index 7eeb14ce37..c5f03b45f4 100644 --- a/icu4j/src/com/ibm/icu/dev/test/format/DateFormatTest.java +++ b/icu4j/src/com/ibm/icu/dev/test/format/DateFormatTest.java @@ -951,13 +951,13 @@ public class DateFormatTest extends com.ibm.icu.dev.test.TestFmwk { { "zh", "America/Havana", "2004-01-15T00:00:00Z", "Z", "-0500", "-5:00" }, { "zh", "America/Havana", "2004-01-15T00:00:00Z", "ZZZZ", GMT_ZH+"-0500", "-5:00" }, { "zh", "America/Havana", "2004-01-15T00:00:00Z", "z", GMT_ZH+"-0500", "-5:00" }, - { "zh", "America/Havana", "2004-01-15T00:00:00Z", "zzzz", GMT_ZH+"-0500", "-5:00" }, + { "zh", "America/Havana", "2004-01-15T00:00:00Z", "zzzz", "\u53e4\u5df4\u6a19\u6e96\u6642\u9593", "-5:00" }, { "zh", "America/Havana", "2004-07-15T00:00:00Z", "Z", "-0400", "-4:00" }, { "zh", "America/Havana", "2004-07-15T00:00:00Z", "ZZZZ", GMT_ZH+"-0400", "-4:00" }, { "zh", "America/Havana", "2004-07-15T00:00:00Z", "z", GMT_ZH+"-0400", "-4:00" }, - { "zh", "America/Havana", "2004-07-15T00:00:00Z", "zzzz", GMT_ZH+"-0400", "-4:00" }, + { "zh", "America/Havana", "2004-07-15T00:00:00Z", "zzzz", "\u53e4\u5df4\u590f\u4ee4\u6642\u9593", "-4:00" }, { "zh", "America/Havana", "2004-07-15T00:00:00Z", "v", "\u53e4\u5df4", "America/Havana" }, - { "zh", "America/Havana", "2004-07-15T00:00:00Z", "vvvv", "\u53e4\u5df4", "America/Havana" }, + { "zh", "America/Havana", "2004-07-15T00:00:00Z", "vvvv", "\u53e4\u5df4\u6642\u9593", "America/Havana" }, { "zh", "Australia/ACT", "2004-01-15T00:00:00Z", "Z", "+1100", "+11:00" }, { "zh", "Australia/ACT", "2004-01-15T00:00:00Z", "ZZZZ", GMT_ZH+"+1100", "+11:00" }, diff --git a/icu4j/src/com/ibm/icu/dev/test/format/GlobalizationPreferencesTest.java b/icu4j/src/com/ibm/icu/dev/test/format/GlobalizationPreferencesTest.java index 13a40d376c..b22553beaa 100644 --- a/icu4j/src/com/ibm/icu/dev/test/format/GlobalizationPreferencesTest.java +++ b/icu4j/src/com/ibm/icu/dev/test/format/GlobalizationPreferencesTest.java @@ -1384,8 +1384,8 @@ public class GlobalizationPreferencesTest extends TestFmwk { gp.setLocale(new ULocale("ang_KR")); nf = gp.getNumberFormat(GlobalizationPreferences.NF_CURRENCY); numStr = nf.format(num); - if (!numStr.equals("KRW 123,457")) { - errln("FAIL: Number string is " + numStr + " Expected: KRW 123,457"); + if (!numStr.equals("KRW\u00a0123,457")) { + errln("FAIL: Number string is " + numStr + " Expected: KRW\u00a0123,457"); } // Set locale - de_DE @@ -1404,16 +1404,16 @@ public class GlobalizationPreferencesTest extends TestFmwk { logln("CURRENCY type"); nf = gp.getNumberFormat(GlobalizationPreferences.NF_CURRENCY); numStr = nf.format(num); - if (!numStr.equals("123.456,79 \u20AC")) { - errln("FAIL: Number string is " + numStr + " Expected: 123.456,79 \u20AC"); + if (!numStr.equals("123.456,79\u00a0\u20AC")) { + errln("FAIL: Number string is " + numStr + " Expected: 123.456,79\u00a0\u20AC"); } // NF_PERCENT logln("PERCENT type"); nf = gp.getNumberFormat(GlobalizationPreferences.NF_PERCENT); numStr = nf.format(num); - if (!numStr.equals("12.345.679 %")) { - errln("FAIL: Number string is " + numStr + " Expected: 12.345.679 %"); + if (!numStr.equals("12.345.679\u00a0%")) { + errln("FAIL: Number string is " + numStr + " Expected: 12.345.679\u00a0%"); } // NF_SCIENTIFIC @@ -1460,8 +1460,8 @@ public class GlobalizationPreferencesTest extends TestFmwk { gp.setTerritory("US"); nf = gp.getNumberFormat(GlobalizationPreferences.NF_CURRENCY); numStr = nf.format(num); - if (!numStr.equals("123.456,79 $")) { - errln("FAIL: Number string is " + numStr + " Expected: 123.456,79 $"); + if (!numStr.equals("123.456,79\u00a0$")) { + errln("FAIL: Number string is " + numStr + " Expected: 123.456,79\u00a0$"); } // Set explicit currency @@ -1469,8 +1469,8 @@ public class GlobalizationPreferencesTest extends TestFmwk { gp.setCurrency(Currency.getInstance("GBP")); nf = gp.getNumberFormat(GlobalizationPreferences.NF_CURRENCY); numStr = nf.format(num); - if (!numStr.equals("123.456,79 \u00A3")) { - errln("FAIL: Number string is " + numStr + " Expected: 123.456,79 \u00A3"); + if (!numStr.equals("123.456,79\u00a0\u00A3")) { + errln("FAIL: Number string is " + numStr + " Expected: 123.456,79\u00a0\u00A3"); } // Set exliplicit NumberFormat diff --git a/icu4j/src/com/ibm/icu/dev/test/format/NumberFormatTest.java b/icu4j/src/com/ibm/icu/dev/test/format/NumberFormatTest.java index 3ffcee7281..a98cc650e8 100644 --- a/icu4j/src/com/ibm/icu/dev/test/format/NumberFormatTest.java +++ b/icu4j/src/com/ibm/icu/dev/test/format/NumberFormatTest.java @@ -243,11 +243,11 @@ public class NumberFormatTest extends com.ibm.icu.dev.test.TestFmwk { */ public void TestCurrency() { String[] DATA = { - "fr", "CA", "", "1,50 $", - "de", "DE", "", "1,50 \u20AC", - "de", "DE", "PREEURO", "1,50 DM", - "fr", "FR", "", "1,50 \u20AC", - "fr", "FR", "PREEURO", "1,50 F", + "fr", "CA", "", "1,50\u00a0$", + "de", "DE", "", "1,50\u00a0\u20AC", + "de", "DE", "PREEURO", "1,50\u00a0DM", + "fr", "FR", "", "1,50\u00a0\u20AC", + "fr", "FR", "PREEURO", "1,50\u00a0F", }; for (int i=0; i