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

ICU-13359 Integrate updated CLDR 32 @13743; still have known issues #13366,#13368,#13374

Browse source 
X-SVN-Rev: 40483
This commit is contained in:
Peter Edberg 2017-09-27 19:19:19 +00:00
parent da416aaf80
commit 269d74b759
18 changed files with 75 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1808,5 +1808,5 @@ ccp{
other{"𑄎𑄟𑄴𑄝𑄨𑄠𑄚𑄴 𑄇𑄧𑄤𑄌"}
}
}
Version{"2.1.37.29"}
Version{"2.1.37.43"}
}

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

@ -2125,5 +2125,5 @@ zh{
CurrencyUnitPatterns{
other{"{0}{1}"}
}
Version{"2.1.37.33"}
Version{"2.1.37.42"}
}

6
icu4c/source/data/lang/ccp.txt
View file

@ -86,7 +86,7 @@ ccp{
cad{"𑄇𑄳𑄠𑄓𑄮"}
car{"𑄝𑄳𑄠𑄢𑄨𑄛𑄴"}
cch{"𑄃𑄖𑄴𑄥𑄟𑄴"}
ccp{"𑄌𑄋𑄴𑄟"}
ccp{"𑄌𑄋𑄴𑄟𑄳𑄦"}
ce{"𑄌𑄬𑄌𑄬𑄚𑄴"}
ceb{"𑄌𑄬𑄝𑄪𑄠𑄚𑄮"}
cgg{"𑄌𑄨𑄉"}
@ -564,7 +564,7 @@ ccp{
Brai{"𑄝𑄳𑄢𑄳𑄆𑄬𑄣𑄴"}
Bugi{"𑄝𑄪𑄉𑄨"}
Buhd{"𑄝𑄪𑄦𑄨𑄓𑄴"}
Cakm{"𑄌𑄇𑄴𑄟"}
Cakm{"𑄌𑄋𑄴𑄟𑄳𑄦"}
Cans{"𑄎𑄧𑄙 𑄇𑄚𑄓𑄨𑄠𑄚𑄴 𑄃𑄳𑄠𑄝𑄳𑄢𑄮𑄎𑄨𑄚𑄨𑄠𑄚𑄴 𑄥𑄨𑄣𑄬𑄝𑄨𑄇𑄴𑄥𑄧"}
Cari{"𑄇𑄳𑄠𑄢𑄨𑄠𑄚𑄴"}
Cham{"𑄌𑄳𑄠𑄟𑄴"}
@ -833,7 +833,7 @@ ccp{
vaii{"𑄞𑄭 𑄚𑄘"}
}
}
Version{"2.1.37.29"}
Version{"2.1.37.43"}
characterLabelPattern{
all{"{0} — 𑄗𑄪𑄟𑄴"}
category-list{"{0}: {1}"}

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

@ -978,7 +978,7 @@ zh{
VALLADER{"瑞士瓦勒德方言"}
WADEGILE{"WG 威氏拼音法"}
}
Version{"2.1.37.33"}
Version{"2.1.37.42"}
characterLabelPattern{
all{"{0} — 全部"}
category-list{"{0}: {1}"}

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

@ -71,7 +71,7 @@ ccp{
minimumGroupingDigits{"1"}
native{"cakm"}
}
Version{"2.1.37.29"}
Version{"2.1.37.43"}
calendar{
generic{
DateTimePatterns{

40
icu4c/source/data/locales/zh.txt
View file

@ -825,7 +825,7 @@ zh{
}
}
}
Version{"2.1.37.33"}
Version{"2.1.37.42"}
calendar{
buddhist{
DateTimePatterns{
@ -1393,11 +1393,11 @@ zh{
"Gy年M月d日",
"Gy年M月d日",
"Gy/M/d",
"{1}{0}",
"{1}{0}",
"{1} {0}",
"{1}{0}",
"{1}{0}",
"{1} {0}",
"{1} {0}",
"{1} {0}",
"{1} {0}",
}
eras{
abbreviated{
@ -1760,11 +1760,11 @@ zh{
"Gy年M月d日",
"Gy年M月d日",
"Gy/M/d",
"{1}{0}",
"{1}{0}",
"{1} {0}",
"{1}{0}",
"{1}{0}",
"{1} {0}",
"{1} {0}",
"{1} {0}",
"{1} {0}",
}
eras{
wide{
@ -1886,11 +1886,11 @@ zh{
"Gy年M月d日",
"Gy年M月d日",
"Gy/M/d",
"{1}{0}",
"{1}{0}",
"{1} {0}",
"{1}{0}",
"{1}{0}",
"{1} {0}",
"{1} {0}",
"{1} {0}",
"{1} {0}",
}
availableFormats{
Bh{"Bh时"}
@ -2053,10 +2053,10 @@ zh{
"y年M月d日",
"y年M月d日",
"y/M/d",
"{1}{0}",
"{1}{0}",
"{1} {0}",
"{1}{0}",
"{1} {0}",
"{1} {0}",
"{1} {0}",
"{1} {0}",
}
appendItems{
@ -3004,11 +3004,11 @@ zh{
"Gy年M月d日",
"Gy年M月d日",
"Gy/M/d",
"{1}{0}",
"{1}{0}",
"{1} {0}",
"{1}{0}",
"{1}{0}",
"{1} {0}",
"{1} {0}",
"{1} {0}",
"{1} {0}",
}
availableFormats{
M{"M月"}

22
icu4c/source/data/locales/zh_Hans_HK.txt
View file

@ -90,11 +90,11 @@ zh_Hans_HK{
"Gy年M月d日",
"Gy年M月d日",
"d/M/yyGGGGG",
"{1}{0}",
"{1}{0}",
"{1} {0}",
"{1}{0}",
"{1}{0}",
"{1} {0}",
"{1} {0}",
"{1} {0}",
"{1} {0}",
}
availableFormats{
HHmm{"HH:mm"}
@ -146,10 +146,10 @@ zh_Hans_HK{
"y年M月d日",
"y年M月d日",
"d/M/yy",
"{1}{0}",
"{1}{0}",
"{1} {0}",
"{1}{0}",
"{1} {0}",
"{1} {0}",
"{1} {0}",
"{1} {0}",
}
availableFormats{
@ -203,11 +203,11 @@ zh_Hans_HK{
"Gy年M月d日",
"Gy年M月d日",
"Gd/M/yy",
"{1}{0}",
"{1}{0}",
"{1} {0}",
"{1}{0}",
"{1}{0}",
"{1} {0}",
"{1} {0}",
"{1} {0}",
"{1} {0}",
}
}
japanese{

22
icu4c/source/data/locales/zh_Hans_MO.txt
View file

@ -39,11 +39,11 @@ zh_Hans_MO{
"Gy年M月d日",
"Gy年M月d日",
"d/M/yyGGGGG",
"{1}{0}",
"{1}{0}",
"{1} {0}",
"{1}{0}",
"{1}{0}",
"{1} {0}",
"{1} {0}",
"{1} {0}",
"{1} {0}",
}
availableFormats{
MEd{"M-dE"}
@ -101,10 +101,10 @@ zh_Hans_MO{
"y年M月d日",
"y年M月d日",
"d/M/yy",
"{1}{0}",
"{1}{0}",
"{1} {0}",
"{1}{0}",
"{1} {0}",
"{1} {0}",
"{1} {0}",
"{1} {0}",
}
availableFormats{
@ -166,11 +166,11 @@ zh_Hans_MO{
"Gy年M月d日",
"Gy年M月d日",
"Gd/M/yy",
"{1}{0}",
"{1}{0}",
"{1} {0}",
"{1}{0}",
"{1}{0}",
"{1} {0}",
"{1} {0}",
"{1} {0}",
"{1} {0}",
}
}
roc{

22
icu4c/source/data/locales/zh_Hans_SG.txt
View file

@ -56,11 +56,11 @@ zh_Hans_SG{
"Gy年M月d日",
"Gy年M月d日",
"dd/MM/yyGGGGG",
"{1}{0}",
"{1}{0}",
"{1} {0}",
"{1}{0}",
"{1}{0}",
"{1} {0}",
"{1} {0}",
"{1} {0}",
"{1} {0}",
}
availableFormats{
MEd{"M-dE"}
@ -115,10 +115,10 @@ zh_Hans_SG{
"y年M月d日",
"y年M月d日",
"dd/MM/yy",
"{1}{0}",
"{1}{0}",
"{1} {0}",
"{1}{0}",
"{1} {0}",
"{1} {0}",
"{1} {0}",
"{1} {0}",
}
availableFormats{
@ -178,11 +178,11 @@ zh_Hans_SG{
"Gy年M月d日",
"Gy年M月d日",
"Gd/M/yy",
"{1}{0}",
"{1}{0}",
"{1} {0}",
"{1}{0}",
"{1}{0}",
"{1} {0}",
"{1} {0}",
"{1} {0}",
"{1} {0}",
}
}
japanese{

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

@ -322,5 +322,5 @@ ccp{
MK{"𑄟𑄬𑄥𑄨𑄓𑄮𑄚𑄠(FYROM)"}
TL{"𑄛𑄪𑄉𑄮 𑄖𑄨𑄟𑄪𑄢𑄴"}
}
Version{"2.1.37.29"}
Version{"2.1.37.43"}
}

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

@ -310,5 +310,5 @@ zh{
FK{"福克兰群岛（马尔维纳斯群岛）"}
MK{"马其顿（前南斯拉夫马其顿共和国）"}
}
Version{"2.1.37.33"}
Version{"2.1.37.42"}
}

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

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

2
icu4c/source/data/zone/ccp.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
ccp{
Version{"2.1.37.29"}
Version{"2.1.37.43"}
zoneStrings{
"Africa:Abidjan"{
ec{"𑄃𑄝𑄨𑄘𑄴𑄎𑄚𑄴"}

2
icu4c/source/data/zone/zh.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
zh{
Version{"2.1.37.33"}
Version{"2.1.37.42"}
zoneStrings{
"Africa:Abidjan"{
ec{"阿比让"}

6
icu4c/source/test/intltest/dtifmtts.cpp
View file

@ -827,7 +827,7 @@ void DateIntervalFormatTest::testFormat() {
"zh", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "MMMMy", "2007\\u5e7410\\u6708\\u81f311\\u6708",
"zh", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "hmv", "2007/10/10\\u6D1B\\u6749\\u77F6\\u65F6\\u95F4 \\u4E0A\\u534810:10 \\u2013 2007/11/10\\u6D1B\\u6749\\u77F6\\u65F6\\u95F4 \\u4E0A\\u534810:10",
"zh", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "hmv", "2007/10/10 \\u6D1B\\u6749\\u77F6\\u65F6\\u95F4 \\u4E0A\\u534810:10 \\u2013 2007/11/10 \\u6D1B\\u6749\\u77F6\\u65F6\\u95F4 \\u4E0A\\u534810:10",
"zh", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "EEEEdMMMMy", "2007\\u5e7411\\u670810\\u65e5\\u661f\\u671f\\u516d\\u81f320\\u65e5\\u661f\\u671f\\u4e8c",
@ -856,9 +856,9 @@ void DateIntervalFormatTest::testFormat() {
"zh", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "MMM", "11\\u6708", // (fixed expected result per ticket:6626: and others)
"zh", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "hmz", "2007/11/10GMT-8 \\u4e0a\\u534810:10 \\u2013 2007/11/20GMT-8 \\u4e0a\\u534810:10",
"zh", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "hmz", "2007/11/10 GMT-8 \\u4e0a\\u534810:10 \\u2013 2007/11/20 GMT-8 \\u4e0a\\u534810:10",
"zh", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "h", "2007/11/10\\u4e0a\\u534810\\u65f6 \\u2013 2007/11/20\\u4e0a\\u534810\\u65f6",
"zh", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "h", "2007/11/10 \\u4e0a\\u534810\\u65f6 \\u2013 2007/11/20 \\u4e0a\\u534810\\u65f6",
"zh", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "EEEEdMMMMy", "2007\\u5e741\\u670810\\u65e5\\u661f\\u671f\\u4e09", // (fixed expected result per ticket:6626:)

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

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cd87b0fd3ad710e360f837634c6dcd486a0dba93cf3e4e85dd8c322c0f78f83e
size 12525481
oid sha256:51415ea07a660b3ed68de8bcaaf30ec6afc8b045b1093d76f04294d7f68dba63
size 12523451

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

@ -426,7 +426,7 @@ public class DateIntervalFormatTest extends TestFmwk {
"zh", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "EEEEdMMMMy", "2007\\u5e7410\\u670810\\u65e5\\u661f\\u671f\\u4e09\\u81f32008\\u5e7410\\u670810\\u65e5\\u661f\\u671f\\u4e94",
"zh", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "hm", "2007/10/10\\u4e0a\\u534810:10 \\u2013 2008/10/10\\u4e0a\\u534810:10",
"zh", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "hm", "2007/10/10 \\u4e0a\\u534810:10 \\u2013 2008/10/10 \\u4e0a\\u534810:10",
"zh", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "dMMMMy", "2007\\u5e7410\\u670810\\u65e5\\u81f311\\u670810\\u65e5",
@ -436,7 +436,7 @@ public class DateIntervalFormatTest extends TestFmwk {
"zh", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "EEEEdMMMM", "10\\u670810\\u65e5\\u661f\\u671f\\u4e09\\u81f311\\u670810\\u65e5\\u661f\\u671f\\u516d",
"zh", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "hmv", "2007/10/10\\u6D1B\\u6749\\u77F6\\u65F6\\u95F4 \\u4E0A\\u534810:10 \\u2013 2007/11/10\\u6D1B\\u6749\\u77F6\\u65F6\\u95F4 \\u4E0A\\u534810:10",
"zh", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "hmv", "2007/10/10 \\u6D1B\\u6749\\u77F6\\u65F6\\u95F4 \\u4E0A\\u534810:10 \\u2013 2007/11/10 \\u6D1B\\u6749\\u77F6\\u65F6\\u95F4 \\u4E0A\\u534810:10",
"zh", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "EEEEdMMMMy", "2007\\u5e7411\\u670810\\u65e5\\u661f\\u671f\\u516d\\u81f320\\u65e5\\u661f\\u671f\\u4e8c",
@ -469,9 +469,9 @@ public class DateIntervalFormatTest extends TestFmwk {
"zh", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "MMMM", "\\u5341\\u4E00\\u6708", // (fixed expected result per ticket 6872<-6626 and others)
"zh", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "hmz", "2007/11/10GMT-8 \\u4e0a\\u534810:10 \\u2013 2007/11/20GMT-8 \\u4e0a\\u534810:10",
"zh", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "hmz", "2007/11/10 GMT-8 \\u4e0a\\u534810:10 \\u2013 2007/11/20 GMT-8 \\u4e0a\\u534810:10",
"zh", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "h", "2007/11/10\\u4e0a\\u534810\\u65f6 \\u2013 2007/11/20\\u4e0a\\u534810\\u65f6",
"zh", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "h", "2007/11/10 \\u4e0a\\u534810\\u65f6 \\u2013 2007/11/20 \\u4e0a\\u534810\\u65f6",
"zh", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "EEEEdMMMMy", "2007\\u5e741\\u670810\\u65e5\\u661f\\u671f\\u4e09", // (fixed expected result per ticket 6872<-6626)