From 896cc48cbe0adef506e792f70de7fb6e217c9ec1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bargull?= Date: Sat, 9 Apr 2022 11:52:50 +0000 Subject: [PATCH] Bug 1763783 - Part 4: Update language tags mappings to CLDR 41. r=platform-i18n-reviewers,jfkthame Depends on D143276 Differential Revision: https://phabricator.services.mozilla.com/D143277 --- intl/components/src/LocaleGenerated.cpp | 53 +++++++++------- .../Intl/Locale/likely-subtags-generated.js | 62 ++++++++++++------- 2 files changed, 72 insertions(+), 43 deletions(-) diff --git a/intl/components/src/LocaleGenerated.cpp b/intl/components/src/LocaleGenerated.cpp index 55d15292ac77..9396c44c93d5 100644 --- a/intl/components/src/LocaleGenerated.cpp +++ b/intl/components/src/LocaleGenerated.cpp @@ -1,6 +1,6 @@ // Generated by make_intl_data.py. DO NOT EDIT. -// Version: CLDR-40 -// URL: https://unicode.org/Public/cldr/40/core.zip +// Version: CLDR-41 +// URL: https://unicode.org/Public/cldr/41/core.zip #include "mozilla/Assertions.h" #include "mozilla/Span.h" @@ -99,8 +99,8 @@ static bool IsCanonicallyCasedTransformType(mozilla::Span type) { #endif // Mappings from language subtags to preferred values. -// Derived from CLDR Supplemental Data, version 40. -// https://unicode.org/Public/cldr/40/core.zip +// Derived from CLDR Supplemental Data, version 41. +// https://unicode.org/Public/cldr/41/core.zip bool mozilla::intl::Locale::LanguageMapping(LanguageSubtag& language) { MOZ_ASSERT(IsStructurallyValidLanguageTag(language.Span())); MOZ_ASSERT(IsCanonicallyCasedLanguageTag(language.Span())); @@ -219,8 +219,8 @@ bool mozilla::intl::Locale::LanguageMapping(LanguageSubtag& language) { } // Language subtags with complex mappings. -// Derived from CLDR Supplemental Data, version 40. -// https://unicode.org/Public/cldr/40/core.zip +// Derived from CLDR Supplemental Data, version 41. +// https://unicode.org/Public/cldr/41/core.zip bool mozilla::intl::Locale::ComplexLanguageMapping(const LanguageSubtag& language) { MOZ_ASSERT(IsStructurallyValidLanguageTag(language.Span())); MOZ_ASSERT(IsCanonicallyCasedLanguageTag(language.Span())); @@ -241,8 +241,8 @@ bool mozilla::intl::Locale::ComplexLanguageMapping(const LanguageSubtag& languag } // Mappings from script subtags to preferred values. -// Derived from CLDR Supplemental Data, version 40. -// https://unicode.org/Public/cldr/40/core.zip +// Derived from CLDR Supplemental Data, version 41. +// https://unicode.org/Public/cldr/41/core.zip bool mozilla::intl::Locale::ScriptMapping(ScriptSubtag& script) { MOZ_ASSERT(IsStructurallyValidScriptTag(script.Span())); MOZ_ASSERT(IsCanonicallyCasedScriptTag(script.Span())); @@ -257,8 +257,8 @@ bool mozilla::intl::Locale::ScriptMapping(ScriptSubtag& script) { } // Mappings from region subtags to preferred values. -// Derived from CLDR Supplemental Data, version 40. -// https://unicode.org/Public/cldr/40/core.zip +// Derived from CLDR Supplemental Data, version 41. +// https://unicode.org/Public/cldr/41/core.zip bool mozilla::intl::Locale::RegionMapping(RegionSubtag& region) { MOZ_ASSERT(IsStructurallyValidRegionTag(region.Span())); MOZ_ASSERT(IsCanonicallyCasedRegionTag(region.Span())); @@ -357,8 +357,8 @@ bool mozilla::intl::Locale::RegionMapping(RegionSubtag& region) { } // Region subtags with complex mappings. -// Derived from CLDR Supplemental Data, version 40. -// https://unicode.org/Public/cldr/40/core.zip +// Derived from CLDR Supplemental Data, version 41. +// https://unicode.org/Public/cldr/41/core.zip bool mozilla::intl::Locale::ComplexRegionMapping(const RegionSubtag& region) { MOZ_ASSERT(IsStructurallyValidRegionTag(region.Span())); MOZ_ASSERT(IsCanonicallyCasedRegionTag(region.Span())); @@ -380,8 +380,8 @@ bool mozilla::intl::Locale::ComplexRegionMapping(const RegionSubtag& region) { } // Language subtags with complex mappings. -// Derived from CLDR Supplemental Data, version 40. -// https://unicode.org/Public/cldr/40/core.zip +// Derived from CLDR Supplemental Data, version 41. +// https://unicode.org/Public/cldr/41/core.zip void mozilla::intl::Locale::PerformComplexLanguageMappings() { MOZ_ASSERT(IsStructurallyValidLanguageTag(Language().Span())); MOZ_ASSERT(IsCanonicallyCasedLanguageTag(Language().Span())); @@ -416,8 +416,8 @@ void mozilla::intl::Locale::PerformComplexLanguageMappings() { } // Region subtags with complex mappings. -// Derived from CLDR Supplemental Data, version 40. -// https://unicode.org/Public/cldr/40/core.zip +// Derived from CLDR Supplemental Data, version 41. +// https://unicode.org/Public/cldr/41/core.zip void mozilla::intl::Locale::PerformComplexRegionMappings() { MOZ_ASSERT(IsStructurallyValidLanguageTag(Language().Span())); MOZ_ASSERT(IsCanonicallyCasedLanguageTag(Language().Span())); @@ -643,8 +643,8 @@ static bool IsLessThan(const T& a, const U& b) { } // Mappings from variant subtags to preferred values. -// Derived from CLDR Supplemental Data, version 40. -// https://unicode.org/Public/cldr/40/core.zip +// Derived from CLDR Supplemental Data, version 41. +// https://unicode.org/Public/cldr/41/core.zip bool mozilla::intl::Locale::PerformVariantMappings() { // The variant subtags need to be sorted for binary search. MOZ_ASSERT(std::is_sorted(mVariants.begin(), mVariants.end(), @@ -707,8 +707,8 @@ bool mozilla::intl::Locale::PerformVariantMappings() { } // Canonicalize legacy locale identifiers. -// Derived from CLDR Supplemental Data, version 40. -// https://unicode.org/Public/cldr/40/core.zip +// Derived from CLDR Supplemental Data, version 41. +// https://unicode.org/Public/cldr/41/core.zip bool mozilla::intl::Locale::UpdateLegacyMappings() { // We're mapping legacy tags to non-legacy form here. // Other tags remain unchanged. @@ -865,8 +865,8 @@ bool mozilla::intl::Locale::UpdateLegacyMappings() { } // Mappings from legacy sign languages. -// Derived from CLDR Supplemental Data, version 40. -// https://unicode.org/Public/cldr/40/core.zip +// Derived from CLDR Supplemental Data, version 41. +// https://unicode.org/Public/cldr/41/core.zip bool mozilla::intl::Locale::SignLanguageMapping(LanguageSubtag& language, const RegionSubtag& region) { MOZ_ASSERT(language.EqualTo("sgn")); @@ -1112,9 +1112,18 @@ const char* mozilla::intl::Locale::ReplaceTransformExtensionType( } } else if (IsTransformKey(key, "m0")) { + if (IsTransformType(type, "beta-metsehaf")) { + return "betamets"; + } + if (IsTransformType(type, "ies-jes")) { + return "iesjes"; + } if (IsTransformType(type, "names")) { return "prprname"; } + if (IsTransformType(type, "tekie-alibekit")) { + return "tekieali"; + } } return nullptr; } diff --git a/js/src/tests/non262/Intl/Locale/likely-subtags-generated.js b/js/src/tests/non262/Intl/Locale/likely-subtags-generated.js index 1f85f2f0ac2a..b00e97ceb08a 100644 --- a/js/src/tests/non262/Intl/Locale/likely-subtags-generated.js +++ b/js/src/tests/non262/Intl/Locale/likely-subtags-generated.js @@ -2,8 +2,8 @@ // Generated by make_intl_data.py. DO NOT EDIT. // Extracted from likelySubtags.xml. -// Derived from CLDR Supplemental Data, version 40. -// https://unicode.org/Public/cldr/40/core.zip +// Derived from CLDR Supplemental Data, version 41. +// https://unicode.org/Public/cldr/41/core.zip var maxLikelySubtags = { "aa": "aa-Latn-ET", "aai": "aai-Latn-ZZ", @@ -168,6 +168,7 @@ var maxLikelySubtags = { "bkq": "bkq-Latn-ZZ", "bku": "bku-Latn-PH", "bkv": "bkv-Latn-ZZ", + "bla": "bla-Latn-CA", "blg": "iba-Latn-MY", "blt": "blt-Tavt-VN", "bm": "bm-Latn-ML", @@ -250,17 +251,17 @@ var maxLikelySubtags = { "cko": "cko-Latn-ZZ", "cky": "cky-Latn-ZZ", "cla": "cla-Latn-ZZ", + "clc": "clc-Latn-CA", "cme": "cme-Latn-ZZ", "cmg": "cmg-Soyo-MN", "co": "co-Latn-FR", "cop": "cop-Copt-EG", "cps": "cps-Latn-PH", "cr": "cr-Cans-CA", + "crg": "crg-Latn-CA", "crh": "crh-Cyrl-UA", - "crj": "crj-Cans-CA", "crk": "crk-Cans-CA", "crl": "crl-Cans-CA", - "crm": "crm-Cans-CA", "crs": "crs-Latn-SC", "cs": "cs-Latn-CZ", "csb": "csb-Latn-PL", @@ -469,6 +470,7 @@ var maxLikelySubtags = { "he": "he-Hebr-IL", "hhy": "hhy-Latn-ZZ", "hi": "hi-Deva-IN", + "hi-Latn": "hi-Latn-IN", "hia": "hia-Latn-ZZ", "hif": "hif-Latn-FJ", "hig": "hig-Latn-ZZ", @@ -493,6 +495,7 @@ var maxLikelySubtags = { "ht": "ht-Latn-HT", "hu": "hu-Latn-HU", "hui": "hui-Latn-ZZ", + "hur": "hur-Latn-CA", "hy": "hy-Armn-AM", "hz": "hz-Latn-NA", "ia": "ia-Latn-001", @@ -515,7 +518,6 @@ var maxLikelySubtags = { "ijj": "ijj-Latn-ZZ", "ik": "ik-Latn-US", "ikk": "ikk-Latn-ZZ", - "ikt": "ikt-Latn-CA", "ikw": "ikw-Latn-ZZ", "ikx": "ikx-Latn-ZZ", "ilo": "ilo-Latn-PH", @@ -559,6 +561,7 @@ var maxLikelySubtags = { "kaj": "kaj-Latn-NG", "kam": "kam-Latn-KE", "kao": "kao-Latn-ML", + "kaw": "kaw-Kawi-ID", "kbd": "kbd-Cyrl-RU", "kbm": "kbm-Latn-ZZ", "kbp": "kbp-Latn-ZZ", @@ -674,6 +677,7 @@ var maxLikelySubtags = { "kvx": "kvx-Arab-PK", "kw": "kw-Latn-GB", "kwj": "kwj-Latn-ZZ", + "kwk": "kwk-Latn-CA", "kwo": "kwo-Latn-ZZ", "kwq": "yam-Latn-ZZ", "kxa": "kxa-Latn-ZZ", @@ -726,6 +730,7 @@ var maxLikelySubtags = { "lig": "lig-Latn-ZZ", "lih": "lih-Latn-ZZ", "lij": "lij-Latn-IT", + "lil": "lil-Latn-CA", "lis": "lis-Lisu-CN", "ljp": "ljp-Latn-ID", "lki": "lki-Arab-IR", @@ -807,6 +812,7 @@ var maxLikelySubtags = { "mhi": "mhi-Latn-ZZ", "mhl": "mhl-Latn-ZZ", "mi": "mi-Latn-NZ", + "mic": "mic-Latn-CA", "mif": "mif-Latn-ZZ", "min": "min-Latn-ID", "miw": "miw-Latn-ZZ", @@ -956,6 +962,9 @@ var maxLikelySubtags = { "nzi": "nzi-Latn-GH", "oc": "oc-Latn-FR", "ogc": "ogc-Latn-ZZ", + "oj": "oj-Cans-CA", + "ojs": "ojs-Cans-CA", + "oka": "oka-Latn-CA", "okr": "okr-Latn-ZZ", "okv": "okv-Latn-ZZ", "om": "om-Latn-ET", @@ -1005,6 +1014,7 @@ var maxLikelySubtags = { "pon": "pon-Latn-FM", "ppa": "bfy-Deva-IN", "ppo": "ppo-Latn-ZZ", + "pqm": "pqm-Latn-CA", "pra": "pra-Khar-PK", "prd": "prd-Arab-IR", "prg": "prg-Latn-001", @@ -1068,9 +1078,9 @@ var maxLikelySubtags = { "scl": "scl-Arab-ZZ", "scn": "scn-Latn-IT", "sco": "sco-Latn-GB", - "scs": "scs-Latn-CA", "sd": "sd-Arab-PK", "sd-Deva": "sd-Deva-IN", + "sd-IN": "sd-Deva-IN", "sd-Khoj": "sd-Khoj-IN", "sd-Sind": "sd-Sind-IN", "sdc": "sdc-Latn-IT", @@ -1315,7 +1325,7 @@ var maxLikelySubtags = { "und-Arab": "ar-Arab-EG", "und-Arab-CC": "ms-Arab-CC", "und-Arab-CN": "ug-Arab-CN", - "und-Arab-GB": "ks-Arab-GB", + "und-Arab-GB": "ur-Arab-GB", "und-Arab-ID": "ms-Arab-ID", "und-Arab-IN": "ur-Arab-IN", "und-Arab-KH": "cja-Arab-KH", @@ -1376,7 +1386,7 @@ var maxLikelySubtags = { "und-CY": "el-Grek-CY", "und-CZ": "cs-Latn-CZ", "und-Cakm": "ccp-Cakm-BD", - "und-Cans": "cr-Cans-CA", + "und-Cans": "iu-Cans-CA", "und-Cari": "xcr-Cari-TR", "und-Cham": "cjm-Cham-VN", "und-Cher": "chr-Cher-US", @@ -1388,7 +1398,7 @@ var maxLikelySubtags = { "und-Cyrl": "ru-Cyrl-RU", "und-Cyrl-AL": "mk-Cyrl-AL", "und-Cyrl-BA": "sr-Cyrl-BA", - "und-Cyrl-GE": "os-Cyrl-GE", + "und-Cyrl-GE": "ab-Cyrl-GE", "und-Cyrl-GR": "mk-Cyrl-GR", "und-Cyrl-MD": "uk-Cyrl-MD", "und-Cyrl-RO": "bg-Cyrl-RO", @@ -1459,9 +1469,8 @@ var maxLikelySubtags = { "und-Hano": "hnn-Hano-PH", "und-Hans": "zh-Hans-CN", "und-Hant": "zh-Hant-TW", + "und-Hant-CA": "yue-Hant-CA", "und-Hebr": "he-Hebr-IL", - "und-Hebr-CA": "yi-Hebr-CA", - "und-Hebr-GB": "yi-Hebr-GB", "und-Hebr-SE": "yi-Hebr-SE", "und-Hebr-UA": "yi-Hebr-UA", "und-Hebr-US": "yi-Hebr-US", @@ -1494,6 +1503,7 @@ var maxLikelySubtags = { "und-KZ": "ru-Cyrl-KZ", "und-Kali": "eky-Kali-MM", "und-Kana": "ja-Kana-JP", + "und-Kawi": "kaw-Kawi-ID", "und-Khar": "pra-Khar-PK", "und-Khmr": "km-Khmr-KH", "und-Khoj": "sd-Khoj-IN", @@ -1582,6 +1592,7 @@ var maxLikelySubtags = { "und-NL": "nl-Latn-NL", "und-NO": "nb-Latn-NO", "und-NP": "ne-Deva-NP", + "und-Nagm": "unr-Nagm-IN", "und-Nand": "sa-Nand-IN", "und-Narb": "xna-Narb-SA", "und-Nbat": "arc-Nbat-JO", @@ -1874,8 +1885,8 @@ var maxLikelySubtags = { }; // Extracted from likelySubtags.xml. -// Derived from CLDR Supplemental Data, version 40. -// https://unicode.org/Public/cldr/40/core.zip +// Derived from CLDR Supplemental Data, version 41. +// https://unicode.org/Public/cldr/41/core.zip var minLikelySubtags = { "aa-Latn-DJ": "aa-DJ", "aa-Latn-ET": "aa", @@ -2068,6 +2079,7 @@ var minLikelySubtags = { "bku-Buhd-PH": "bku-Buhd", "bku-Latn-PH": "bku", "bkv-Latn-ZZ": "bkv", + "bla-Latn-CA": "bla", "blt-Tavt-VN": "blt", "bm-Latn-ML": "bm", "bmh-Latn-ZZ": "bmh", @@ -2152,6 +2164,7 @@ var minLikelySubtags = { "cko-Latn-ZZ": "cko", "cky-Latn-ZZ": "cky", "cla-Latn-ZZ": "cla", + "clc-Latn-CA": "clc", "cme-Latn-ZZ": "cme", "cmg-Soyo-MN": "cmg", "cmg-Zanb-MN": "cmg-Zanb", @@ -2159,11 +2172,10 @@ var minLikelySubtags = { "cop-Copt-EG": "cop", "cps-Latn-PH": "cps", "cr-Cans-CA": "cr", + "crg-Latn-CA": "crg", "crh-Cyrl-UA": "crh", - "crj-Cans-CA": "crj", "crk-Cans-CA": "crk", "crl-Cans-CA": "crl", - "crm-Cans-CA": "crm", "crs-Latn-SC": "crs", "cs-Latn-CZ": "cs", "csb-Latn-PL": "csb", @@ -2446,6 +2458,7 @@ var minLikelySubtags = { "he-Hebr-IL": "he", "hhy-Latn-ZZ": "hhy", "hi-Deva-IN": "hi", + "hi-Latn-IN": "hi-Latn", "hi-Mahj-IN": "hi-Mahj", "hia-Latn-ZZ": "hia", "hif-Deva-FJ": "hif-Deva", @@ -2476,6 +2489,7 @@ var minLikelySubtags = { "hu-Hung-HU": "hu-Hung", "hu-Latn-HU": "hu", "hui-Latn-ZZ": "hui", + "hur-Latn-CA": "hur", "hy-Armn-AM": "hy", "hz-Latn-NA": "hz", "ia-Latn-001": "ia", @@ -2498,7 +2512,6 @@ var minLikelySubtags = { "ijj-Latn-ZZ": "ijj", "ik-Latn-US": "ik", "ikk-Latn-ZZ": "ikk", - "ikt-Latn-CA": "ikt", "ikw-Latn-ZZ": "ikw", "ikx-Latn-ZZ": "ikx", "ilo-Latn-PH": "ilo", @@ -2541,6 +2554,7 @@ var minLikelySubtags = { "kaj-Latn-NG": "kaj", "kam-Latn-KE": "kam", "kao-Latn-ML": "kao", + "kaw-Kawi-ID": "kaw", "kbd-Cyrl-RU": "kbd", "kbd-Cyrl-TR": "kbd-TR", "kbm-Latn-ZZ": "kbm", @@ -2632,7 +2646,6 @@ var minLikelySubtags = { "krl-Latn-RU": "krl", "krs-Latn-ZZ": "krs", "kru-Deva-IN": "kru", - "ks-Arab-GB": "ks-GB", "ks-Arab-IN": "ks", "ksb-Latn-TZ": "ksb", "ksd-Latn-ZZ": "ksd", @@ -2664,6 +2677,7 @@ var minLikelySubtags = { "kvx-Arab-PK": "kvx", "kw-Latn-GB": "kw", "kwj-Latn-ZZ": "kwj", + "kwk-Latn-CA": "kwk", "kwo-Latn-ZZ": "kwo", "kxa-Latn-ZZ": "kxa", "kxc-Ethi-ZZ": "kxc", @@ -2708,6 +2722,7 @@ var minLikelySubtags = { "lig-Latn-ZZ": "lig", "lih-Latn-ZZ": "lih", "lij-Latn-IT": "lij", + "lil-Latn-CA": "lil", "lis-Lisu-CN": "lis", "ljp-Latn-ID": "ljp", "lki-Arab-IR": "lki", @@ -2792,6 +2807,7 @@ var minLikelySubtags = { "mhi-Latn-ZZ": "mhi", "mhl-Latn-ZZ": "mhl", "mi-Latn-NZ": "mi", + "mic-Latn-CA": "mic", "mif-Latn-ZZ": "mif", "min-Latn-ID": "min", "miw-Latn-ZZ": "miw", @@ -2952,6 +2968,9 @@ var minLikelySubtags = { "nzi-Latn-GH": "nzi", "oc-Latn-FR": "oc", "ogc-Latn-ZZ": "ogc", + "oj-Cans-CA": "oj", + "ojs-Cans-CA": "ojs", + "oka-Latn-CA": "oka", "okr-Latn-ZZ": "okr", "okv-Latn-ZZ": "okv", "om-Latn-ET": "om", @@ -3002,6 +3021,7 @@ var minLikelySubtags = { "pnt-Grek-GR": "pnt", "pon-Latn-FM": "pon", "ppo-Latn-ZZ": "ppo", + "pqm-Latn-CA": "pqm", "pra-Khar-PK": "pra", "prd-Arab-IR": "prd", "prg-Latn-001": "prg", @@ -3082,9 +3102,8 @@ var minLikelySubtags = { "scl-Arab-ZZ": "scl", "scn-Latn-IT": "scn", "sco-Latn-GB": "sco", - "scs-Latn-CA": "scs", "sd-Arab-PK": "sd", - "sd-Deva-IN": "sd-Deva", + "sd-Deva-IN": "sd-IN", "sd-Khoj-IN": "sd-Khoj", "sd-Sind-IN": "sd-Sind", "sdc-Latn-IT": "sdc", @@ -3305,7 +3324,9 @@ var minLikelySubtags = { "und-Latn-HM": "und-HM", "unr-Beng-IN": "unr", "unr-Deva-NP": "unr-NP", + "unr-Nagm-IN": "unr-Nagm", "unx-Beng-IN": "unx", + "ur-Arab-GB": "ur-GB", "ur-Arab-IN": "ur-IN", "ur-Arab-MU": "ur-MU", "ur-Arab-PK": "ur", @@ -3409,8 +3430,6 @@ var minLikelySubtags = { "ygr-Latn-ZZ": "ygr", "ygw-Latn-ZZ": "ygw", "yi-Hebr-001": "yi", - "yi-Hebr-CA": "yi-CA", - "yi-Hebr-GB": "yi-GB", "yi-Hebr-SE": "yi-SE", "yi-Hebr-UA": "yi-UA", "yi-Hebr-US": "yi-US", @@ -3427,6 +3446,7 @@ var minLikelySubtags = { "yss-Latn-ZZ": "yss", "yua-Latn-MX": "yua", "yue-Hans-CN": "yue-CN", + "yue-Hant-CA": "yue-CA", "yue-Hant-HK": "yue", "yuj-Latn-ZZ": "yuj", "yut-Latn-ZZ": "yut",