ICU-21480 integrate CLDR release 39 alpha1 to ICU trunk

Author: pedberg-icu

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", "ne", "ne_NP", "nl", "nl_NL",
-    "no", "no_NO", "or", "or_IN", "pa", "pa_IN", "pl", "pl_PL", "ps", "ps_AF",
+    "mr", "mr_IN", "ms", "ms_MY", "my", "my_MM", "nb", "nb_NO", "ne", "ne_NP",
+    "nl", "nl_NL", "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",

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, "no_NO"},  /* really no_NO. Keep first in the 414 list. */
-    {0x0414, "nb_NO"},  /* really no_NO */
+    {0x0414, "nb_NO"},  /* really nb_NO. Keep first in the 414 list. */
+    {0x0414, "no_NO"},  /* really nb_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 */

icu4c/source/common/uresbund.cpp

@@ -91,6 +91,15 @@ static UBool chopLocale(char *name) {
     return FALSE;
 }
 
+/**
+ *  Called to check whether a name without '_' needs to be checked for a parent.
+ *  Some code had assumed that locale IDs with '_' could not have a non-root parent.
+ *  We may want a better way of doing this.
+ */
+static UBool mayHaveParent(char *name) {
+    return (name[0] != 0 && uprv_strstr("nb nn",name) != nullptr);
+}
+
 /**
  *  Internal function
  */
@@ -529,8 +538,8 @@ loadParentsExceptRoot(UResourceDataEntry *&t1,
                       char name[], int32_t nameCapacity,
                       UBool usingUSRData, char usrDataPath[], UErrorCode *status) {
     if (U_FAILURE(*status)) { return FALSE; }
-    UBool hasChopped = TRUE;
-    while (hasChopped && t1->fParent == NULL && !t1->fData.noFallback &&
+    UBool checkParent = TRUE;
+    while (checkParent && t1->fParent == NULL && !t1->fData.noFallback &&
             res_getResource(&t1->fData,"%%ParentIsRoot") == RES_BOGUS) {
         Resource parentRes = res_getResource(&t1->fData, "%%Parent");
         if (parentRes != RES_BOGUS) {  // An explicit parent was found.
@@ -573,7 +582,7 @@ loadParentsExceptRoot(UResourceDataEntry *&t1,
             }
         }
         t1 = t2;
-        hasChopped = chopLocale(name);
+        checkParent = chopLocale(name) || mayHaveParent(name);
     }
     return TRUE;
 }
@@ -692,7 +701,7 @@ static UResourceDataEntry *entryOpen(const char* path, const char* localeID,
                 }
             }
         }
-        if (hasChopped && !isRoot) {
+        if ((hasChopped || mayHaveParent(name)) && !isRoot) {
             if (!loadParentsExceptRoot(t1, name, UPRV_LENGTHOF(name), usingUSRData, usrDataPath, status)) {
                 goto finish;
             }
@@ -716,7 +725,7 @@ static UResourceDataEntry *entryOpen(const char* path, const char* localeID,
             hasRealData = TRUE;
             isDefault = TRUE;
             // TODO: Why not if (usingUSRData) { ... } like in the non-default-locale code path?
-            if (hasChopped && !isRoot) {
+            if ((hasChopped || mayHaveParent(name)) && !isRoot) {
                 if (!loadParentsExceptRoot(t1, name, UPRV_LENGTHOF(name), usingUSRData, usrDataPath, status)) {
                     goto finish;
                 }

icu4c/source/data/coll/LOCALE_DEPS.json

@@ -11,8 +11,7 @@
         "iw": "he",
         "iw_IL": "he_IL",
         "mo": "ro",
-        "nb": "no",
-        "nb_NO": "no_NO",
+        "no_NO": "no",
         "pa_IN": "pa_Guru_IN",
         "sh": "sr_Latn",
         "sh_BA": "sr_Latn_BA",
@@ -34,6 +33,7 @@
     },
     "parents": {
         "ff_Adlm": "root",
+        "nb": "no",
         "nn": "no"
     }
 }

icu4c/source/data/coll/nb.txt

@@ -2,5 +2,5 @@
 // License & terms of use: http://www.unicode.org/copyright.html
 // Generated using tools/cldr/cldr-to-icu/build-icu-data.xml
 nb{
-    "%%ALIAS"{"no"}
+    %%Parent{"no"}
 }

icu4c/source/data/coll/nb_NO.txt

@@ -2,5 +2,4 @@
 // License & terms of use: http://www.unicode.org/copyright.html
 // Generated using tools/cldr/cldr-to-icu/build-icu-data.xml
 nb_NO{
-    "%%ALIAS"{"no_NO"}
 }

icu4c/source/data/coll/no_NO.txt

@@ -2,4 +2,5 @@
 // License & terms of use: http://www.unicode.org/copyright.html
 // Generated using tools/cldr/cldr-to-icu/build-icu-data.xml
 no_NO{
+    "%%ALIAS"{"no"}
 }

icu4c/source/data/curr/LOCALE_DEPS.json

@@ -21,9 +21,7 @@
         "ks_IN": "ks_Arab_IN",
         "mni_IN": "mni_Beng_IN",
         "mo": "ro",
-        "nb": "no",
-        "nb_NO": "no_NO",
-        "nb_SJ": "no_SJ",
+        "no_NO": "no",
         "no_NO_NY": "nn_NO",
         "pa_IN": "pa_Guru_IN",
         "pa_PK": "pa_Arab_PK",
@@ -178,6 +176,7 @@
         "es_UY": "es_419",
         "es_VE": "es_419",
         "ff_Adlm": "root",
+        "nb": "no",
         "nn": "no",
         "pa_Arab": "root",
         "pt_AO": "pt_PT",

icu4c/source/data/curr/nb.txt

@@ -2,5 +2,5 @@
 // License & terms of use: http://www.unicode.org/copyright.html
 // Generated using tools/cldr/cldr-to-icu/build-icu-data.xml
 nb{
-    "%%ALIAS"{"no"}
+    %%Parent{"no"}
 }