diff options
| author | Fredrik Roubert <roubert@google.com> | 2015-03-18 15:20:09 +0100 |
|---|---|---|
| committer | Fredrik Roubert <roubert@google.com> | 2015-03-20 15:18:53 +0100 |
| commit | 4b05912059a8780b56c7b70160e6d27a8de6c3ca (patch) | |
| tree | 1cada960f3d30ea0af9cac16d0c2694e55fb5a1a /icu4c | |
| parent | d3a19b78c2bfb4a3dde3b4a35f62cccd82809da4 (diff) | |
| download | android_external_icu-4b05912059a8780b56c7b70160e6d27a8de6c3ca.tar.gz android_external_icu-4b05912059a8780b56c7b70160e6d27a8de6c3ca.tar.bz2 android_external_icu-4b05912059a8780b56c7b70160e6d27a8de6c3ca.zip | |
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
Change-Id: Ib00131d63dadb0fcc56789e8367b3d7595e0c108
Diffstat (limited to 'icu4c')
| -rw-r--r-- | icu4c/source/data/misc/likelySubtags.txt | 4 | ||||
| -rw-r--r-- | icu4c/source/test/cintltst/cloctst.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/icu4c/source/data/misc/likelySubtags.txt b/icu4c/source/data/misc/likelySubtags.txt index d5b16261d..6a508a925 100644 --- a/icu4c/source/data/misc/likelySubtags.txt +++ b/icu4c/source/data/misc/likelySubtags.txt @@ -963,7 +963,7 @@ likelySubtags:table(nofallback){ und_NE{"ha_Latn_NE"} und_NI{"es_Latn_NI"} und_NL{"nl_Latn_NL"} - und_NO{"nb_Latn_NO"} + und_NO{"no_Latn_NO"} und_NP{"ne_Deva_NP"} und_Narb{"xna_Narb_SA"} und_Nbat{"arc_Nbat_JO"} @@ -1010,7 +1010,7 @@ likelySubtags:table(nofallback){ und_SD{"ar_Arab_SD"} und_SE{"sv_Latn_SE"} und_SI{"sl_Latn_SI"} - und_SJ{"nb_Latn_SJ"} + und_SJ{"no_Latn_SJ"} und_SK{"sk_Latn_SK"} und_SM{"it_Latn_SM"} und_SN{"fr_Latn_SN"} diff --git a/icu4c/source/test/cintltst/cloctst.c b/icu4c/source/test/cintltst/cloctst.c index a813566bd..6e8296d47 100644 --- a/icu4c/source/test/cintltst/cloctst.c +++ b/icu4c/source/test/cintltst/cloctst.c @@ -4488,8 +4488,8 @@ const char* const full_data[][3] = { "nl" }, { "und_NO", - "nb_Latn_NO", - "nb" + "no_Latn_NO", /* Google patch */ + "no" /* Google patch */ }, { "und_NP", "ne_Deva_NP", @@ -4604,8 +4604,8 @@ const char* const full_data[][3] = { "sl" }, { "und_SJ", - "nb_Latn_SJ", - "nb_SJ" + "no_Latn_SJ", /* Google patch */ + "no_SJ" /* Google patch */ }, { "und_SK", "sk_Latn_SK", |