diff options
| author | Fredrik Roubert <roubert@google.com> | 2015-03-18 15:20:09 +0100 |
|---|---|---|
| committer | Nikita Iashchenko <nikitai@google.com> | 2020-01-02 19:10:56 +0000 |
| commit | 8b816c6aaab9e0e47d2d01873b5194509027fc1c (patch) | |
| tree | ccba0da20056d976b3f78b4065d7d1c5e01bead0 /icu4j/main/tests | |
| parent | 639894f533b5faa6ecb17ec817e489d346420a79 (diff) | |
| download | icu-8b816c6aaab9e0e47d2d01873b5194509027fc1c.tar.gz | |
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
Diffstat (limited to 'icu4j/main/tests')
| -rw-r--r-- | icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/LocaleMatcherTest.java | 2 | ||||
| -rw-r--r-- | icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/ULocaleTest.java | 8 |
2 files changed, 5 insertions, 5 deletions
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 f20cc6862..d74fa17b9 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 @@ public class LocaleMatcherTest extends TestFmwk { 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")); } 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 fc2dc4f98..caac6212a 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 @@ public class ULocaleTest extends TestFmwk { "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 @@ public class ULocaleTest extends TestFmwk { "sl" }, { "und_SJ", - "nb_Latn_SJ", - "nb_SJ" + "no_Latn_SJ", // Android patch: Replace nb with no. + "no_SJ" }, { "und_SK", "sk_Latn_SK", |