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

ICU-6256 Integrate CLDR 1.6 release 1-6-d01 + a few minor fixes

Browse Source 
X-SVN-Rev: 24258
This commit is contained in:
John Emmons 2008-06-20 22:22:00 +00:00
parent 4d161ddedc
commit 478fb8b161
8 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
icu4j/src/com/ibm/icu/dev/data/testdata.jar
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8ced59cd051f06243849694085067729eba7086bf78a703c4a5902a37d4423f4
size 764842
oid sha256:b7bcc3d344f5d694d9dd5f84cee3b08e082c4b54fc1568d3009b4e3ea600f89a
size 764853

6
icu4j/src/com/ibm/icu/dev/test/calendar/IBMCalendarTest.java
View File

@ -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,

6
icu4j/src/com/ibm/icu/dev/test/format/DateFormatTest.java
View File

@ -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" },

20
icu4j/src/com/ibm/icu/dev/test/format/GlobalizationPreferencesTest.java
View File

@ -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

24
icu4j/src/com/ibm/icu/dev/test/format/NumberFormatTest.java
View File

@ -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<DATA.length; i+=4) {
@ -955,12 +955,12 @@ public class NumberFormatTest extends com.ibm.icu.dev.test.TestFmwk {
Locale loc = new Locale("kn", "IN", "");
NumberFormat fmt = NumberFormat.getCurrencyInstance(loc);
expect2(fmt, 1.0, "Re. 1.00");
expect(fmt, 1.001, "Re. 1.00"); // tricky
expect2(fmt, 12345678.0, "Rs. 1,23,45,678.00");
expect2(fmt, 0.5, "Rs. 0.50");
expect2(fmt, -1.0, "-Re. 1.00");
expect2(fmt, -10.0, "-Rs. 10.00");
expect2(fmt, 1.0, "Re.\u00a01.00");
expect(fmt, 1.001, "Re.\u00a01.00"); // tricky
expect2(fmt, 12345678.0, "Rs.\u00a01,23,45,678.00");
expect2(fmt, 0.5, "Rs.\u00a00.50");
expect2(fmt, -1.0, "-Re.\u00a01.00");
expect2(fmt, -10.0, "-Rs.\u00a010.00");
}
public void TestCurrencyKeyword() {
@ -1562,7 +1562,7 @@ public class NumberFormatTest extends com.ibm.icu.dev.test.TestFmwk {
CurrencyAmount cAmt = new CurrencyAmount(1150.50, curr);
logln("CurrencyAmount object's hashCode is: " + cAmt.hashCode()); //cover hashCode
String str = format.format(cAmt);
String expected = "1,150$50 Esc.";
String expected = "1,150$50\u00a0Esc.";
if(!expected.equals(str)){
errln("Did not get the expected output Expected: "+expected+" Got: "+ str);
}

18
icu4j/src/com/ibm/icu/dev/test/format/NumberRegression.java
View File

@ -464,11 +464,11 @@ public class NumberRegression extends com.ibm.icu.dev.test.TestFmwk {
String tempString;
/* User error :
String expectedDefault = "-5\u00a0789,987";
String expectedCurrency = "5\u00a0789,98 F";
String expectedCurrency = "5\u00a0789,98\u00a0F";
String expectedPercent = "-578\u00a0998%";
*/
String expectedDefault = "-5\u00a0789,988";
String expectedCurrency = "5\u00a0789,99 " + EURO; // euro
String expectedCurrency = "5\u00a0789,99\u00a0" + EURO; // euro
String expectedPercent = "-578\u00a0999\u00a0%";
formatter = NumberFormat.getNumberInstance(Locale.FRANCE);
@ -515,11 +515,11 @@ public class NumberRegression extends com.ibm.icu.dev.test.TestFmwk {
String tempString;
/* user error :
String expectedDefault = "-5 789,987";
String expectedCurrency = "5 789,98 $";
String expectedCurrency = "5 789,98\u00a0$";
String expectedPercent = "-578 998%";
*/
String expectedDefault = "-5\u00a0789,988";
String expectedCurrency = "5\u00a0789,99 $";
String expectedCurrency = "5\u00a0789,99\u00a0$";
String expectedPercent = "-578\u00a0999\u00A0%";
formatter = NumberFormat.getNumberInstance(Locale.CANADA_FRENCH);
@ -562,12 +562,12 @@ public class NumberRegression extends com.ibm.icu.dev.test.TestFmwk {
String tempString;
/* user error :
String expectedDefault = "-5.789,987";
String expectedCurrency = "5.789,98 DM";
String expectedCurrency = "5.789,98\u00a0DM";
String expectedPercent = "-578.998%";
*/
String expectedDefault = "-5.789,988";
String expectedCurrency = "5.789,99 " + EURO;
String expectedPercent = "-578.999 %";
String expectedCurrency = "5.789,99\u00a0" + EURO;
String expectedPercent = "-578.999\u00a0%";
formatter = NumberFormat.getNumberInstance(Locale.GERMANY);
tempString = formatter.format (-5789.9876);
@ -612,11 +612,11 @@ public class NumberRegression extends com.ibm.icu.dev.test.TestFmwk {
String tempString;
/* user error :
String expectedDefault = "-5.789,987";
String expectedCurrency = "-L. 5.789,98";
String expectedCurrency = "-L.\u00a05.789,98";
String expectedPercent = "-578.998%";
*/
String expectedDefault = "-5.789,988";
String expectedCurrency = "-" + EURO + " 5.789,99";
String expectedCurrency = "-" + EURO + "\u00a05.789,99";
String expectedPercent = "-578.999%";
formatter = NumberFormat.getNumberInstance(Locale.ITALY);

6
icu4j/src/com/ibm/icu/dev/test/format/TestMessageFormat.java
View File

@ -1,7 +1,7 @@
//##header J2SE15
/*
**********************************************************************
* Copyright (c) 2004-2007, International Business Machines
* Copyright (c) 2004-2008, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
* Author: Alan Liu
@ -422,7 +422,7 @@ public class TestMessageFormat extends com.ibm.icu.dev.test.TestFmwk {
// Just use unlocalized currency symbol.
//String compareStrGer = "At <time> on 08.08.1997, you made a deposit of 456,83 DM.";
String compareStrGer = "At <time> on 08.08.1997, you made a deposit of ";
compareStrGer += "456,83 ";
compareStrGer += "456,83\u00a0";
compareStrGer += '\u00a4';
compareStrGer += ".";
@ -862,7 +862,7 @@ public class TestMessageFormat extends com.ibm.icu.dev.test.TestFmwk {
compareStr2 += "456.83.";
// both date and currency formats are German-style
String compareStr3 = "At <time> on 08.08.1997, you made a deposit of ";
compareStr3 += "456,83 ";
compareStr3 += "456,83\u00a0";
compareStr3 += '\u00a4';
compareStr3 += ".";

4
icu4j/src/com/ibm/icu/impl/data/icudata.jar
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:17c3e4c82ad45b1391cd44494577fe9b1319ce4e47a8b37a987855a53407df02
size 6706054
oid sha256:d0c9ce266632e42a765c7c913d51353d001a4c1ec94c375347fb7eb78962d557
size 6604706