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

diff --git a/icu4c/source/common/ucurr.cpp b/icu4c/source/common/ucurr.cpp
index 30c48b15bc4ab6c50b3a76ed01af803ba65e173a..928d049fb55e735a3108af33b4ea0ed5cf31dc8e 100644 (file)
--- a/icu4c/source/common/ucurr.cpp
+++ b/icu4c/source/common/ucurr.cpp
@@ -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},

diff --git a/icu4c/source/data/curr/LOCALE_DEPS.json b/icu4c/source/data/curr/LOCALE_DEPS.json
index b0667cbdf0a550b89089684a05d049c35f331f44..ff035c95a707543e4a38c44cde5f45024bc77862 100644 (file)
--- a/icu4c/source/data/curr/LOCALE_DEPS.json
+++ b/icu4c/source/data/curr/LOCALE_DEPS.json
@@ -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",

diff --git a/icu4c/source/data/curr/sd_Deva_IN.txt b/icu4c/source/data/curr/sd_Deva_IN.txt
new file mode 100644 (file)
index 0000000..09ee30c
--- /dev/null
+++ b/icu4c/source/data/curr/sd_Deva_IN.txt
@@ -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{
+    ___{""}
+}

diff --git a/icu4c/source/data/curr/sd_IN.txt b/icu4c/source/data/curr/sd_IN.txt
new file mode 100644 (file)
index 0000000..40c1064
--- /dev/null
+++ b/icu4c/source/data/curr/sd_IN.txt
@@ -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"}
+}

diff --git a/icu4c/source/data/curr/supplementalData.txt b/icu4c/source/data/curr/supplementalData.txt
index 6e87296a39e2b9ec118d401089a16cb4082d748d..02b31f1d9c6e0728a5d6c4cc69ae4054810b21bc 100644 (file)
--- a/icu4c/source/data/curr/supplementalData.txt
+++ b/icu4c/source/data/curr/supplementalData.txt
@@ -3773,8 +3773,8 @@ supplementalData:table(nofallback){
                 }
                 id{"SLL"}
                 to:intvector{
-                    387,
-                    -1778510849,
+                    391,
+                    974987263,
                 }
             }
             {

diff --git a/icu4c/source/data/lang/LOCALE_DEPS.json b/icu4c/source/data/lang/LOCALE_DEPS.json
index b0667cbdf0a550b89089684a05d049c35f331f44..ff035c95a707543e4a38c44cde5f45024bc77862 100644 (file)
--- a/icu4c/source/data/lang/LOCALE_DEPS.json
+++ b/icu4c/source/data/lang/LOCALE_DEPS.json
@@ -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",

diff --git a/icu4c/source/data/lang/sd_Deva_IN.txt b/icu4c/source/data/lang/sd_Deva_IN.txt
new file mode 100644 (file)
index 0000000..09ee30c
--- /dev/null
+++ b/icu4c/source/data/lang/sd_Deva_IN.txt
@@ -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{
+    ___{""}
+}

diff --git a/icu4c/source/data/lang/sd_IN.txt b/icu4c/source/data/lang/sd_IN.txt
new file mode 100644 (file)
index 0000000..40c1064
--- /dev/null
+++ b/icu4c/source/data/lang/sd_IN.txt
@@ -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"}
+}

diff --git a/icu4c/source/data/locales/LOCALE_DEPS.json b/icu4c/source/data/locales/LOCALE_DEPS.json
index b0667cbdf0a550b89089684a05d049c35f331f44..ff035c95a707543e4a38c44cde5f45024bc77862 100644 (file)
--- a/icu4c/source/data/locales/LOCALE_DEPS.json
+++ b/icu4c/source/data/locales/LOCALE_DEPS.json
@@ -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",

diff --git a/icu4c/source/data/locales/sd_IN.txt b/icu4c/source/data/locales/sd_IN.txt
new file mode 100644 (file)
index 0000000..40c1064
--- /dev/null
+++ b/icu4c/source/data/locales/sd_IN.txt
@@ -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"}
+}

diff --git a/icu4c/source/data/region/LOCALE_DEPS.json b/icu4c/source/data/region/LOCALE_DEPS.json
index b0667cbdf0a550b89089684a05d049c35f331f44..ff035c95a707543e4a38c44cde5f45024bc77862 100644 (file)
--- a/icu4c/source/data/region/LOCALE_DEPS.json
+++ b/icu4c/source/data/region/LOCALE_DEPS.json
@@ -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",

diff --git a/icu4c/source/data/region/sd_Deva_IN.txt b/icu4c/source/data/region/sd_Deva_IN.txt
new file mode 100644 (file)
index 0000000..09ee30c
--- /dev/null
+++ b/icu4c/source/data/region/sd_Deva_IN.txt
@@ -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{
+    ___{""}
+}

diff --git a/icu4c/source/data/region/sd_IN.txt b/icu4c/source/data/region/sd_IN.txt
new file mode 100644 (file)
index 0000000..40c1064
--- /dev/null
+++ b/icu4c/source/data/region/sd_IN.txt
@@ -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"}
+}

diff --git a/icu4c/source/data/unit/LOCALE_DEPS.json b/icu4c/source/data/unit/LOCALE_DEPS.json
index b0667cbdf0a550b89089684a05d049c35f331f44..ff035c95a707543e4a38c44cde5f45024bc77862 100644 (file)
--- a/icu4c/source/data/unit/LOCALE_DEPS.json
+++ b/icu4c/source/data/unit/LOCALE_DEPS.json
@@ -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",

diff --git a/icu4c/source/data/unit/sd_Deva_IN.txt b/icu4c/source/data/unit/sd_Deva_IN.txt
new file mode 100644 (file)
index 0000000..09ee30c
--- /dev/null
+++ b/icu4c/source/data/unit/sd_Deva_IN.txt
@@ -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{
+    ___{""}
+}

diff --git a/icu4c/source/data/unit/sd_IN.txt b/icu4c/source/data/unit/sd_IN.txt
new file mode 100644 (file)
index 0000000..40c1064
--- /dev/null
+++ b/icu4c/source/data/unit/sd_IN.txt
@@ -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"}
+}

diff --git a/icu4c/source/data/zone/LOCALE_DEPS.json b/icu4c/source/data/zone/LOCALE_DEPS.json
index b0667cbdf0a550b89089684a05d049c35f331f44..ff035c95a707543e4a38c44cde5f45024bc77862 100644 (file)
--- a/icu4c/source/data/zone/LOCALE_DEPS.json
+++ b/icu4c/source/data/zone/LOCALE_DEPS.json
@@ -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",

diff --git a/icu4c/source/data/zone/sd_Deva_IN.txt b/icu4c/source/data/zone/sd_Deva_IN.txt
new file mode 100644 (file)
index 0000000..09ee30c
--- /dev/null
+++ b/icu4c/source/data/zone/sd_Deva_IN.txt
@@ -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{
+    ___{""}
+}

diff --git a/icu4c/source/data/zone/sd_IN.txt b/icu4c/source/data/zone/sd_IN.txt
new file mode 100644 (file)
index 0000000..40c1064
--- /dev/null
+++ b/icu4c/source/data/zone/sd_IN.txt
@@ -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"}
+}

diff --git a/icu4c/source/test/cintltst/currtest.c b/icu4c/source/test/cintltst/currtest.c
index 731f3a2c766aef7863b3dac86759bb6536e6fb31..80ad66f0baf0c50acef6393a7921b4ad32192f50 100644 (file)
--- a/icu4c/source/test/cintltst/currtest.c
+++ b/icu4c/source/test/cintltst/currtest.c
@@ -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);
 }
 

diff --git a/icu4c/source/test/testdata/structLocale.txt b/icu4c/source/test/testdata/structLocale.txt
index 9a29065dd6d6fb02659187650b8579c94894c251..52b0aae2d45cd78c0da76e57a848b37f28d1da21 100644 (file)
--- a/icu4c/source/test/testdata/structLocale.txt
+++ b/icu4c/source/test/testdata/structLocale.txt
@@ -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{""}

diff --git a/icu4j/main/shared/data/icudata.jar b/icu4j/main/shared/data/icudata.jar
index 51f12d6c62556e09f4876b0339d1f1c6bf786e9f..fe919306e73ede714c69dcdcebb378ad4d877c12 100644 (file)
--- a/icu4j/main/shared/data/icudata.jar
+++ b/icu4j/main/shared/data/icudata.jar
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1594af096f99faaf76d3abe43cdcd184353e84393e79291f627cd4ee7e47ce90
-size 14172480
+oid sha256:3b7e959e388ceba2b8aa6a79538c2388dcb0ae71f69a88f8ad04e4617de7b4ff
+size 14175301

diff --git a/icu4j/main/shared/data/icutzdata.jar b/icu4j/main/shared/data/icutzdata.jar
index 1499ad9b3ca43465f1c991545b860d51b622be6d..1433584289120dfdacc524565cc9fc0c54dad945 100644 (file)
--- a/icu4j/main/shared/data/icutzdata.jar
+++ b/icu4j/main/shared/data/icutzdata.jar
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0c9c125e295e374521b2f9865e398a6deb8a3a42609a3a3da7dc98c495bd0dea
-size 93665
+oid sha256:62a8ceb5018bdd501e36b5c6394a4dbddd5466d478212840b0e49c29195a271b
+size 93663

diff --git a/icu4j/main/shared/data/testdata.jar b/icu4j/main/shared/data/testdata.jar
index 91fa96194df777f07480a1cf66a442934ef84dd4..b50d1d0122e0c58d693e710fde319210dc05baaa 100644 (file)
--- a/icu4j/main/shared/data/testdata.jar
+++ b/icu4j/main/shared/data/testdata.jar
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a522856180aa25c87c818fadca9b85cf64463204190f3280a76bbf1e83ed8b38
-size 831602
+oid sha256:d8b0293d70546082fe73736372220a630012c3a622d75bf7c096d5a5e74cf6e8
+size 831605

diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/CurrencyTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/CurrencyTest.java
index 8ef1515b027aea0f966ad0e332d21628343035bc..d18a336dcd6df2cf82def89161c3d843d06d1882 100644 (file)
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/CurrencyTest.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/CurrencyTest.java
@@ -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

diff --git a/tools/cldr/cldr-to-icu/build-icu-data.xml b/tools/cldr/cldr-to-icu/build-icu-data.xml
index 349e24f2472521b7ce0afd5228f7fa94d9e9af05..a9488cc78f035229c6859cf45a77e2b5bd835930 100644 (file)
--- a/tools/cldr/cldr-to-icu/build-icu-data.xml
+++ b/tools/cldr/cldr-to-icu/build-icu-data.xml
@@ -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>
 

diff --git a/tools/cldr/cldr-to-icu/pom.xml b/tools/cldr/cldr-to-icu/pom.xml
index 0a7fe2cc59eef38ae697c3fcb76656f720fed457..307e9add956c6f31d9e6ca8af7f206b0500b9f1c 100644 (file)
--- a/tools/cldr/cldr-to-icu/pom.xml
+++ b/tools/cldr/cldr-to-icu/pom.xml
@@ -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>