Skip to content

Commit 2c584ab

Browse files
pedberg-icupedberg-icu
committed
ICU-22221 rebase CLDR 43-beta4 import onto latest maint/maint-73 (new zoneinfo64)
1 parent c125cf6 commit 2c584ab

1,072 files changed

Lines changed: 332 additions & 12 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎icu4c/source/data/locales/root.txt‎

Lines changed: 319 additions & 0 deletions
Large diffs are not rendered by default.

‎icu4c/source/data/misc/keyTypeData.txt‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,6 @@ keyTypeData:table(nofallback){
7272
co{
7373
direct{"true"}
7474
}
75-
tz{
76-
camtr{"true"}
77-
}
7875
}
7976
}
8077
typeMap{

‎icu4c/source/data/misc/supplementalData.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11414,6 +11414,7 @@ supplementalData:table(nofallback){
1141411414
"cnzzzz",
1141511415
"cozzzz",
1141611416
"cpzzzz",
11417+
"cqzzzz",
1141711418
"crzzzz",
1141811419
"cuzzzz",
1141911420
"cvzzzz",

‎icu4c/source/data/misc/timezoneTypes.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ timezoneTypes:table(nofallback){
55
bcpTypeAlias{
66
tz{
77
aqams{"nzakl"}
8+
camtr{"cator"}
89
cnckg{"cnsha"}
910
cnhrb{"cnsha"}
1011
cnkhg{"cnurc"}
@@ -29,6 +30,7 @@ timezoneTypes:table(nofallback){
2930
"America:Indiana:Indianapolis"{"America/Indianapolis"}
3031
"America:Kentucky:Louisville"{"America/Louisville"}
3132
"America:Knox_IN"{"America/Indiana/Knox"}
33+
"America:Montreal"{"America/Toronto"}
3234
"America:Nuuk"{"America/Godthab"}
3335
"America:Porto_Acre"{"America/Rio_Branco"}
3436
"America:Rosario"{"America/Cordoba"}
@@ -302,7 +304,6 @@ timezoneTypes:table(nofallback){
302304
"America:Moncton"{"camon"}
303305
"America:Monterrey"{"mxmty"}
304306
"America:Montevideo"{"uymvd"}
305-
"America:Montreal"{"camtr"}
306307
"America:Montserrat"{"msmni"}
307308
"America:Nassau"{"bsnas"}
308309
"America:New_York"{"usnyc"}

‎icu4j/main/shared/data/icudata.jar‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:d024374d3e1315741827c0468e0a99376c3287753ba97b92f781b7668663351f
3-
size 14329363
2+
oid sha256:ed002e6f698efb2b50ad0e1d874783c7d2fe151f82793e6d417761420de7fb95
3+
size 14330665

‎icu4j/main/shared/data/icutzdata.jar‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:9b7897753faf79bc321552015ac030fcec3199a8401a4b79a70e6bde0d27a818
3-
size 94828
2+
oid sha256:bef04215beaf1d2b59249d9c13489509321d49838a40b50d503987b3147a020a
3+
size 94829

‎icu4j/main/shared/data/testdata.jar‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:108571f2b1f96cc6da00a0eaf32855cb121c418c34c00c8c911185dfeb5f70ac
3-
size 834588
2+
oid sha256:40002d4d7cdc81c4c1ca9ade3da22596b7e56b5c6b997c4ebc254b403bb8020d
3+
size 831605

‎icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/TestLocaleValidity.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@ public void testBasic() {
9090
{"OK", "en-u-ss-none"},
9191
{"OK", "en-t-t0-und"},
9292
{"OK", "en-t-x0-12345678"},
93+
{"OK", "en-u-tz-camtr"}, // CLDR 43 no longer deprecated, see CLDR-16489
94+
9395

9496
// tests from LDML spec section on Hybrid Locale Identifiers
9597
{"OK", "hi-t-en-h0-hybrid"},
@@ -179,7 +181,7 @@ public void testBasic() {
179181
//{"{u, ca-civil}", "en-u-ca-islamicc"}, // deprecated, but turns into valid
180182
{"{u, co-direct}", "en-u-co-direct"}, // deprecated
181183
{"{u, kh}", "en-u-kh-false"}, // deprecated
182-
{"{u, tz-camtr}", "en-u-tz-camtr"}, // deprecated
184+
//{"{u, tz-camtr}", "en-u-tz-camtr"}, // CLDR 43 no longer deprecated, see CLDR-16489
183185
{"{u, vt}", "en-u-vt-0020-0041"}, // deprecated
184186
};
185187
final LinkedHashSet<String> foundKeys = new LinkedHashSet<String>();

‎icu4j/maven-build/maven-icu4j-datafiles/src/main/resources/com/ibm/icu/impl/data/icudt73b/af.res‎

0 Bytes
Binary file not shown.

‎icu4j/maven-build/maven-icu4j-datafiles/src/main/resources/com/ibm/icu/impl/data/icudt73b/af_NA.res‎

0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)