From 5e7717302207ac2dd13ab0cc16fc5ede9bd08054 Mon Sep 17 00:00:00 2001 From: John Emmons Date: Tue, 23 Jun 2009 06:14:20 +0000 Subject: [PATCH] ICU-6979 Integrate CLDR 1.7.1 X-SVN-Rev: 26141 --- icu4j/main/shared/data/icudata.jar | 4 ++-- icu4j/main/shared/data/testdata.jar | 4 ++-- .../com/ibm/icu/dev/test/format/NumberFormatTest.java | 10 +++++----- .../ibm/icu/dev/test/format/NumberFormatTestCases.txt | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/icu4j/main/shared/data/icudata.jar b/icu4j/main/shared/data/icudata.jar index c32112d7b71..76a52205f69 100755 --- a/icu4j/main/shared/data/icudata.jar +++ b/icu4j/main/shared/data/icudata.jar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fa8091988f86a0c01821d4d5ec5e50504f1e92353fcc2ce2f230ea42b2d83d4f -size 7214747 +oid sha256:401f7d01c3267258a667598ac1e9780a8c7f41475fccb4e54bbdb4407feb6cca +size 7212606 diff --git a/icu4j/main/shared/data/testdata.jar b/icu4j/main/shared/data/testdata.jar index bd89b03ff8d..78a7147cbab 100755 --- a/icu4j/main/shared/data/testdata.jar +++ b/icu4j/main/shared/data/testdata.jar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5e4ffe9070b3d419a5df23d222bb6dcd68790c8044172727c985f5fd8adbe555 -size 772538 +oid sha256:6c64c04ade4d5e79eae19db5debe13914d6cb47cf36f20a5eb687d52f3cfdbde +size 775547 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/NumberFormatTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/NumberFormatTest.java index c4093071e85..60e36baaf61 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/NumberFormatTest.java +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/NumberFormatTest.java @@ -496,7 +496,7 @@ public class NumberFormatTest extends com.ibm.icu.dev.test.TestFmwk { // test locale without currency information {"ti_ET", "-1.23", "USD", "-US$1.23", "-USD1.23", "-1.23 USD"}, // test choice format - {"es_AR", "1", "INR", "\u20a8\u00A01,00", "INR\u00A01,00", "1,00 rupia india"}, + {"es_AR", "1", "INR", "Rs\u00A01,00", "INR\u00A01,00", "1,00 rupia india"}, {"ar_EG", "1", "USD", "US$\u00A0\u0661\u066B\u0660\u0660", "USD\u00a0\u0661\u066b\u0660\u0660", "\u0661\u066b\u0660\u0660 \u062f\u0648\u0644\u0627\u0631 \u0623\u0645\u0631\u064a\u0643\u064a"}, }; @@ -1148,11 +1148,11 @@ public class NumberFormatTest extends com.ibm.icu.dev.test.TestFmwk { DecimalFormatSymbols US = new DecimalFormatSymbols(Locale.US); DecimalFormat df = new DecimalFormat("'*&'' '\u00A4' ''&*' #,##0.00", US); df.setCurrency(Currency.getInstance("INR")); - expect2(df, 1.0, "*&' \u20a8 '&* 1.00"); - expect2(df, -2.0, "-*&' \u20a8 '&* 2.00"); + expect2(df, 1.0, "*&' Rs '&* 1.00"); + expect2(df, -2.0, "-*&' Rs '&* 2.00"); df.applyPattern("#,##0.00 '*&'' '\u00A4' ''&*'"); - expect2(df, 2.0, "2.00 *&' \u20a8 '&*"); - expect2(df, -1.0, "-1.00 *&' \u20a8 '&*"); + expect2(df, 2.0, "2.00 *&' Rs '&*"); + expect2(df, -1.0, "-1.00 *&' Rs '&*"); java.math.BigDecimal r = df.getRoundingIncrement(); if (r != null) { diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/NumberFormatTestCases.txt b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/NumberFormatTestCases.txt index 788388857ec..527037dcd89 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/NumberFormatTestCases.txt +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/NumberFormatTestCases.txt @@ -79,9 +79,9 @@ fpc: - 1234.56/JPY "¥1,235" 1235/JPY # fpc: - 123/QQQ "QQQ123.00" 123/QQQ # QQQ is fake fpc: - 123/GTQ "GTQ123.00" 123/GTQ # ChoiceFormat-based display names -fpc: - 1/INR "₨1.00" 1/INR +fpc: - 1/INR "Rs1.00" 1/INR -fpc: - 2/INR "₨2.00" 2/INR +fpc: - 2/INR "Rs2.00" 2/INR # Display names with shared prefix (YDD vs. Y) fpc: - 100/YDD "YDD100.00" 100/YDD fpc: - 100/CNY "CN¥100.00" 100/CNY