CLDR-15391 Restore cwd->cr alias, add likely subtags override instead.

I'll note that Cree is only official in the Northern Territories (NT). However [the NT law](https://web.archive.org/web/20090324202430/http://www.justice.gov.nt.ca/PDF/ACTS/Official_Languages.pdf) does not specify which Cree variation -- the only Cree language present in NT is Plains Cree [crk] so I infer that is the correct match.
conradarcturus · Nov 21, 2024 · 1f00d07 · 1f00d07
1 parent 0ea6e66
commit 1f00d07
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 6 deletions.
diff --git a/common/supplemental/supplementalData.xml b/common/supplemental/supplementalData.xml
@@ -1475,12 +1475,12 @@ XXX Code for transations where no currency is involved
 		<language type="cop" scripts="Arab Copt Grek" territories="EG" alt="secondary"/>
 		<language type="cps" scripts="Latn"/>
 		<language type="cr" scripts="Cans Latn"/>
-		<language type="cr" territories="CA" alt="secondary"/>
 		<language type="crg" scripts="Latn"/>
 		<language type="crh" scripts="Cyrl"/>
 		<language type="crj" scripts="Cans"/>
 		<language type="crj" scripts="Latn" alt="secondary"/>
 		<language type="crk" scripts="Cans"/>
+		<language type="crk" territories="CA" alt="secondary"/>
 		<language type="crl" scripts="Cans"/>
 		<language type="crl" scripts="Latn" alt="secondary"/>
 		<language type="crm" scripts="Cans"/>
@@ -2047,6 +2047,7 @@ XXX Code for transations where no currency is involved
 		<language type="oj" scripts="Cans"/>
 		<language type="oj" scripts="Latn" alt="secondary"/>
 		<language type="ojs" scripts="Cans"/>
+		<language type="ojw" scripts="Latn"/>
 		<language type="oka" scripts="Latn"/>
 		<language type="om" scripts="Latn"/>
 		<language type="om" scripts="Ethi" territories="ET" alt="secondary"/>
@@ -2686,7 +2687,6 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="ro" populationPercent="0.32" references="R1019"/>	<!--Romanian-->
 			<languagePopulation type="nl" populationPercent="0.3" references="R1019"/>	<!--Dutch-->
 			<languagePopulation type="ja" populationPercent="0.27" references="R1019"/>	<!--Japanese-->
-			<languagePopulation type="cr" populationPercent="0.24" officialStatus="official_regional" references="R1019"/>	<!--Cree-->
 			<languagePopulation type="sr" populationPercent="0.23" references="R1019"/>	<!--Serbian-->
 			<languagePopulation type="tr" populationPercent="0.22" references="R1019"/>	<!--Turkish-->
 			<languagePopulation type="hr" populationPercent="0.2" references="R1019"/>	<!--Croatian-->
@@ -2697,13 +2697,13 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="pdt" populationPercent="0.11" references="R1019"/>	<!--Plautdietsch-->
 			<languagePopulation type="oj" populationPercent="0.072" references="R1019"/>	<!--Ojibwa-->
 			<languagePopulation type="ojs" populationPercent="0.042" references="R1019"/>	<!--Oji-Cree-->
-			<languagePopulation type="crk" populationPercent="0.033" references="R1019"/>	<!--Plains Cree-->
+			<languagePopulation type="crk" populationPercent="0.033" officialStatus="official_regional" references="R1019"/>	<!--Plains Cree-->
 			<languagePopulation type="chp" populationPercent="0.032" officialStatus="official_regional" references="R1019"/>	<!--Chipewyan-->
 			<languagePopulation type="moe" populationPercent="0.03" references="R1019"/>	<!--Innu-aimun-->
 			<languagePopulation type="mic" populationPercent="0.024" references="R1019"/>	<!--Mi'kmaw-->
 			<languagePopulation type="atj" populationPercent="0.018" references="R1019"/>	<!--Atikamekw-->
 			<languagePopulation type="bla" populationPercent="0.017" references="R1019"/>	<!--Siksiká-->
-			<languagePopulation type="cwd" populationPercent="0.013" references="R1019"/>	<!--Woods Cree-->
+			<languagePopulation type="cr" populationPercent="0.013" references="R1019"/>	<!--Cree-->
 			<languagePopulation type="crl" populationPercent="0.013" references="R1019"/>	<!--Northern East Cree-->
 			<languagePopulation type="csw" populationPercent="0.012" references="R1019"/>	<!--Swampy Cree-->
 			<languagePopulation type="war" populationPercent="0.012" references="R1019"/>	<!--Waray-->

diff --git a/common/supplemental/supplementalMetadata.xml b/common/supplemental/supplementalMetadata.xml
@@ -253,6 +253,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<languageAlias type="bxr" replacement="bua" reason="macrolanguage"/> <!-- Buriat, Russia ⇒ Buriat -->
 			<languageAlias type="cld" replacement="syr" reason="macrolanguage"/> <!-- Chaldean Neo-Aramaic ⇒ Syriac -->
 			<languageAlias type="cmn" replacement="zh" reason="macrolanguage"/> <!-- Mandarin Chinese ⇒ Chinese -->
+			<languageAlias type="cwd" replacement="cr" reason="macrolanguage"/> <!-- Cree, Woods ⇒ Cree -->
 			<languageAlias type="dgo" replacement="doi" reason="macrolanguage"/> <!-- Dogri ⇒ Dogri (macrolanguage) -->
 			<languageAlias type="dhd" replacement="mwr" reason="macrolanguage"/> <!-- Dhundari ⇒ Marwari -->
 			<languageAlias type="dik" replacement="din" reason="macrolanguage"/> <!-- Southwestern Dinka ⇒ Dinka -->

diff --git a/common/testData/localeIdentifiers/localeCanonicalization.txt b/common/testData/localeIdentifiers/localeCanonicalization.txt
@@ -117,6 +117,7 @@ cos	;	co
 coy	;	pij
 cqu	;	quh
 cre	;	cr
+cwd	;	cr
 cym	;	cy
 cze	;	cs
 daf	;	dnj
@@ -1354,6 +1355,7 @@ cos_Adlm_AC_fonipa	;	co_Adlm_AC_fonipa
 coy_Adlm_AC_fonipa	;	pij_Adlm_AC_fonipa
 cqu_Adlm_AC_fonipa	;	quh_Adlm_AC_fonipa
 cre_Adlm_AC_fonipa	;	cr_Adlm_AC_fonipa
+cwd_Adlm_AC_fonipa	;	cr_Adlm_AC_fonipa
 cym_Adlm_AC_fonipa	;	cy_Adlm_AC_fonipa
 cze_Adlm_AC_fonipa	;	cs_Adlm_AC_fonipa
 daf_Adlm_AC_fonipa	;	dnj_Adlm_AC_fonipa

diff --git a/tools/cldr-code/src/main/java/org/unicode/cldr/tool/GenerateLikelySubtags.java b/tools/cldr-code/src/main/java/org/unicode/cldr/tool/GenerateLikelySubtags.java
@@ -516,6 +516,10 @@ public static void main(String[] args) throws IOException {
                                 {"arc_Hatr", "arc_Hatr_IQ"},
                                 {"hnj_Hmng", "hnj_Hmng_LA"},
                                 {"bap_Krai", "bap_Krai_IN"},
+
+                                // Cree (macrolanguage) [cr] is spoken by more people than Inukitut [iu]
+                                {"und_Cans", "cr_Cans_CA"},
+                                {"und_Cans_CA", "cr_Cans_CA"},
                             });
 
     /**

diff --git a/...s/cldr-code/src/main/resources/org/unicode/cldr/util/data/country_language_population.tsv b/...s/cldr-code/src/main/resources/org/unicode/cldr/util/data/country_language_population.tsv
@@ -203,7 +203,6 @@ Canada	CA	"36,328,480"	99%	"1,774,000,000,000"		Bangla	bn	0.331%			https://www15
 Canada	CA	"36,328,480"	99%	"1,774,000,000,000"		Romanian	ro	0.320%			https://www150.statcan.gc.ca/t1/tbl1/en/tv.action?pid=9810021601 Canada 2021 Census language "Knowledge of Language"; official status from Wikipedia Languages_of_Canada
 Canada	CA	"36,328,480"	99%	"1,774,000,000,000"		Dutch	nl	0.297%			https://www150.statcan.gc.ca/t1/tbl1/en/tv.action?pid=9810021601 Canada 2021 Census language "Knowledge of Language"; official status from Wikipedia Languages_of_Canada
 Canada	CA	"36,328,480"	99%	"1,774,000,000,000"		Japanese	ja	0.269%			https://www150.statcan.gc.ca/t1/tbl1/en/tv.action?pid=9810021601 Canada 2021 Census language "Knowledge of Language"; official status from Wikipedia Languages_of_Canada
-Canada	CA	"36,328,480"	99%	"1,774,000,000,000"	official_regional	Cree	cr	0.241%			https://www150.statcan.gc.ca/t1/tbl1/en/tv.action?pid=9810021601 Canada 2021 Census language "Knowledge of Language"; official status from Wikipedia Languages_of_Canada
 Canada	CA	"36,328,480"	99%	"1,774,000,000,000"		Serbian	sr	0.230%			https://www150.statcan.gc.ca/t1/tbl1/en/tv.action?pid=9810021601 Canada 2021 Census language "Knowledge of Language"; official status from Wikipedia Languages_of_Canada
 Canada	CA	"36,328,480"	99%	"1,774,000,000,000"		Turkish	tr	0.216%			https://www150.statcan.gc.ca/t1/tbl1/en/tv.action?pid=9810021601 Canada 2021 Census language "Knowledge of Language"; official status from Wikipedia Languages_of_Canada
 Canada	CA	"36,328,480"	99%	"1,774,000,000,000"		Croatian	hr	0.203%			https://www150.statcan.gc.ca/t1/tbl1/en/tv.action?pid=9810021601 Canada 2021 Census language "Knowledge of Language"; official status from Wikipedia Languages_of_Canada
@@ -214,7 +213,7 @@ Canada	CA	"36,328,480"	99%	"1,774,000,000,000"	official_regional	Inuktitut (Lati
 Canada	CA	"36,328,480"	99%	"1,774,000,000,000"		Plautdietsch	pdt	0.113%			https://www150.statcan.gc.ca/t1/tbl1/en/tv.action?pid=9810021601 Canada 2021 Census language "Knowledge of Language"; official status from Wikipedia Languages_of_Canada
 Canada	CA	"36,328,480"	99%	"1,774,000,000,000"		Ojibwa	oj	0.0720%			https://www150.statcan.gc.ca/t1/tbl1/en/tv.action?pid=9810021601 Canada 2021 Census language "Knowledge of Language"; official status from Wikipedia Languages_of_Canada
 Canada	CA	"36,328,480"	99%	"1,774,000,000,000"		Oji-Cree	ojs	0.0421%			https://www150.statcan.gc.ca/t1/tbl1/en/tv.action?pid=9810021601 Canada 2021 Census language "Knowledge of Language"; official status from Wikipedia Languages_of_Canada
-Canada	CA	"36,328,480"	99%	"1,774,000,000,000"	recognized	Plains Cree	crk	0.0330%			https://www150.statcan.gc.ca/t1/tbl1/en/tv.action?pid=9810021601 Canada 2021 Census language "Knowledge of Language"; official status from Wikipedia Languages_of_Canada
+Canada	CA	"36,328,480"	99%	"1,774,000,000,000"	official_regional	Plains Cree	crk	0.0330%			https://www150.statcan.gc.ca/t1/tbl1/en/tv.action?pid=9810021601 Canada 2021 Census language "Knowledge of Language"; official status from Wikipedia Languages_of_Canada
 Canada	CA	"36,328,480"	99%	"1,774,000,000,000"	official_regional	Chipewyan	chp	0.0318%			https://www150.statcan.gc.ca/t1/tbl1/en/tv.action?pid=9810021601 Canada 2021 Census language "Knowledge of Language"; official status from Wikipedia Languages_of_Canada
 Canada	CA	"36,328,480"	99%	"1,774,000,000,000"	recognized	Innu-aimun	moe	0.0295%			https://www150.statcan.gc.ca/t1/tbl1/en/tv.action?pid=9810021601 Canada 2021 Census language "Knowledge of Language"; official status from Wikipedia Languages_of_Canada
 Canada	CA	"36,328,480"	99%	"1,774,000,000,000"		Mi'kmaq	mic	0.0254%			https://www150.statcan.gc.ca/t1/tbl1/en/tv.action?pid=9810021601 Canada 2021 Census language "Knowledge of Language"; official status from Wikipedia Languages_of_Canada

diff --git a/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/language_script.tsv b/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/language_script.tsv
@@ -172,6 +172,8 @@ cs	Czech	primary	Latn	Latin
 csb	Kashubian	secondary	Latn	Latin
 csw	Swampy Cree	primary	Cans	Unified Canadian Aboriginal Syllabics
 ctd	Tedim Chin	primary	Latn	Latin
+cwd	Woods Cree	primary	Cans	Unified Canadian Aboriginal Syllabics
+cwd	Woods Cree	secondary	Latn	Latin
 cu	Church Slavic	secondary	Cyrl	Cyrillic
 cv	Chuvash	primary	Cyrl	Cyrillic
 cy	Welsh	primary	Latn	Latin
@@ -613,6 +615,7 @@ oc	Occitan	primary	Latn	Latin
 oj	Ojibwa	primary	Cans	Unified Canadian Aboriginal Syllabics
 oj	Ojibwa	secondary	Latn	Latin
 ojs	Oji-Cree	primary	Cans	Unified Canadian Aboriginal Syllabics
+ojw	Western Ojibway	primary	Latn	Latin
 oka	Okanagan	primary	Latn	Latin
 om	Oromo	primary	Latn	Latin
 om	Oromo	secondary	Ethi	Ethiopic