Skip to content

Commit

Permalink
CLDR-15391 GenerateLikelySubtags cleanup
Browse files Browse the repository at this point in the history 
Removed hardcoded _CA entries because they aren't necessary since the likely subtags can be derived from the population data.

Also edited the cr_Cans_CA comment because it was overflowing the line and to add more context.

CLDR-15931 Restore und_Cans -> iu_Cans_CA

After discussing with the DDL committee, especially with someone who works with the Cree community -- we decided it was best to treat the Cree languages as separate languages and not a macrolanguage. For CLDR's purposes, [cr] is an alias of [cwd] / Woods Cree, so the likely subtag should not be cr_Cans_CA.
  • Loading branch information
@conradarcturus
conradarcturus committed Nov 25, 2024
1 parent 0499000 commit 482f146
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 18 deletions.
2 changes: 1 addition & 1 deletion common/supplemental/likelySubtags.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1089,7 +1089,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
<likelySubtag from="und_Bugi" to="bug_Bugi_ID"/> <!--?‧Buginese‧? ➡ Buginese‧Buginese‧Indonesia-->
<likelySubtag from="und_Buhd" to="bku_Buhd_PH"/> <!--?‧Buhid‧? ➡ Buhid‧Buhid‧Philippines-->
<likelySubtag from="und_Cakm" to="ccp_Cakm_BD"/> <!--?‧Chakma‧? ➡ Chakma‧Chakma‧Bangladesh-->
<likelySubtag from="und_Cans" to="cr_Cans_CA"/> <!--?‧Unified Canadian Aboriginal Syllabics‧? ➡ Cree‧Unified Canadian Aboriginal Syllabics‧Canada-->
<likelySubtag from="und_Cans" to="iu_Cans_CA"/> <!--?‧Unified Canadian Aboriginal Syllabics‧? ➡ Inuktitut‧Unified Canadian Aboriginal Syllabics‧Canada-->
<likelySubtag from="und_Cari" to="xcr_Cari_TR"/> <!--?‧Carian‧? ➡ Carian‧Carian‧Türkiye-->
<likelySubtag from="und_Cham" to="cjm_Cham_VN"/> <!--?‧Cham‧? ➡ Eastern Cham‧Cham‧Vietnam-->
<likelySubtag from="und_Cher" to="chr_Cher_US"/> <!--?‧Cherokee‧? ➡ Cherokee‧Cherokee‧United States-->
Expand Down
6 changes: 3 additions & 3 deletions common/testData/localeIdentifiers/likelySubtags.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1154,9 +1154,9 @@ und-CW ; pap-Latn-CW ; pap ;
und-CX ; en-Latn-CX ; en-CX ;
und-CY ; el-Grek-CY ; el-CY ;
und-CZ ; cs-Latn-CZ ; cs ;
und-Cans ; cr-Cans-CA ; cr ;
und-Cans-AQ ; cr-Cans-AQ ; cr-AQ ;
und-Cans-CA ; cr-Cans-CA ; cr ;
und-Cans ; iu-Cans-CA ; iu ;
und-Cans-AQ ; iu-Cans-AQ ; iu-AQ ;
und-Cans-CA ; iu-Cans-CA ; iu ;
und-Cher ; chr-Cher-US ; chr ;
und-Cher-AQ ; chr-Cher-AQ ; chr-AQ ;
und-Cher-US ; chr-Cher-US ; chr ;
Expand Down
14 changes: 0 additions & 14 deletions tools/cldr-code/src/main/java/org/unicode/cldr/tool/GenerateLikelySubtags.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,6 @@ public static void main(String[] args) throws IOException {
"kby_Arab_NE",
"kdh_Latn_TG",
"zlm_Latn_MY",
"cr_Cans_CA",
"hif_Latn_FJ",
"gon_Telu_IN",
"lzz_Latn_TR",
Expand All @@ -330,14 +329,6 @@ public static void main(String[] args) throws IOException {
"blt_Tavt_VN",
"rhg_Arab_MM",
"rhg_Rohg_MM",
"clc_Latn_CA",
"crg_Latn_CA",
"hur_Latn_CA",
"kwk_Latn_CA",
"lil_Latn_CA",
"ojs_Cans_CA",
"oka_Latn_CA",
"pqm_Latn_CA",
"no_Latn_NO",
"tok_Latn_001",
"prg_Latn_PL",
Expand Down Expand Up @@ -466,7 +457,6 @@ public static void main(String[] args) throws IOException {

// {"und_Cyrl_PL", "be_Cyrl_PL"},

// {"cr", "cr_Cans_CA"},
// {"hif", "hif_Latn_FJ"},
// {"gon", "gon_Telu_IN"},
// {"lif", "lif_Deva_NP"},
Expand Down Expand Up @@ -516,10 +506,6 @@ 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"},
});

/**
Expand Down

0 comments on commit 482f146

Please sign in to comment.