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

ICU-13005 Integrate data from CLDR release-31-d02, remove logKnownIssues for fixed items

Browse source 
X-SVN-Rev: 39735
This commit is contained in:
Peter Edberg 2017-03-05 03:53:56 +00:00
parent 9b792c3cf1
commit 2d183b5a92
10 changed files with 116 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
icu4c/source/data/brkitr/root.txt
View file

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

2
icu4c/source/data/curr/ar.txt
View file

@ -2405,5 +2405,5 @@ ar{
two{"{0} {1}"}
zero{"{0} {1}"}
}
Version{"2.1.32.59"}
Version{"2.1.32.86"}
}

2
icu4c/source/data/lang/ar.txt
View file

@ -849,7 +849,7 @@ ar{
VALENCIA{"بلنسية"}
WADEGILE{"المندرين باللاتينية - ويد–جيلز"}
}
Version{"2.1.32.59"}
Version{"2.1.32.86"}
characterLabelPattern{
all{"{0} - الكل"}
category-list{"{0}: {1}"}

100
icu4c/source/data/locales/ar.txt
View file

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

8
icu4c/source/data/misc/metadata.txt
View file

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

2
icu4c/source/data/region/ar.txt
View file

@ -309,5 +309,5 @@ ar{
MK{"مقدونيا- جمهورية مقدونيا اليوغسلافية السابقة"}
TL{"تيمور الشرقية"}
}
Version{"2.1.32.59"}
Version{"2.1.32.86"}
}

2
icu4c/source/data/unit/ar.txt
View file

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

2
icu4c/source/data/zone/ar.txt
View file

@ -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{"أبيدجان"}

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

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3c8dbe867365547805caf125f25a2551375b58e09653f9e625d7a015b35aa6aa
size 12154917
oid sha256:88c822b919d4c929386735e4cf6d95194bf20dba17cfe4aa93d4f46a08d2a5d4
size 12155049

7
icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/CompactDecimalFormatTest.java
View file

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