organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-09 15:27:38 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-13359 Integrate updated CLDR 32 @13761 for 60rc. The previous issues #13366,#13368,#13374,#13390,#13391 are fixed.

Browse source 
X-SVN-Rev: 40582
This commit is contained in:
Peter Edberg 2017-10-06 00:46:48 +00:00
parent 4380990cc0
commit dbc623d0d8
28 changed files with 59 additions and 59 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.36.90"}
Version{"2.1.37.61"}
boundaries{
grapheme:process(dependency){"char.brk"}
line:process(dependency){"line.brk"}

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

@ -2104,5 +2104,5 @@ bg{
one{"{0} {1}"}
other{"{0} {1}"}
}
Version{"2.1.37.5"}
Version{"2.1.37.59"}
}

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

@ -1356,5 +1356,5 @@ or{
one{"{0} {1}"}
other{"{0} {1}"}
}
Version{"2.1.36.86"}
Version{"2.1.37.57"}
}

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

@ -2206,5 +2206,5 @@ ru{
one{"{0} {1}"}
other{"{0} {1}"}
}
Version{"2.1.37.12"}
Version{"2.1.37.58"}
}

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

@ -1771,5 +1771,5 @@ th{
CurrencyUnitPatterns{
other{"{0} {1}"}
}
Version{"2.1.37.5"}
Version{"2.1.37.56"}
}

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

@ -828,7 +828,7 @@ bg{
VALENCIA{"Валенсиански"}
WADEGILE{"Уейд-Джайлс романизация"}
}
Version{"2.1.37.5"}
Version{"2.1.37.59"}
characterLabelPattern{
all{"{0} – всички"}
category-list{"{0}: {1}"}

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

@ -738,7 +738,7 @@ or{
tibt{"ତିବେତାନ୍ ଅଙ୍କଗୁଡିକ"}
}
}
Version{"2.1.36.86"}
Version{"2.1.37.57"}
characterLabelPattern{
all{"{0} — ସମସ୍ତ"}
category-list{"{0}: {1}"}

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

@ -916,7 +916,7 @@ ru{
VALENCIA{"Валенсийский"}
WADEGILE{"Система Уэйда – Джайлза"}
}
Version{"2.1.37.12"}
Version{"2.1.37.58"}
characterLabelPattern{
all{"{0} – все"}
category-list{"{0}: {1}"}

4
icu4c/source/data/lang/th.txt
View file

@ -620,7 +620,7 @@ th{
yap{"ยัป"}
yav{"แยงเบน"}
ybb{"เยมบา"}
yi{"ยิว"}
yi{"ยิดดิช"}
yo{"โยรูบา"}
yrl{"เหงงกาตุ"}
yue{"กวางตุ้ง"}
@ -1054,7 +1054,7 @@ th{
VALLADER{"วัลลาเดอร์"}
WADEGILE{"การถอดอักษรแบบเวด-ไจลส์"}
}
Version{"2.1.37.5"}
Version{"2.1.37.56"}
characterLabelPattern{
all{"{0} — ทั้งหมด"}
category-list{"{0}: {1}"}

2
icu4c/source/data/locales/bg.txt
View file

@ -210,7 +210,7 @@ bg{
minimumGroupingDigits{"2"}
native{"latn"}
}
Version{"2.1.37.5"}
Version{"2.1.37.59"}
calendar{
generic{
DateTimePatterns{

16
icu4c/source/data/locales/or.txt
View file

@ -29,10 +29,10 @@ or{
range{"{0}–{1}"}
}
patterns{
accountingFormat{"¤#,##0.00;(¤#,##0.00)"}
currencyFormat{"¤ #,##0.00"}
decimalFormat{"#,##0.###"}
percentFormat{"#,##0%"}
accountingFormat{"¤#,##,##0.00;(¤#,##,##0.00)"}
currencyFormat{"¤ #,##,##0.00"}
decimalFormat{"#,##,##0.###"}
percentFormat{"#,##,##0%"}
scientificFormat{"#E0"}
}
patternsLong{
@ -206,9 +206,9 @@ or{
native{"orya"}
orya{
patterns{
currencyFormat{"¤#,##0.00"}
decimalFormat{"#,##0.###"}
percentFormat{"#,##0%"}
currencyFormat{"¤#,##,##0.00"}
decimalFormat{"#,##,##0.###"}
percentFormat{"#,##,##0%"}
scientificFormat{"#E0"}
}
symbols{
@ -225,7 +225,7 @@ or{
}
}
}
Version{"2.1.36.86"}
Version{"2.1.37.57"}
calendar{
generic{
DateTimePatterns{

2
icu4c/source/data/locales/ru.txt
View file

@ -290,7 +290,7 @@ ru{
minimumGroupingDigits{"1"}
native{"latn"}
}
Version{"2.1.37.12"}
Version{"2.1.37.58"}
calendar{
buddhist{
eras{

2
icu4c/source/data/locales/th.txt
View file

@ -181,7 +181,7 @@ th{
minimumGroupingDigits{"1"}
native{"thai"}
}
Version{"2.1.37.5"}
Version{"2.1.37.56"}
calendar{
buddhist{
DateTimePatterns{

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

@ -309,5 +309,5 @@ bg{
FK{"Фолклендски острови (Малвински острови)"}
MK{"Бивша югославска република Македония"}
}
Version{"2.1.37.5"}
Version{"2.1.37.59"}
}

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

@ -310,5 +310,5 @@ or{
MK{"ମାସେଡୋନିଆ (ଫାଇରମ୍‌)"}
TL{"ପୂର୍ବ ତିମୋର୍‌"}
}
Version{"2.1.36.86"}
Version{"2.1.37.57"}
}

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

@ -309,5 +309,5 @@ ru{
MK{"Македония (БЮРМ)"}
TL{"Тимор-Лесте"}
}
Version{"2.1.37.12"}
Version{"2.1.37.58"}
}

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

@ -311,5 +311,5 @@ th{
MK{"มาซิโดเนีย (FYROM)"}
TL{"ติมอร์ตะวันออก"}
}
Version{"2.1.37.5"}
Version{"2.1.37.56"}
}

20
icu4c/source/data/unit/bg.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
bg{
Version{"2.1.37.5"}
Version{"2.1.37.59"}
durationUnits{
hm{"h:mm"}
hms{"h:mm:ss"}
@ -805,9 +805,9 @@ bg{
other{"{0} д"}
}
hour{
dnam{"h"}
one{"{0} h"}
other{"{0} h"}
dnam{"ч"}
one{"{0} ч"}
other{"{0} ч"}
}
millisecond{
dnam{"ms"}
@ -815,9 +815,9 @@ bg{
other{"{0} ms"}
}
minute{
dnam{"min"}
one{"{0} min"}
other{"{0} min"}
dnam{"мин"}
one{"{0} мин"}
other{"{0} мин"}
}
month{
dnam{"м"}
@ -825,9 +825,9 @@ bg{
other{"{0} м"}
}
second{
dnam{"s"}
one{"{0} s"}
other{"{0} s"}
dnam{"с"}
one{"{0} с"}
other{"{0} с"}
}
week{
dnam{"седм."}

2
icu4c/source/data/unit/or.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
or{
Version{"2.1.36.86"}
Version{"2.1.37.57"}
durationUnits{
hm{"h:mm"}
hms{"h:mm:ss"}

18
icu4c/source/data/unit/ru.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
ru{
Version{"2.1.37.12"}
Version{"2.1.37.58"}
durationUnits{
hm{"h:mm"}
hms{"h:mm:ss"}
@ -1229,10 +1229,10 @@ ru{
}
foot{
dnam{"фт"}
few{"{0} фута"}
many{"{0} футов"}
one{"{0} фут"}
other{"{0} фута"}
few{"{0} фт"}
many{"{0} фт"}
one{"{0} фт"}
other{"{0} фт"}
per{"{0}/фт"}
}
furlong{
@ -2046,10 +2046,10 @@ ru{
}
foot{
dnam{"фт"}
few{"{0} фт"}
many{"{0} фт"}
one{"{0} фт"}
other{"{0} фт"}
few{"{0} фута"}
many{"{0} футов"}
one{"{0} фут"}
other{"{0} фута"}
per{"{0}/фт"}
}
furlong{

2
icu4c/source/data/unit/th.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
th{
Version{"2.1.37.5"}
Version{"2.1.37.56"}
durationUnits{
hm{"h:mm"}
hms{"h:mm:ss"}

2
icu4c/source/data/zone/bg.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
bg{
Version{"2.1.37.5"}
Version{"2.1.37.59"}
zoneStrings{
"Africa:Abidjan"{
ec{"Абиджан"}

2
icu4c/source/data/zone/or.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
or{
Version{"2.1.36.86"}
Version{"2.1.37.57"}
zoneStrings{
"Africa:Abidjan"{
ec{"ଆବିଦଜାନ"}

2
icu4c/source/data/zone/ru.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
ru{
Version{"2.1.37.12"}
Version{"2.1.37.58"}
zoneStrings{
"Africa:Abidjan"{
ec{"Абиджан"}

2
icu4c/source/data/zone/th.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
th{
Version{"2.1.37.5"}
Version{"2.1.37.56"}
zoneStrings{
"Africa:Abidjan"{
ec{"อาบีจาน"}

10
icu4c/source/test/intltest/measfmttest.cpp
View file

@ -1743,12 +1743,12 @@ void MeasureFormatTest::helperTestSimplePer(
void MeasureFormatTest::TestMultiples() {
Locale ru("ru");
Locale en("en");
helperTestMultiples(en, UMEASFMT_WIDTH_WIDE, "2 miles, 1 foot, 2.3 inches");
helperTestMultiples(en, UMEASFMT_WIDTH_SHORT, "2 mi, 1 ft, 2.3 in");
helperTestMultiples(en, UMEASFMT_WIDTH_WIDE, "2 miles, 1 foot, 2.3 inches");
helperTestMultiples(en, UMEASFMT_WIDTH_SHORT, "2 mi, 1 ft, 2.3 in");
helperTestMultiples(en, UMEASFMT_WIDTH_NARROW, "2mi 1\\u2032 2.3\\u2033");
helperTestMultiples(ru, UMEASFMT_WIDTH_WIDE, "2 \\u043C\\u0438\\u043B\\u0438 1 \\u0444\\u0443\\u0442 2,3 \\u0434\\u044E\\u0439\\u043C\\u0430");
helperTestMultiples(ru, UMEASFMT_WIDTH_SHORT, "2 \\u043C\\u0438\\u043B\\u0438 1 \\u0444\\u0442 2,3 \\u0434\\u044E\\u0439\\u043C.");
helperTestMultiples(ru, UMEASFMT_WIDTH_NARROW, "2 \\u043C\\u0438\\u043B\\u044C 1 \\u0444\\u0443\\u0442 2,3 \\u0434\\u044E\\u0439\\u043C\\u0430");
helperTestMultiples(ru, UMEASFMT_WIDTH_WIDE, "2 \\u043C\\u0438\\u043B\\u0438 1 \\u0444\\u0443\\u0442 2,3 \\u0434\\u044E\\u0439\\u043C\\u0430");
helperTestMultiples(ru, UMEASFMT_WIDTH_SHORT, "2 \\u043C\\u0438\\u043B\\u0438 1 \\u0444\\u0443\\u0442 2,3 \\u0434\\u044E\\u0439\\u043C.");
helperTestMultiples(ru, UMEASFMT_WIDTH_NARROW, "2 \\u043C\\u0438\\u043B\\u044C 1 \\u0444\\u0442 2,3 \\u0434\\u044E\\u0439\\u043C\\u0430");
}
void MeasureFormatTest::helperTestMultiples(

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

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:17e174083af458b0207c36037990d413b5e5bd25476bbf6ce6e315fa1d04ba3a
size 12523914
oid sha256:31ae71be682038ec2d82a962cf84d8ad948b93405bb3f586ee8d67bb9478239c
size 12523944

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

@ -1488,8 +1488,8 @@ public class MeasureUnitTest extends TestFmwk {
{ULocale.ENGLISH, FormatWidth.SHORT, "2 mi, 1 ft, 2.3 in"},
{ULocale.ENGLISH, FormatWidth.NARROW, "2mi 1\u2032 2.3\u2033"},
{russia, FormatWidth.WIDE, "2 \u043C\u0438\u043B\u0438 1 \u0444\u0443\u0442 2,3 \u0434\u044E\u0439\u043C\u0430"},
{russia, FormatWidth.SHORT, "2 \u043C\u0438\u043B\u0438 1 \u0444\u0442 2,3 \u0434\u044E\u0439\u043C."},
{russia, FormatWidth.NARROW, "2 \u043C\u0438\u043B\u044C 1 \u0444\u0443\u0442 2,3 \u0434\u044E\u0439\u043C\u0430"},
{russia, FormatWidth.SHORT, "2 \u043C\u0438\u043B\u0438 1 \u0444\u0443\u0442 2,3 \u0434\u044E\u0439\u043C."},
{russia, FormatWidth.NARROW, "2 \u043C\u0438\u043B\u044C 1 \u0444\u0442 2,3 \u0434\u044E\u0439\u043C\u0430"},
};
for (Object[] row : data) {
MeasureFormat mf = MeasureFormat.getInstance(