From: Peter Edberg Date: Sun, 5 Mar 2017 03:53:56 +0000 (+0000) Subject: ICU-13005 Integrate data from CLDR release-31-d02, remove logKnownIssues for fixed... X-Git-Tag: release-59-rc~130 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2d183b5a924d8f159c1c931ba562fc24f81e4541;p=icu ICU-13005 Integrate data from CLDR release-31-d02, remove logKnownIssues for fixed items X-SVN-Rev: 39735 --- diff --git a/icu4c/source/data/brkitr/root.txt b/icu4c/source/data/brkitr/root.txt index 86d2fe0ccd5..82d9879bf91 100644 --- a/icu4c/source/data/brkitr/root.txt +++ b/icu4c/source/data/brkitr/root.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html#License root{ - Version{"2.1.30.48"} + Version{"2.1.32.92"} boundaries{ grapheme:process(dependency){"char.brk"} line:process(dependency){"line.brk"} diff --git a/icu4c/source/data/curr/ar.txt b/icu4c/source/data/curr/ar.txt index 3526e9e665e..2eb7d273581 100644 --- a/icu4c/source/data/curr/ar.txt +++ b/icu4c/source/data/curr/ar.txt @@ -2405,5 +2405,5 @@ ar{ two{"{0} {1}"} zero{"{0} {1}"} } - Version{"2.1.32.59"} + Version{"2.1.32.86"} } diff --git a/icu4c/source/data/lang/ar.txt b/icu4c/source/data/lang/ar.txt index 0ad9c7a8b10..5d31d4f4bc9 100644 --- a/icu4c/source/data/lang/ar.txt +++ b/icu4c/source/data/lang/ar.txt @@ -849,7 +849,7 @@ ar{ VALENCIA{"بلنسية"} WADEGILE{"المندرين باللاتينية - ويد–جيلز"} } - Version{"2.1.32.59"} + Version{"2.1.32.86"} characterLabelPattern{ all{"{0} - الكل"} category-list{"{0}: {1}"} diff --git a/icu4c/source/data/locales/ar.txt b/icu4c/source/data/locales/ar.txt index b0c39698e78..39bbe175791 100644 --- a/icu4c/source/data/locales/ar.txt +++ b/icu4c/source/data/locales/ar.txt @@ -252,6 +252,104 @@ ar{ zero{"¤ 000 ترليو"} } } + decimalFormat{ + 1000{ + few{"0 آلاف"} + many{"0 ألف"} + one{"0 ألف"} + other{"0 ألف"} + two{"0 ألف"} + zero{"0 ألف"} + } + 10000{ + few{"00 ألف"} + many{"00 ألف"} + one{"00 ألف"} + other{"00 ألف"} + two{"00 ألف"} + zero{"00 ألف"} + } + 100000{ + few{"000 ألف"} + many{"000 ألف"} + one{"000 ألف"} + other{"000 ألف"} + two{"000 ألف"} + zero{"000 ألف"} + } + 1000000{ + few{"0 مليو"} + many{"0 مليو"} + one{"0 مليو"} + other{"0 مليو"} + two{"0 مليو"} + zero{"0 مليو"} + } + 10000000{ + few{"00 مليو"} + many{"00 مليو"} + one{"00 مليو"} + other{"00 مليو"} + two{"00 مليو"} + zero{"00 مليو"} + } + 100000000{ + few{"000 مليو"} + many{"000 مليو"} + one{"000 مليو"} + other{"000 مليو"} + two{"000 مليو"} + zero{"000 مليو"} + } + 1000000000{ + few{"0 مليا"} + many{"0 مليا"} + one{"0 مليا"} + other{"0 مليا"} + two{"0 مليا"} + zero{"0 مليا"} + } + 10000000000{ + few{"00 مليا"} + many{"00 مليا"} + one{"00 مليا"} + other{"00 مليا"} + two{"00 مليا"} + zero{"00 مليا"} + } + 100000000000{ + few{"000 مليا"} + many{"000 مليا"} + one{"000 مليا"} + other{"000 مليا"} + two{"000 مليا"} + zero{"000 مليا"} + } + 1000000000000{ + few{"0 ترليو"} + many{"0 ترليو"} + one{"0 ترليو"} + other{"0 ترليو"} + two{"0 ترليو"} + zero{"0 ترليو"} + } + 10000000000000{ + few{"00 ترليو"} + many{"00 ترليو"} + one{"00 ترليو"} + other{"00 ترليو"} + two{"00 ترليو"} + zero{"00 ترليو"} + } + 100000000000000{ + few{"000 ترليو"} + many{"000 ترليو"} + one{"000 ترليو"} + other{"000 ترليو"} + two{"000 ترليو"} + zero{"000 ترليو"} + } + } } symbols{ decimal{"."} @@ -284,7 +382,7 @@ ar{ minimumGroupingDigits{"1"} native{"arab"} } - Version{"2.1.32.59"} + Version{"2.1.32.86"} calendar{ buddhist{ eras{ diff --git a/icu4c/source/data/misc/metadata.txt b/icu4c/source/data/misc/metadata.txt index ae4ecc6d2dc..8868f42f0c2 100644 --- a/icu4c/source/data/misc/metadata.txt +++ b/icu4c/source/data/misc/metadata.txt @@ -1279,6 +1279,14 @@ metadata:table(nofallback){ reason{"overlong"} replacement{"yo"} } + yue_CN{ + reason{"legacy"} + replacement{"yue_Hans_CN"} + } + yue_HK{ + reason{"legacy"} + replacement{"yue_Hant_HK"} + } zai{ reason{"macrolanguage"} replacement{"zap"} diff --git a/icu4c/source/data/region/ar.txt b/icu4c/source/data/region/ar.txt index 0e8b2b5b23f..aa2313afd43 100644 --- a/icu4c/source/data/region/ar.txt +++ b/icu4c/source/data/region/ar.txt @@ -309,5 +309,5 @@ ar{ MK{"مقدونيا- جمهورية مقدونيا اليوغسلافية السابقة"} TL{"تيمور الشرقية"} } - Version{"2.1.32.59"} + Version{"2.1.32.86"} } diff --git a/icu4c/source/data/unit/ar.txt b/icu4c/source/data/unit/ar.txt index 0797f473a70..577f9f8304a 100644 --- a/icu4c/source/data/unit/ar.txt +++ b/icu4c/source/data/unit/ar.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html#License ar{ - Version{"2.1.32.59"} + Version{"2.1.32.86"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} diff --git a/icu4c/source/data/zone/ar.txt b/icu4c/source/data/zone/ar.txt index f28764fa02c..418d0cfeefa 100644 --- a/icu4c/source/data/zone/ar.txt +++ b/icu4c/source/data/zone/ar.txt @@ -1,7 +1,7 @@ // © 2016 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html#License ar{ - Version{"2.1.32.59"} + Version{"2.1.32.86"} zoneStrings{ "Africa:Abidjan"{ ec{"أبيدجان"} diff --git a/icu4j/main/shared/data/icudata.jar b/icu4j/main/shared/data/icudata.jar index d0a25acf75c..87a679a0b95 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:3c8dbe867365547805caf125f25a2551375b58e09653f9e625d7a015b35aa6aa -size 12154917 +oid sha256:88c822b919d4c929386735e4cf6d95194bf20dba17cfe4aa93d4f46a08d2a5d4 +size 12155049 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/CompactDecimalFormatTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/CompactDecimalFormatTest.java index 364955f3d5a..4c82e878d4a 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/CompactDecimalFormatTest.java +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/CompactDecimalFormatTest.java @@ -484,9 +484,6 @@ public class CompactDecimalFormatTest extends TestFmwk { @Test public void TestNordic() { - if (logKnownIssue("cldrbug:9465","CDF(12,000) for no_NO shouldn't be 12 (12K or similar)")) { - return; - } String result = CompactDecimalFormat.getInstance( new ULocale("no_NO"), CompactDecimalFormat.CompactStyle.SHORT ).format(12000); assertNotEquals("CDF(12,000) for no_NO shouldn't be 12 (12K or similar)", "12", result); @@ -544,9 +541,7 @@ public class CompactDecimalFormatTest extends TestFmwk { cdf = CompactDecimalFormat.getInstance(new ULocale("ar"), CompactDecimalFormat.CompactStyle.SHORT); cdf.setMaximumSignificantDigits(3); result = cdf.format(1234); - if (!logKnownIssue("cldrbug:9492", "CLDR 31-d01 incorrectly deleted ar compactDecimals short form")) { - assertEquals("CDF should correctly format 1234 with 3 significant digits in 'ar'", "١٫٢٣ ألف", result); - } + assertEquals("CDF should correctly format 1234 with 3 significant digits in 'ar'", "١٫٢٣ ألف", result); // Check currency formatting as well cdf = CompactDecimalFormat.getInstance(new ULocale("ar"), CompactDecimalFormat.CompactStyle.SHORT);