diff options
| -rw-r--r-- | common/supplemental/likelySubtags.xml | 8 | ||||
| -rw-r--r-- | common/testData/localeIdentifiers/likelySubtags.txt | 10 |
2 files changed, 11 insertions, 7 deletions
diff --git a/common/supplemental/likelySubtags.xml b/common/supplemental/likelySubtags.xml index c1fb3b53..14acaa9b 100644 --- a/common/supplemental/likelySubtags.xml +++ b/common/supplemental/likelySubtags.xml @@ -1834,7 +1834,9 @@ not be patched by hand, as any changes made in that fashion may be lost. <likelySubtag from="und_Latn_NE" to="ha_Latn_NE"/> <likelySubtag from="und_Latn_NI" to="es_Latn_NI"/> <likelySubtag from="und_Latn_NL" to="nl_Latn_NL"/> - <likelySubtag from="und_Latn_NO" to="nb_Latn_NO"/> + <!-- Android patch (CLDR ticket #2698) begin. --> + <likelySubtag from="und_Latn_NO" to="no_Latn_NO"/> + <!-- Android patch (CLDR ticket #2698) end. --> <likelySubtag from="und_Latn_PA" to="es_Latn_PA"/> <likelySubtag from="und_Latn_PE" to="es_Latn_PE"/> <likelySubtag from="und_Latn_PF" to="fr_Latn_PF"/> @@ -1852,7 +1854,9 @@ not be patched by hand, as any changes made in that fashion may be lost. <likelySubtag from="und_Latn_SC" to="fr_Latn_SC"/> <likelySubtag from="und_Latn_SE" to="sv_Latn_SE"/> <likelySubtag from="und_Latn_SI" to="sl_Latn_SI"/> - <likelySubtag from="und_Latn_SJ" to="nb_Latn_SJ"/> + <!-- Android patch (CLDR ticket #2698) begin. --> + <likelySubtag from="und_Latn_SJ" to="no_Latn_SJ"/> + <!-- Android patch (CLDR ticket #2698) end. --> <likelySubtag from="und_Latn_SK" to="sk_Latn_SK"/> <likelySubtag from="und_Latn_SL" to="kri_Latn_SL"/> <likelySubtag from="und_Latn_SM" to="it_Latn_SM"/> diff --git a/common/testData/localeIdentifiers/likelySubtags.txt b/common/testData/localeIdentifiers/likelySubtags.txt index 1f9e3557..417c1001 100644 --- a/common/testData/localeIdentifiers/likelySubtags.txt +++ b/common/testData/localeIdentifiers/likelySubtags.txt @@ -1,5 +1,5 @@ # Test data for Likely Subtags -# Copyright © 1991-2023 Unicode, Inc. +# Copyright © 1991-2024 Unicode, Inc. # For terms of use, see http://www.unicode.org/copyright.html # SPDX-License-Identifier: Unicode-DFS-2016 # CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/) @@ -1397,7 +1397,7 @@ und-Latn-NF ; en-Latn-NF ; en-NF ; und-Latn-NG ; en-Latn-NG ; en-NG ; und-Latn-NI ; es-Latn-NI ; es-NI ; und-Latn-NL ; nl-Latn-NL ; nl ; -und-Latn-NO ; nb-Latn-NO ; nb ; +und-Latn-NO ; no-Latn-NO ; no ; und-Latn-NR ; en-Latn-NR ; en-NR ; und-Latn-NU ; en-Latn-NU ; en-NU ; und-Latn-NZ ; en-Latn-NZ ; en-NZ ; @@ -1425,7 +1425,7 @@ und-Latn-SE ; sv-Latn-SE ; sv ; und-Latn-SG ; en-Latn-SG ; en-SG ; und-Latn-SH ; en-Latn-SH ; en-SH ; und-Latn-SI ; sl-Latn-SI ; sl ; -und-Latn-SJ ; nb-Latn-SJ ; nb-SJ ; +und-Latn-SJ ; no-Latn-SJ ; no-SJ ; und-Latn-SK ; sk-Latn-SK ; sk ; und-Latn-SL ; kri-Latn-SL ; kri ; und-Latn-SM ; it-Latn-SM ; it-SM ; @@ -1505,7 +1505,7 @@ und-NF ; en-Latn-NF ; en-NF ; und-NG ; en-Latn-NG ; en-NG ; und-NI ; es-Latn-NI ; es-NI ; und-NL ; nl-Latn-NL ; nl ; -und-NO ; nb-Latn-NO ; nb ; +und-NO ; no-Latn-NO ; no ; und-NP ; ne-Deva-NP ; ne ; und-NR ; en-Latn-NR ; en-NR ; und-NU ; en-Latn-NU ; en-NU ; @@ -1548,7 +1548,7 @@ und-SE ; sv-Latn-SE ; sv ; und-SG ; en-Latn-SG ; en-SG ; und-SH ; en-Latn-SH ; en-SH ; und-SI ; sl-Latn-SI ; sl ; -und-SJ ; nb-Latn-SJ ; nb-SJ ; +und-SJ ; no-Latn-SJ ; no-SJ ; und-SK ; sk-Latn-SK ; sk ; und-SL ; kri-Latn-SL ; kri ; und-SM ; it-Latn-SM ; it-SM ; |