Skip to content

Commit d480fc2

Browse files
CLDR-18437 Remove duplicate language alias for Mandingo (#4572)
1 parent 7ef3c2d commit d480fc2

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

common/supplemental/supplementalMetadata.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,6 @@ For terms of use, see http://www.unicode.org/copyright.html
304304
<languageAlias type="zsm" replacement="ms" reason="macrolanguage"/> <!-- Standard Malay ⇒ Malay -->
305305
<languageAlias type="zyb" replacement="za" reason="macrolanguage"/> <!-- Yongbei Zhuang ⇒ Zhuang -->
306306
<languageAlias type="him" replacement="srx" reason="macrolanguage"/> <!-- Himachali ⇒ Sirmauri (= Pahari, Himachali) -->
307-
<languageAlias type="mnk" replacement="man" reason="macrolanguage"/> <!-- Mandinka ⇒ Mandingo -->
308307
<languageAlias type="bh" replacement="bho" reason="macrolanguage"/> <!-- Bihari ⇒ Bhojpuri -->
309308
<languageAlias type="cls" replacement="sa" reason="macrolanguage"/> <!-- Classical Sanskrit ⇒ Sanskrit -->
310309
<!-- Special case <languageAlias type="nb" replacement="no" reason="macrolanguage"/> <! - - Norwegian Bokmål ⇒ Norwegian -->

common/testData/localeIdentifiers/localeCanonicalization.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,6 @@ mhr ; chm
290290
mkd ; mk
291291
mlg ; mg
292292
mlt ; mt
293-
mnk ; man
294293
mnt ; wnn
295294
mo ; ro
296295
mof ; xnt
@@ -1557,7 +1556,6 @@ mhr_Adlm_AC_fonipa ; chm_Adlm_AC_fonipa
15571556
mkd_Adlm_AC_fonipa ; mk_Adlm_AC_fonipa
15581557
mlg_Adlm_AC_fonipa ; mg_Adlm_AC_fonipa
15591558
mlt_Adlm_AC_fonipa ; mt_Adlm_AC_fonipa
1560-
mnk_Adlm_AC_fonipa ; man_Adlm_AC_fonipa
15611559
mnt_Adlm_AC_fonipa ; wnn_Adlm_AC_fonipa
15621560
mo_Adlm_AC_fonipa ; ro_Adlm_AC_fonipa
15631561
mof_Adlm_AC_fonipa ; xnt_Adlm_AC_fonipa

common/validity/language.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<supplementalData>
1313
<version number="$Revision$"/>
1414
<idValidity>
15-
<id type='language' idStatus='regular'> <!-- 7963 items -->
15+
<id type='language' idStatus='regular'> <!-- 7964 items -->
1616
aa aaa~i aak~l aan~q aas~x aaz
1717
ab aba~j abl~z
1818
aca~b acd~f ach~i ack~n acp~z
@@ -321,7 +321,7 @@
321321
mk mka~c mke~z
322322
ml mla~c mle~f mlh~s mlu~x mlz
323323
mma~r mmt~z
324-
mn mna~j mnl~s mnu~z
324+
mn mna~s mnu~z
325325
moa moc~e mog~k mom moo~z
326326
mpa~e mpg~z
327327
mqa~c mqe~z
@@ -625,7 +625,7 @@
625625
mis mul
626626
zxx
627627
</id>
628-
<id type='language' idStatus='deprecated'> <!-- 299 items -->
628+
<id type='language' idStatus='deprecated'> <!-- 298 items -->
629629
aam adp agp ais ajp ajt~u als aoh arb asd aue ayr ayx~y azj
630630
baz bbz bcc bcl bgm bh bhk bic bij bjd bjq bkb blg bmy bpb btb btl bxk bxr bxx byy
631631
cbe cbh cca ccq cdg cjr cka cld cls cmk cmn cnr coy cqu cug cum cwd
@@ -638,7 +638,7 @@
638638
jar jeg ji jw
639639
kbf kdv kgc~d kgh kgm khk kjf kmr knc kng koj kox kpp kpv krm ksa ktr kvs kwq kxe kxl kxu kzh kzj kzt
640640
lak lba lbk leg lii llo lmm lmz lno lsg lvs
641-
meg mgx mhh mhr mja mld mnk mnt mo mof mst mup mvm mwd mwj mwx~y myd myi myq myt
641+
meg mgx mhh mhr mja mld mnt mo mof mst mup mvm mwd mwj mwx~y myd myi myq myt
642642
nad nbf nbx ncp ngo nln nlr nns nnx nom noo npi nte nts nxu
643643
ojg ome ory oun
644644
pat pbu pbz pcr pes pgy pii plj plp plt pmc pmk pmu pnb pod ppa ppr prb prp prs pry puk puz

tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestValidity.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,9 @@ public void TestBasicValidity() {
141141
"SLE",
142142
// 2024
143143
"dzd",
144-
"knn");
144+
"knn",
145+
// 2025
146+
"mnk");
145147
static final Set<String> ALLOWED_MISSING =
146148
ImmutableSet.of(LocaleNames.ROOT, "POSIX", "REVISED", "SAAHO");
147149
static final Set<String> ALLOWED_REGULAR_TO_SPECIAL = ImmutableSet.of("Zanb", "Zinh", "Zyyy");
@@ -586,6 +588,7 @@ private <T, U extends Collection<T>> Set<T> setDifference(U a, U b) {
586588
return diff;
587589
}
588590

591+
// Shows the items in set A that are not in set B
589592
private <T> Set<T> showMinus(String title, LstrType lstrType, Set<T> a, Set<T> b) {
590593
if (a == null) {
591594
a = Collections.emptySet();

0 commit comments

Comments
 (0)