ICU-21480 integrate CLDR release 39 alpha0 to ICU trunk

pedberg-icu · Feb 10, 2021 · b0370b7 · b0370b7
1 parent 916b9fa
commit b0370b7
Show file tree

Hide file tree

Showing 643 changed files with 19,546 additions and 18,724 deletions.
diff --git a/icu4c/source/common/locid.cpp b/icu4c/source/common/locid.cpp
@@ -523,8 +523,8 @@ static const char* const KNOWN_CANONICALIZED[] = {
     "it", "it_IT", "ja", "ja_JP", "jv", "jv_ID", "ka", "ka_GE", "kk", "kk_KZ",
     "km", "km_KH", "kn", "kn_IN", "ko", "ko_KR", "ky", "ky_KG", "lo", "lo_LA",
     "lt", "lt_LT", "lv", "lv_LV", "mk", "mk_MK", "ml", "ml_IN", "mn", "mn_MN",
-    "mr", "mr_IN", "ms", "ms_MY", "my", "my_MM", "nb", "nb_NO", "ne", "ne_NP",
-    "nl", "nl_NL", "or", "or_IN", "pa", "pa_IN", "pl", "pl_PL", "ps", "ps_AF",
+    "mr", "mr_IN", "ms", "ms_MY", "my", "my_MM", "ne", "ne_NP", "nl", "nl_NL",
+    "no", "no_NO", "or", "or_IN", "pa", "pa_IN", "pl", "pl_PL", "ps", "ps_AF",
     "pt", "pt_BR", "pt_PT", "ro", "ro_RO", "ru", "ru_RU", "sd", "sd_IN", "si",
     "si_LK", "sk", "sk_SK", "sl", "sl_SI", "so", "so_SO", "sq", "sq_AL", "sr",
     "sr_Cyrl_RS", "sr_Latn", "sr_RS", "sv", "sv_SE", "sw", "sw_TZ", "ta",

diff --git a/icu4c/source/common/locmap.cpp b/icu4c/source/common/locmap.cpp
@@ -526,8 +526,8 @@ ILCID_POSIX_SUBTABLE(nl) {
 ILCID_POSIX_SUBTABLE(no) {
     {0x14,   "no"},     /* really nb_NO - actually Windows differentiates between neutral (no region) and specific (with region) */ 
     {0x7c14, "nb"},     /* really nb */
-    {0x0414, "nb_NO"},  /* really nb_NO. Keep first in the 414 list. */
-    {0x0414, "no_NO"},  /* really nb_NO */
+    {0x0414, "no_NO"},  /* really no_NO. Keep first in the 414 list. */
+    {0x0414, "nb_NO"},  /* really no_NO */
     {0x0814, "nn_NO"},  /* really nn_NO. Keep first in the 814 list.  */
     {0x7814, "nn"},     /* It's 0x14 or 0x814, pick one to make the test program happy. */
     {0x0814, "no_NO_NY"}/* really nn_NO */

diff --git a/icu4c/source/data/brkitr/LOCALE_DEPS.json b/icu4c/source/data/brkitr/LOCALE_DEPS.json
@@ -3,5 +3,5 @@
 // Generated using tools/cldr/cldr-to-icu/build-icu-data.xml
 
 {
-    "cldrVersion": "38"
+    "cldrVersion": "39"
 }
diff --git a/icu4c/source/data/brkitr/root.txt b/icu4c/source/data/brkitr/root.txt
@@ -2,7 +2,7 @@
 // License & terms of use: http://www.unicode.org/copyright.html
 // Generated using tools/cldr/cldr-to-icu/build-icu-data.xml
 root{
-    Version{"38"}
+    Version{"39"}
     boundaries{
         grapheme:process(dependency){"char.brk"}
         line:process(dependency){"line.brk"}

diff --git a/icu4c/source/data/build.xml b/icu4c/source/data/build.xml
@@ -30,18 +30,18 @@
         <fail unless="is.cldr.dir.set" message="Please set the CLDR_DIR environment variable to the top level CLDR source dir (containing 'common')."/>
 
         <available property="cldrtools.dir" value="${env.CLDR_DIR}/cldr-tools" file="${env.CLDR_DIR}/cldr-tools" type="dir"/>
-        <available property="cldrtools.dir" value="${env.CLDR_DIR}/tools/java" file="${env.CLDR_DIR}/tools/java" type="dir"/>
+        <available property="cldrtools.dir" value="${env.CLDR_DIR}/tools" file="${env.CLDR_DIR}/tools" type="dir"/>
         <fail unless="cldrtools.dir" message="Please make sure that the CLDR tools directory is checked out into CLDR_DIR"/>
 
-        <available property="env.CLDR_CLASSES" value="${cldrtools.dir}/classes" file="${cldrtools.dir}/classes" type="dir"/>
-        <available property="cldrtools.jar" value="${cldrtools.dir}/cldr.jar" file="${cldrtools.dir}/cldr.jar" type="file"/>
+        <available property="env.CLDR_CLASSES" value="${cldrtools.dir}/cldr-code/target/classes" file="${cldrtools.dir}/cldr-code/target/classes" type="dir"/>
+        <available property="cldrtools.jar" value="${cldrtools.dir}/cldr-code/target/cldr-code.jar" file="${cldrtools.dir}/cldr-code/target/cldr-code.jar" type="file"/>
         <condition property="is.cldr.classes.set">
             <or>
                 <isset property="env.CLDR_CLASSES" />
                 <isset property="cldrtools.jar" />
             </or>
         </condition>
-        <fail unless="is.cldr.classes.set" message="CLDR classes not found in ${cldrtools.dir}. Please either set the CLDR_CLASSES environment variable or build cldr.jar."/>
+        <fail unless="is.cldr.classes.set" message="CLDR classes not found in ${cldrtools.dir}/cldr-code/target/classes. Please either set the CLDR_CLASSES environment variable or build cldr-code.jar."/>
 
         <property name="env.CLDR_TMP_DIR" location="${env.CLDR_DIR}/../cldr-aux" /> <!-- Hack: see CLDRPaths -->
         <property name="cldr.prod.dir" location="${env.CLDR_TMP_DIR}/production/" />

diff --git a/icu4c/source/data/cldr-icu-readme.txt b/icu4c/source/data/cldr-icu-readme.txt
@@ -30,6 +30,9 @@
 # plus the xml-apis.jar from the Apache xalan package
 # (http://xml.apache.org/xalan-j/downloads.html).
 #
+# You will also need to have performed the CLDR Maven setup (non-Eclipse version)
+# per http://cldr.unicode.org/development/maven 
+#
 # Note: Enough things can (and will) fail in this process that it is best to
 #   run the commands separately from an interactive shell. They should all
 #   copy and paste without problems.
@@ -195,7 +198,7 @@ ant copy-cldr-testdata
 # 4d. Copy from CLDR common/testData/localeIdentifiers/localeCanonicalization.txt
 # into icu4c/source/test/testdata/localeCanonicalization.txt
 # and icu4j/main/tests/core/src/com/ibm/icu/dev/data/unicode/localeCanonicalization.txt
-# and add the following line to the begginning of these two files
+# and add the following line to the beginning of these two files
 # # File copied from cldr common/testData/localeIdentifiers/localeCanonicalization.txt
 
 # 5. Check which data files have modifications, which have been added or removed

diff --git a/icu4c/source/data/coll/LOCALE_DEPS.json b/icu4c/source/data/coll/LOCALE_DEPS.json
@@ -3,16 +3,16 @@
 // Generated using tools/cldr/cldr-to-icu/build-icu-data.xml
 
 {
-    "cldrVersion": "38",
+    "cldrVersion": "39",
     "aliases": {
         "ars": "ar_SA",
         "in": "id",
         "in_ID": "id_ID",
         "iw": "he",
         "iw_IL": "he_IL",
         "mo": "ro",
-        "no": "nb",
-        "no_NO": "nb_NO",
+        "nb": "no",
+        "nb_NO": "no_NO",
         "pa_IN": "pa_Guru_IN",
         "sh": "sr_Latn",
         "sh_BA": "sr_Latn_BA",
@@ -33,6 +33,7 @@
         "zh_TW": "zh_Hant_TW"
     },
     "parents": {
-        "ff_Adlm": "root"
+        "ff_Adlm": "root",
+        "nn": "no"
     }
 }
diff --git a/icu4c/source/data/coll/af.txt b/icu4c/source/data/coll/af.txt
@@ -5,7 +5,7 @@ af{
     collations{
         standard{
             Sequence{"&N<<<ŉ"}
-            Version{"38"}
+            Version{"39"}
         }
     }
 }
diff --git a/icu4c/source/data/coll/am.txt b/icu4c/source/data/coll/am.txt
@@ -5,7 +5,7 @@ am{
     collations{
         standard{
             Sequence{"[reorder Ethi]"}
-            Version{"38"}
+            Version{"39"}
         }
     }
 }
diff --git a/icu4c/source/data/coll/ar.txt b/icu4c/source/data/coll/ar.txt
@@ -9,7 +9,7 @@ ar{
                 "&ت<<ة<<<ﺔ<<<ﺓ"
                 "&ي<<ى<<<ﯨ<<<ﯩ<<<ﻰ<<<ﻯ<<<ﲐ<<<ﱝ"
             }
-            Version{"38"}
+            Version{"39"}
         }
         standard{
             Sequence{
@@ -397,7 +397,7 @@ ar{
                 "‎&ۓ‎=ﮰ‎=ﮱ"
                 "‎&ۀ‎=ﮤ‎=ﮥ"
             }
-            Version{"38"}
+            Version{"39"}
         }
     }
 }
diff --git a/icu4c/source/data/coll/as.txt b/icu4c/source/data/coll/as.txt
@@ -11,7 +11,7 @@ as{
                 "&[before 1]ত<ৎ=ত্\u200D"
                 "&হ<ক্ষ"
             }
-            Version{"38"}
+            Version{"39"}
         }
     }
 }
diff --git a/icu4c/source/data/coll/az.txt b/icu4c/source/data/coll/az.txt
@@ -9,7 +9,7 @@ az{
                 "[import az-u-co-standard]"
                 "[reorder others]"
             }
-            Version{"38"}
+            Version{"39"}
         }
         standard{
             Sequence{
@@ -26,7 +26,7 @@ az{
                 "&H<x<<<X"
                 "&Z<w<<<W"
             }
-            Version{"38"}
+            Version{"39"}
         }
     }
 }
diff --git a/icu4c/source/data/coll/be.txt b/icu4c/source/data/coll/be.txt
@@ -9,7 +9,7 @@ be{
                 "&Е<ё<<<Ё"
                 "&у<ў<<<Ў"
             }
-            Version{"38"}
+            Version{"39"}
         }
     }
 }
diff --git a/icu4c/source/data/coll/bg.txt b/icu4c/source/data/coll/bg.txt
@@ -5,7 +5,7 @@ bg{
     collations{
         standard{
             Sequence{"[reorder Cyrl]"}
-            Version{"38"}
+            Version{"39"}
         }
     }
 }
diff --git a/icu4c/source/data/coll/bn.txt b/icu4c/source/data/coll/bn.txt
@@ -9,7 +9,7 @@ bn{
                 "[reorder Beng Deva Guru Gujr Orya Taml Telu Knda Mlym Sinh]"
                 "&ঔ<ং<ঃ<ঁ"
             }
-            Version{"38"}
+            Version{"39"}
         }
         traditional{
             Sequence{
@@ -629,7 +629,7 @@ bn{
                 "&যৌ<<<য়ৌ"
                 "&য্<<<য়্"
             }
-            Version{"38"}
+            Version{"39"}
         }
     }
 }
diff --git a/icu4c/source/data/coll/br.txt b/icu4c/source/data/coll/br.txt
@@ -5,7 +5,7 @@ br{
     collations{
         standard{
             Sequence{"&C<ch<<<Ch<<<CH<c''h=c\u2019h<<<C''h=C\u2019h<<<C''H=C\u2019H"}
-            Version{"38"}
+            Version{"39"}
         }
     }
 }
diff --git a/icu4c/source/data/coll/bs.txt b/icu4c/source/data/coll/bs.txt
@@ -5,11 +5,11 @@ bs{
     collations{
         search{
             Sequence{"[import hr-u-co-search]"}
-            Version{"38"}
+            Version{"39"}
         }
         standard{
             Sequence{"[import hr]"}
-            Version{"38"}
+            Version{"39"}
         }
     }
 }
diff --git a/icu4c/source/data/coll/bs_Cyrl.txt b/icu4c/source/data/coll/bs_Cyrl.txt
@@ -5,7 +5,7 @@ bs_Cyrl{
     collations{
         standard{
             Sequence{"[import sr]"}
-            Version{"38"}
+            Version{"39"}
         }
     }
 }
diff --git a/icu4c/source/data/coll/ca.txt b/icu4c/source/data/coll/ca.txt
@@ -8,7 +8,7 @@ ca{
                 "[import und-u-co-search]"
                 "&L<ŀ=l·<<<Ŀ=L·"
             }
-            Version{"38"}
+            Version{"39"}
         }
     }
 }
diff --git a/icu4c/source/data/coll/ceb.txt b/icu4c/source/data/coll/ceb.txt
@@ -5,7 +5,7 @@ ceb{
     collations{
         standard{
             Sequence{"&N<ñ<<<Ñ<ng<<<Ng<<<NG"}
-            Version{"38"}
+            Version{"39"}
         }
     }
 }
diff --git a/icu4c/source/data/coll/chr.txt b/icu4c/source/data/coll/chr.txt
@@ -5,7 +5,7 @@ chr{
     collations{
         standard{
             Sequence{"[reorder Cher]"}
-            Version{"38"}
+            Version{"39"}
         }
     }
 }
diff --git a/icu4c/source/data/coll/cs.txt b/icu4c/source/data/coll/cs.txt
@@ -11,7 +11,7 @@ cs{
                 "&S<š<<<Š"
                 "&Z<ž<<<Ž"
             }
-            Version{"38"}
+            Version{"39"}
         }
     }
 }
diff --git a/icu4c/source/data/coll/cy.txt b/icu4c/source/data/coll/cy.txt
@@ -14,7 +14,7 @@ cy{
                 "&R<rh<<<Rh<<<RH"
                 "&T<th<<<Th<<<TH"
             }
-            Version{"38"}
+            Version{"39"}
         }
     }
 }
diff --git a/icu4c/source/data/coll/da.txt b/icu4c/source/data/coll/da.txt
@@ -9,7 +9,7 @@ da{
                 "[import da-u-co-standard]"
                 "[caseFirst off]"
             }
-            Version{"38"}
+            Version{"39"}
         }
         standard{
             Sequence{
@@ -21,7 +21,7 @@ da{
                 "&[before 1]ǀ<æ<<<Æ<<ä<<<Ä<ø<<<Ø<<ö<<<Ö<<ő<<<Ő<å<<<Å<<<aa<<<Aa<<<AA"
                 "&oe<<œ<<<Œ"
             }
-            Version{"38"}
+            Version{"39"}
         }
     }
 }
diff --git a/icu4c/source/data/coll/de.txt b/icu4c/source/data/coll/de.txt
@@ -9,14 +9,14 @@ de{
                 "&OE<<ö<<<Ö"
                 "&UE<<ü<<<Ü"
             }
-            Version{"38"}
+            Version{"39"}
         }
         search{
             Sequence{
                 "[import und-u-co-search]"
                 "[import de-u-co-phonebk]"
             }
-            Version{"38"}
+            Version{"39"}
         }
     }
 }
diff --git a/icu4c/source/data/coll/de_AT.txt b/icu4c/source/data/coll/de_AT.txt
@@ -10,7 +10,7 @@ de_AT{
                 "&u<ü<<<Ü"
                 "&ss<ß<<<ẞ"
             }
-            Version{"38"}
+            Version{"39"}
         }
     }
 }
diff --git a/icu4c/source/data/coll/dsb.txt b/icu4c/source/data/coll/dsb.txt
@@ -14,7 +14,7 @@ dsb{
                 "&S<š<<<Š<ś<<<Ś"
                 "&Z<ž<<<Ž<ź<<<Ź"
             }
-            Version{"38"}
+            Version{"39"}
         }
     }
 }
diff --git a/icu4c/source/data/coll/ee.txt b/icu4c/source/data/coll/ee.txt
@@ -17,7 +17,7 @@ ee{
                 "&T<ts<<<Ts<<<TS"
                 "&V<ʋ<<<Ʋ"
             }
-            Version{"38"}
+            Version{"39"}
         }
     }
 }
diff --git a/icu4c/source/data/coll/el.txt b/icu4c/source/data/coll/el.txt
@@ -8,7 +8,7 @@ el{
                 "[normalization on]"
                 "[reorder Grek]"
             }
-            Version{"38"}
+            Version{"39"}
         }
     }
 }
diff --git a/icu4c/source/data/coll/en_US_POSIX.txt b/icu4c/source/data/coll/en_US_POSIX.txt
@@ -8,7 +8,7 @@ en_US_POSIX{
                 "&A<*'\u0020'-'/'<*0-'@'<*ABCDEFGHIJKLMNOPQRSTUVWXYZ<*'['-'`'<*abcdefghijklmnopqrstuvwxyz"
                 "<*'{'-'\u007F'"
             }
-            Version{"38"}
+            Version{"39"}
         }
     }
 }
diff --git a/icu4c/source/data/coll/eo.txt b/icu4c/source/data/coll/eo.txt
@@ -12,7 +12,7 @@ eo{
                 "&S<ŝ<<<Ŝ"
                 "&U<ŭ<<<Ŭ"
             }
-            Version{"38"}
+            Version{"39"}
         }
     }
 }
diff --git a/icu4c/source/data/coll/es.txt b/icu4c/source/data/coll/es.txt
@@ -8,19 +8,19 @@ es{
                 "[import und-u-co-search]"
                 "&N<ñ<<<Ñ"
             }
-            Version{"38"}
+            Version{"39"}
         }
         standard{
             Sequence{"&N<ñ<<<Ñ"}
-            Version{"38"}
+            Version{"39"}
         }
         traditional{
             Sequence{
                 "&N<ñ<<<Ñ"
                 "&C<ch<<<Ch<<<CH"
                 "&l<ll<<<Ll<<<LL"
             }
-            Version{"38"}
+            Version{"39"}
         }
     }
 }