organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-06 14:05:32 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 8

ICU-21958 integrate CLDR release-42-beta2 to ICU main for 72

Browse source
This commit is contained in:
Peter Edberg 2022-09-28 22:01:22 -07:00 • committed by Peter Edberg
parent e72233f8b7
commit 49b08b414d
27 changed files with 138 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
icu4c/source/common/ucurr.cpp
View file

@ -1951,6 +1951,7 @@ static const struct CurrencyList {
{"SHP", UCURR_COMMON|UCURR_NON_DEPRECATED},
{"SIT", UCURR_COMMON|UCURR_DEPRECATED},
{"SKK", UCURR_COMMON|UCURR_DEPRECATED},
{"SLE", UCURR_COMMON|UCURR_NON_DEPRECATED},
{"SLL", UCURR_COMMON|UCURR_NON_DEPRECATED},
{"SOS", UCURR_COMMON|UCURR_NON_DEPRECATED},
{"SRD", UCURR_COMMON|UCURR_NON_DEPRECATED},
@ -1988,6 +1989,7 @@ static const struct CurrencyList {
{"UYW", UCURR_UNCOMMON|UCURR_NON_DEPRECATED},
{"UZS", UCURR_COMMON|UCURR_NON_DEPRECATED},
{"VEB", UCURR_COMMON|UCURR_DEPRECATED},
{"VED", UCURR_UNCOMMON|UCURR_NON_DEPRECATED},
{"VEF", UCURR_COMMON|UCURR_NON_DEPRECATED},
{"VES", UCURR_COMMON|UCURR_NON_DEPRECATED},
{"VND", UCURR_COMMON|UCURR_NON_DEPRECATED},

1
icu4c/source/data/curr/LOCALE_DEPS.json
View file

@ -26,6 +26,7 @@
"pa_IN": "pa_Guru_IN",
"pa_PK": "pa_Arab_PK",
"sat_IN": "sat_Olck_IN",
"sd_IN": "sd_Deva_IN",
"sd_PK": "sd_Arab_PK",
"sh": "sr_Latn",
"sh_BA": "sr_Latn_BA",

9
icu4c/source/data/curr/sd_Deva_IN.txt Normal file
View file

@ -0,0 +1,9 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml
/**
* generated alias target
*/
sd_Deva_IN{
___{""}
}

6
icu4c/source/data/curr/sd_IN.txt Normal file
View file

@ -0,0 +1,6 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml
sd_IN{
"%%ALIAS"{"sd_Deva_IN"}
}

4
icu4c/source/data/curr/supplementalData.txt
View file

@ -3773,8 +3773,8 @@ supplementalData:table(nofallback){
}
id{"SLL"}
to:intvector{
387,
-1778510849,
391,
974987263,
}
}
{

1
icu4c/source/data/lang/LOCALE_DEPS.json
View file

@ -26,6 +26,7 @@
"pa_IN": "pa_Guru_IN",
"pa_PK": "pa_Arab_PK",
"sat_IN": "sat_Olck_IN",
"sd_IN": "sd_Deva_IN",
"sd_PK": "sd_Arab_PK",
"sh": "sr_Latn",
"sh_BA": "sr_Latn_BA",

9
icu4c/source/data/lang/sd_Deva_IN.txt Normal file
View file

@ -0,0 +1,9 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml
/**
* generated alias target
*/
sd_Deva_IN{
___{""}
}

6
icu4c/source/data/lang/sd_IN.txt Normal file
View file

@ -0,0 +1,6 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml
sd_IN{
"%%ALIAS"{"sd_Deva_IN"}
}

1
icu4c/source/data/locales/LOCALE_DEPS.json
View file

@ -26,6 +26,7 @@
"pa_IN": "pa_Guru_IN",
"pa_PK": "pa_Arab_PK",
"sat_IN": "sat_Olck_IN",
"sd_IN": "sd_Deva_IN",
"sd_PK": "sd_Arab_PK",
"sh": "sr_Latn",
"sh_BA": "sr_Latn_BA",

6
icu4c/source/data/locales/sd_IN.txt Normal file
View file

@ -0,0 +1,6 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml
sd_IN{
"%%ALIAS"{"sd_Deva_IN"}
}

1
icu4c/source/data/region/LOCALE_DEPS.json
View file

@ -26,6 +26,7 @@
"pa_IN": "pa_Guru_IN",
"pa_PK": "pa_Arab_PK",
"sat_IN": "sat_Olck_IN",
"sd_IN": "sd_Deva_IN",
"sd_PK": "sd_Arab_PK",
"sh": "sr_Latn",
"sh_BA": "sr_Latn_BA",

9
icu4c/source/data/region/sd_Deva_IN.txt Normal file
View file

@ -0,0 +1,9 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml
/**
* generated alias target
*/
sd_Deva_IN{
___{""}
}

6
icu4c/source/data/region/sd_IN.txt Normal file
View file

@ -0,0 +1,6 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml
sd_IN{
"%%ALIAS"{"sd_Deva_IN"}
}

1
icu4c/source/data/unit/LOCALE_DEPS.json
View file

@ -26,6 +26,7 @@
"pa_IN": "pa_Guru_IN",
"pa_PK": "pa_Arab_PK",
"sat_IN": "sat_Olck_IN",
"sd_IN": "sd_Deva_IN",
"sd_PK": "sd_Arab_PK",
"sh": "sr_Latn",
"sh_BA": "sr_Latn_BA",

9
icu4c/source/data/unit/sd_Deva_IN.txt Normal file
View file

@ -0,0 +1,9 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml
/**
* generated alias target
*/
sd_Deva_IN{
___{""}
}

6
icu4c/source/data/unit/sd_IN.txt Normal file
View file

@ -0,0 +1,6 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml
sd_IN{
"%%ALIAS"{"sd_Deva_IN"}
}

1
icu4c/source/data/zone/LOCALE_DEPS.json
View file

@ -26,6 +26,7 @@
"pa_IN": "pa_Guru_IN",
"pa_PK": "pa_Arab_PK",
"sat_IN": "sat_Olck_IN",
"sd_IN": "sd_Deva_IN",
"sd_PK": "sd_Arab_PK",
"sh": "sr_Latn",
"sh_BA": "sr_Latn_BA",

9
icu4c/source/data/zone/sd_Deva_IN.txt Normal file
View file

@ -0,0 +1,9 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml
/**
* generated alias target
*/
sd_Deva_IN{
___{""}
}

6
icu4c/source/data/zone/sd_IN.txt Normal file
View file

@ -0,0 +1,6 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml
sd_IN{
"%%ALIAS"{"sd_Deva_IN"}
}

12
icu4c/source/test/cintltst/currtest.c
View file

@ -100,6 +100,18 @@ static void TestEnumList(void) {
expectInList("VES", UCURR_DEPRECATED, false);
expectInList("VES", UCURR_NON_DEPRECATED, true);
// CLDR 41/42 and ICU-21989
expectInList("SLE", UCURR_ALL, true);
expectInList("SLE", UCURR_COMMON, true);
expectInList("SLE", UCURR_UNCOMMON, false);
expectInList("SLE", UCURR_DEPRECATED, false);
expectInList("SLE", UCURR_NON_DEPRECATED, true);
expectInList("VED", UCURR_ALL, true);
expectInList("VED", UCURR_COMMON, false);
expectInList("VED", UCURR_UNCOMMON, true);
expectInList("VED", UCURR_DEPRECATED, false);
expectInList("VED", UCURR_NON_DEPRECATED, true);
expectInList("EQE", UCURR_ALL, false);
}

24
icu4c/source/test/testdata/structLocale.txt vendored
View file

@ -1224,6 +1224,10 @@ structLocale:table(nofallback){
"",
"",
}
SLE{
"",
"",
}
SLL{
"",
"",
@ -1372,6 +1376,10 @@ structLocale:table(nofallback){
"",
"",
}
VED{
"",
"",
}
VEF{
"",
"",
@ -3426,6 +3434,14 @@ structLocale:table(nofallback){
many{""}
other{""}
}
SLE{
zero{""}
one{""}
two{""}
few{""}
many{""}
other{""}
}
SLL{
zero{""}
one{""}
@ -3706,6 +3722,14 @@ structLocale:table(nofallback){
many{""}
other{""}
}
VED{
zero{""}
one{""}
two{""}
few{""}
many{""}
other{""}
}
VEF{
zero{""}
one{""}

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

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1594af096f99faaf76d3abe43cdcd184353e84393e79291f627cd4ee7e47ce90
size 14172480
oid sha256:3b7e959e388ceba2b8aa6a79538c2388dcb0ae71f69a88f8ad04e4617de7b4ff
size 14175301

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

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0c9c125e295e374521b2f9865e398a6deb8a3a42609a3a3da7dc98c495bd0dea
size 93665
oid sha256:62a8ceb5018bdd501e36b5c6394a4dbddd5466d478212840b0e49c29195a271b
size 93663

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

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a522856180aa25c87c818fadca9b85cf64463204190f3280a76bbf1e83ed8b38
size 831602
oid sha256:d8b0293d70546082fe73736372220a630012c3a622d75bf7c096d5a5e74cf6e8
size 831605

2
icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/CurrencyTest.java
View file

@ -581,6 +581,8 @@ public class CurrencyTest extends TestFmwk {
assertTrue("Full currencies list should include UYW", currencies.contains("UYW")); // ICU-21622
assertTrue("Full currencies list should include VES", currencies.contains("VES")); // ICU-21685
assertFalse("Full currencies list should not include EQE", currencies.contains("EQE")); // ICU-21685
assertTrue("Full currencies list should include SLE", currencies.contains("SLE")); // CLDR 41/42, ICU-21989
assertTrue("Full currencies list should include VED", currencies.contains("VED")); // CLDR 41, ICU-21989
}
// Coverage-only test of the CurrencyMetaInfo class

4
tools/cldr/cldr-to-icu/build-icu-data.xml
View file

@ -234,7 +234,7 @@
raj, rm, rn, ro, rof, ru, rw, rwk
// S
sa, sah, saq, sat, sat_IN, sbp, sc, sd, sd_Deva, sd_PK, se, seh, ses, sg, sh, sh_BA, sh_CS, sh_YU
sa, sah, saq, sat, sat_IN, sbp, sc, sd, sd_Deva, sd_IN, sd_PK, se, seh, ses, sg, sh, sh_BA, sh_CS, sh_YU
shi, shi_Latn, shi_MA, si, sk, sl, smn, sn, so, sq, sr, sr_BA, sr_CS, sr_Cyrl_CS, sr_Cyrl_YU, sr_Latn
sr_Latn_CS, sr_Latn_YU, sr_ME, sr_RS, sr_XK, sr_YU, su, su_ID, sv, sw
@ -356,7 +356,7 @@
<directory dir="brkitr" inheritLanguageSubtag="zh_Hant">
<localeIds>
root,
de, el, en, en_US_POSIX, en_US, es, fr, it, ja, pt, ru, zh_Hant, zh
de, el, en, en_US_POSIX, en_US, es, fi, fr, it, ja, pt, ru, sv, zh_Hant, zh
</localeIds>
</directory>

2
tools/cldr/cldr-to-icu/pom.xml
View file

@ -83,7 +83,7 @@
<dependency>
<groupId>com.ibm.icu</groupId>
<artifactId>icu4j-for-cldr</artifactId>
<version>72.0.1-SNAPSHOT-cldr-2022-09-12</version>
<version>72.1-SNAPSHOT-release-72-rc</version>
<!-- Note: see https://github.com/unicode-org/icu/packages/411079/versions
for the icu4j-for-cldr version tag to use -->
</dependency>