diff options
| author | Victor Chang <vichang@google.com> | 2021-01-19 10:16:37 +0000 |
|---|---|---|
| committer | Victor Chang <vichang@google.com> | 2022-11-14 15:45:43 +0000 |
| commit | e2b5a36020f1fbaabd9f667fdd0ca7c7b8a03c3b (patch) | |
| tree | 142382ecb3fb71a9447659c21cec94bbb428fa02 /icu4j | |
| parent | d90f673ad88c7e2db1f1705d530ec28db94d7cf1 (diff) | |
| download | icu-e2b5a36020f1fbaabd9f667fdd0ca7c7b8a03c3b.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
And then amended for ICU 68:
Amend the test data in cloctst.c
These changes have been proposed, but not yet made, to CLDR:
https://unicode.org/cldr/trac/ticket/2698
Test: n/a
Change-Id: Ibbde334ce7d79d3285b4546a048957794032bd96
Diffstat (limited to 'icu4j')
| -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 f8bf9fdff..95e7923a5 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 @@ -262,7 +262,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 7cd6ab6ca..c3d7af0ae 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 @@ -3101,8 +3101,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", @@ -3213,8 +3213,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", |