commit 23e767cd192f6106de84405110fcb69c5b198a4c
author Fredrik Roubert <roubert@google.com> Wed Mar 18 15:20:09 2015 +0100
committer Nikita Iashchenko <nikitai@google.com> Thu Dec 19 14:52:20 2019 +0000
tree 6238c4462e69917e1660fca39fbe39a29e196724
parent 4b5f3f903917ea13ee1041842484238164d1cc2f

Android patch: CLDR data: Replace nb with no.

This change was introduced in Android by the ICU51.1 upgrade:

https://android.googlesource.com/platform/external/icu/+/8393335

And then amended for ICU 57:

https://android.googlesource.com/platform/external/icu/+/7dbcff1

These changes have been proposed, but not yet made, to CLDR:

https://unicode.org/cldr/trac/ticket/2698

(cherry picked from commit 1b61117d702a9952b708bcbb0ad4b9bad5deba66)

Test: n/a
Change-Id: I3e40b02f595cce59d0a8acd79e0ca19056704cfc

icu4c/source/test/cintltst/cloctst.c

diff --git a/icu4c/source/test/cintltst/cloctst.c b/icu4c/source/test/cintltst/cloctst.c
index 0a1a0ae..298e3b9 100644
--- a/icu4c/source/test/cintltst/cloctst.c
+++ b/icu4c/source/test/cintltst/cloctst.c
@@ -4817,8 +4817,8 @@
     "nl"
   }, {
     "und_NO",
-    "nb_Latn_NO",
-    "nb"
+    "no_Latn_NO",  /* Google patch */
+    "no"  /* Google patch */
   }, {
     "und_NP",
     "ne_Deva_NP",
@@ -4933,8 +4933,8 @@
     "sl"
   }, {
     "und_SJ",
-    "nb_Latn_SJ",
-    "nb_SJ"
+    "no_Latn_SJ",  /* Google patch */
+    "no_SJ"  /* Google patch */
   }, {
     "und_SK",
     "sk_Latn_SK",

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

diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/LocaleMatcherTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/LocaleMatcherTest.java
index f20cc68..d74fa17 100644
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/LocaleMatcherTest.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/LocaleMatcherTest.java
@@ -238,7 +238,7 @@
         final LocaleMatcher matcher = newLocaleMatcher("en, fil, ro, nn");
         assertEquals(new ULocale("fil"), matcher.getBestMatch("tl"));
         assertEquals(new ULocale("ro"), matcher.getBestMatch("mo"));
-        assertEquals(new ULocale("nn"), matcher.getBestMatch("nb"));
+        assertEquals(new ULocale("nn"), matcher.getBestMatch("no"));  // Google patch
         // make sure default works
         assertEquals(new ULocale("en"), matcher.getBestMatch("ja"));
     }

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

diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/ULocaleTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/ULocaleTest.java
index fc2dc4f..caac621 100644
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/ULocaleTest.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/ULocaleTest.java
@@ -3105,8 +3105,8 @@
                     "nl"
                 }, {
                     "und_NO",
-                    "nb_Latn_NO",
-                    "nb"
+                    "no_Latn_NO",  // Android patch: Replace nb with no.
+                    "no"
                 }, {
                     "und_NP",
                     "ne_Deva_NP",
@@ -3217,8 +3217,8 @@
                     "sl"
                 }, {
                     "und_SJ",
-                    "nb_Latn_SJ",
-                    "nb_SJ"
+                    "no_Latn_SJ",  // Android patch: Replace nb with no.
+                    "no_SJ"
                 }, {
                     "und_SK",
                     "sk_Latn_SK",