Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

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

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions icu4c/source/common/ucurr.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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},
Expand Down Expand Up @@ -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},
Expand Down
1 change: 1 addition & 0 deletions icu4c/source/data/curr/LOCALE_DEPS.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
9 changes: 9 additions & 0 deletions icu4c/source/data/curr/sd_Deva_IN.txt
Original file line number Diff line number Diff line change
@@ -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 changes: 6 additions & 0 deletions icu4c/source/data/curr/sd_IN.txt
Original file line number Diff line number Diff line change
@@ -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 changes: 2 additions & 2 deletions icu4c/source/data/curr/supplementalData.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3773,8 +3773,8 @@ supplementalData:table(nofallback){
}
id{"SLL"}
to:intvector{
387,
-1778510849,
391,
974987263,
}
}
{
Expand Down
1 change: 1 addition & 0 deletions icu4c/source/data/lang/LOCALE_DEPS.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
9 changes: 9 additions & 0 deletions icu4c/source/data/lang/sd_Deva_IN.txt
Original file line number Diff line number Diff line change
@@ -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 changes: 6 additions & 0 deletions icu4c/source/data/lang/sd_IN.txt
Original file line number Diff line number Diff line change
@@ -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 change: 1 addition & 0 deletions icu4c/source/data/locales/LOCALE_DEPS.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 6 additions & 0 deletions icu4c/source/data/locales/sd_IN.txt
Original file line number Diff line number Diff line change
@@ -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 change: 1 addition & 0 deletions icu4c/source/data/region/LOCALE_DEPS.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
9 changes: 9 additions & 0 deletions icu4c/source/data/region/sd_Deva_IN.txt
Original file line number Diff line number Diff line change
@@ -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 changes: 6 additions & 0 deletions icu4c/source/data/region/sd_IN.txt
Original file line number Diff line number Diff line change
@@ -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 change: 1 addition & 0 deletions icu4c/source/data/unit/LOCALE_DEPS.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
9 changes: 9 additions & 0 deletions icu4c/source/data/unit/sd_Deva_IN.txt
Original file line number Diff line number Diff line change
@@ -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 changes: 6 additions & 0 deletions icu4c/source/data/unit/sd_IN.txt
Original file line number Diff line number Diff line change
@@ -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 change: 1 addition & 0 deletions icu4c/source/data/zone/LOCALE_DEPS.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
9 changes: 9 additions & 0 deletions icu4c/source/data/zone/sd_Deva_IN.txt
Original file line number Diff line number Diff line change
@@ -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 changes: 6 additions & 0 deletions icu4c/source/data/zone/sd_IN.txt
Original file line number Diff line number Diff line change
@@ -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 changes: 12 additions & 0 deletions icu4c/source/test/cintltst/currtest.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
24 changes: 24 additions & 0 deletions icu4c/source/test/testdata/structLocale.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1224,6 +1224,10 @@ structLocale:table(nofallback){
"",
"",
}
SLE{
"",
"",
}
SLL{
"",
"",
Expand Down Expand Up @@ -1372,6 +1376,10 @@ structLocale:table(nofallback){
"",
"",
}
VED{
"",
"",
}
VEF{
"",
"",
Expand Down Expand Up @@ -3426,6 +3434,14 @@ structLocale:table(nofallback){
many{""}
other{""}
}
SLE{
zero{""}
one{""}
two{""}
few{""}
many{""}
other{""}
}
SLL{
zero{""}
one{""}
Expand Down Expand Up @@ -3706,6 +3722,14 @@ structLocale:table(nofallback){
many{""}
other{""}
}
VED{
zero{""}
one{""}
two{""}
few{""}
many{""}
other{""}
}
VEF{
zero{""}
one{""}
Expand Down
4 changes: 2 additions & 2 deletions icu4j/main/shared/data/icudata.jar
Git LFS file not shown
4 changes: 2 additions & 2 deletions icu4j/main/shared/data/icutzdata.jar
Git LFS file not shown
4 changes: 2 additions & 2 deletions icu4j/main/shared/data/testdata.jar
Git LFS file not shown
Original file line number Diff line number Diff line change
Expand Up @@ -581,6 +581,8 @@ public void TestFullCurrencyList() {
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
Expand Down
4 changes: 2 additions & 2 deletions tools/cldr/cldr-to-icu/build-icu-data.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion tools/cldr/cldr-to-icu/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down