Skip to content

Commit

Permalink
CLDR-14093 CLDR 38 BRS A11 (unicode-org#667)
Browse files Browse the repository at this point in the history
* CLDR-14093 BRS A11 Update Language/Script/Region Subtags

-In progress; last step done was: Do validity checks and regenerate

-See http:https://cldr.unicode.org/development/updating-codes/update-languagescriptregion-subtags

* CLDR-14093 BRS A11 update aliases for validity

Co-authored-by: btangmu <[email protected]>
  • Loading branch information
srl295 and btangmu committed Aug 26, 2020
1 parent d6fc7ea commit cd8cdc3
Show file tree
Hide file tree
Showing 10 changed files with 423 additions and 143 deletions.
9 changes: 8 additions & 1 deletion common/supplemental/supplementalMetadata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,6 @@ For terms of use, see http:https://www.unicode.org/copyright.html
<languageAlias type="ymt" replacement="mtm" reason="deprecated"/> <!-- Mator-Taygi-Karagas -->
<languageAlias type="yos" replacement="zom" reason="deprecated"/> <!-- Yos -->
<languageAlias type="yuu" replacement="yug" reason="deprecated"/> <!-- Yugh -->

<languageAlias type="asd" replacement="snz" reason="deprecated"/> <!-- Asas ⇒ Kou -->
<languageAlias type="dit" replacement="dif" reason="deprecated"/> <!-- Diyari ⇒ Dieri -->
<languageAlias type="llo" replacement="ngt" reason="deprecated"/> <!-- Khlor ⇒ Kriang -->
Expand Down Expand Up @@ -190,6 +189,14 @@ For terms of use, see http:https://www.unicode.org/copyright.html
<languageAlias type="wiw" replacement="nwo" reason="deprecated"/> <!-- Wirangu -->
<languageAlias type="yen" replacement="ynq" reason="deprecated"/> <!-- Yendang -->
<languageAlias type="yiy" replacement="yrm" reason="deprecated"/> <!-- Yir Yoront -->
<languageAlias type="drr" replacement="kzk" reason="deprecated"/> <!-- Dororo ⇒ Kazukuru -->
<languageAlias type="gli" replacement="kzk" reason="deprecated"/> <!-- Guliguli ⇒ Kazukuru -->
<languageAlias type="kxl" replacement="kru" reason="deprecated"/> <!-- Nepali Kurux ⇒ Kurukh -->
<languageAlias type="nxu" replacement="bpp" reason="deprecated"/> <!-- Narau ⇒ Kaure -->
<languageAlias type="thw" replacement="ola" reason="deprecated"/> <!-- Thudam ⇒ Walungge -->
<languageAlias type="xrq" replacement="dmw" reason="deprecated"/> <!-- Karranga ⇒ Mudburra -->
<languageAlias type="zir" replacement="scv" reason="deprecated"/> <!-- Ziriya ⇒ Sheni -->
<!-- miscellaneous deprecated -->

<!-- redundant deprecated -->
<languageAlias type="sgn_BR" replacement="bzs" reason="deprecated"/> <!-- Brazilian Sign Language -->
Expand Down
106 changes: 53 additions & 53 deletions common/validity/language.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<supplementalData>
<version number="$Revision$"/>
<idValidity>
<id type='language' idStatus='regular'> <!-- 7904 items -->
<id type='language' idStatus='regular'> <!-- 7908 items -->
aa aaa~i aak~l aan~q aas~x aaz
ab aba~j abl~z
aca~b acd~f ach~i ack~n acp~z
Expand All @@ -28,7 +28,7 @@
ala alc~r alt~z
am ama~c ame~g ami~z
an ana~z
aoa~n aor~u aox aoz
aoa~g aoi~n aor~u aox aoz
apa~z
aqa aqc~d aqg aql~n aqp aqr aqt aqz
ar arc~e arh~l arn~z
Expand All @@ -38,10 +38,10 @@
av avb avd avi avk~o avs~v
awa~e awg~i awk awm~o awr~y
axb axe axg axk~m axx
ay aya~e ayg~i ayk~l ayn~q ays~u ayy~z
ay aya~e ayg~i ayk~l ayn~q ays~u ayz
az aza~d azg azm~o azt azz
ba baa~j bal ban~p bar~y
bba~z
bba~y
bca~b bcd~k bcm~w bcy~z
bda~z
be bea~k bem beo~z
Expand All @@ -55,7 +55,7 @@
bm bma~x bmz
bn bna~g bni~z
bo boa~b boe~r bot~z
bpa~b bpd bpg~z
bpa bpd bpg~z
bqa~d bqf~z
br bra~d brf~z
bs bsa~c bse~y
Expand All @@ -68,23 +68,23 @@
bza~z
ca caa~s cau~z
cba~d cbg cbi~l cbn~o cbq~w cby
cca ccc~e ccg~h ccj ccl~p ccr~s
cda cdc~j cdm~o cdr~s cdy~z
ccc~e ccg~h ccj ccl~p ccr~s
cda cdc~f cdh~j cdm~o cdr~s cdy~z
ce cea~b ceg cek~l cen cet cey
cfa cfd cfg cfm
cga cgc cgg cgk
ch chb~d chf~h chj~r cht chw~z
cia~e cih cik cim~n cip cir ciw ciy
cja cje cjh~i cjk cjm~p cjs cjv cjy
ckb ckh ckl ckn~o ckq~v ckx~z
ckb ckh ckl~o ckq~v ckx~z
cla clc cle clh~m clo clt~u clw cly
cma cmc cme cmg cmi cml~m cmo cmr~t
cna~c cng~i cnk~l cno cns~u cnw~x
cna~c cng~i cnk~l cno~p cns~u cnw~x
co coa~h coj~q cot~x coz
cpa~c cpe~g cpi cpn~p cps cpu cpx~y
cqd
cr cra~d crf~t crv~z
cs csa~o csq~w csy~z
cs csa~w csy~z
cta ctc~e ctg~h ctl~p cts~u ctz
cu cua~c cug~l cuo~y
cv cvg cvn
Expand All @@ -96,34 +96,34 @@
dcc dcr
dda ddd~e ddg ddi~j ddn~o ddr~s ddw
de dec~i dek~n dep~s dev dez
dga~e dgg~i dgk~l dgn dgr~u dgw~x dgz
dga~e dgg~i dgk~l dgn dgr~t dgw~x dgz
dhg dhi dhl~o dhr~s dhu~x
dia~d dif~j dil~p dir~s diu diw~z
dja~f dji~k djm~o djr dju djw
dka dkk dkr~s dkx
dlg dlk dlm~n
dma~e dmg dmk~o dmr~s dmu~y
dma~g dmk~o dmr~s dmu~y
dna dnd~e dng dni~k dnn~o dnr dnt~w dny
doa~c doe~f doh~i dok~l don~t dov~z
dpp
dra~e drg dri drl drn~o drq~u dry
dra~e drg dri drl drn~o drq drs~u dry
dsb dse dsh~i dsl dsn~o dsq
dta~b dtd dth~i dtk dtm~p dtr~u dty
dua~c due~i duk~s duu~z
dv dva
dwa dwr~s dwu dww dwy~z
dwa dwk dwr~s dwu dww dwy~z
dya~b dyd dyg dyi dym~o dyu dyy
dz dza dze dzg dzl dzn
eaa
ebg ebk ebo ebr ebu
ebc ebg ebk ebo ebr ebu
ecr~s ecy
ee eee
efa efe efi
ega egl ego egx~y
ehu
eip eit eiv
eja
eka ekc eke ekg eki ekl~m eko~p ekr eky
eka eke ekg eki ekl~m eko~p ekr eky
el ele elh~i elk elm elo elu elx
ema~b eme emg emi emm~n emp ems emu emw~y
en ena~d enf enh enl~o enq~r enu~x
Expand All @@ -144,7 +144,7 @@
fer
ff ffi ffm
fgr
fi fia fie fil fip fir fit~u fiw
fi fia fie~f fil fip fir fit~u fiw
fj
fkk fkv
fla flh~i fll fln flr fly
Expand All @@ -163,15 +163,15 @@
gba~b gbd~n gbp~s gbu~z
gcc~f gcl gcn gcr gct
gd gda~o gdq~u gdx
gea~d geg~m geq ges gev~z
gea~d gef~m geq ges gev~z
gfk gft
gga~b ggd~e ggg ggk~l ggt~u ggw
gha ghc ghe ghh ghk~l ghn~o ghr~t
gia~e gig~h gil~n gip~u giw~z
gji gjk gjm~n gjr gju
gka gkd~e gkn~p gku
gl glc~d glh~l glo glr glu glw gly
gma~b gmd~e gmg~h gml~n gmq gmu~z
gl glc~d glh glj~l glo glr glu glw gly
gma~b gmd~e gmg~h gml~n gmq~r gmu~z
gn gna~e gng~n gnq~r gnt~u gnw gnz
goa~u gow~z
gpa gpe gpn
Expand All @@ -197,7 +197,7 @@
hka hke hkk hkn hks
hla~b hld~e hlt~u
hma~n hmp~z
hna hnd~e hnh~j hnn~o hns hnu
hna hnd~e hng~j hnn~o hns hnu
ho hoa~e hoh~m hoo~p hor~t hov~w hoy~z
hpo hps
hr hra hrc hre hrk hrm hro~p hrt~u hrw~x hrz
Expand Down Expand Up @@ -265,7 +265,7 @@
kg kga~b kge~g kgi~y
kha~j khl khn~z
ki kia~j kil~m kio~q kis~z
kj kja~v kjx~z
kj kja~e kjg~v kjx~z
kk kka~z
kl kla~z
km kma~q kms~z
Expand All @@ -279,7 +279,7 @@
ku kub~q kus~z
kv kva~r kvt~z
kw kwa~p kwr~z
kxa~d kxf kxh~z
kxa~d kxf kxh~k kxm~t kxv~z
ky kya~z
kza~g kzi kzk~s kzu~z
la laa~n lap~s lau law~z
Expand All @@ -294,7 +294,7 @@
lja lje lji ljl ljp ljw~x
lka~e lkh~j lkl~o lkr~u lky
lla~n llp~q lls llu llx
lma~l lmn~r lmu~z
lma~l lmn~r lmu~y
ln lna~b lnd lng~j lnl~o lns lnu lnw lnz
lo loa~c loe~z
lpa lpe lpn~o lpx
Expand Down Expand Up @@ -350,12 +350,12 @@
npa~b npg~h npl npn~o nps npu npx~y
nqg nqk~o nqq nqy
nr nra~c nre~g nri nrk~n nrp nrr nrt~u nrx nrz
nsa nsc~i nsk~z
nsa~i nsk~z
ntd~e ntg nti~k ntm nto~p ntr ntu ntw~z
nua~z
nv nvh nvm nvo
nwa~c nwe nwg nwi nwm nwo nwr nwx~y
nxa nxd~e nxg nxi nxk~o nxq~r nxu nxx
nxa nxd~e nxg nxi nxk~o nxq~r nxx
ny nyb~y
nza~b nzd nzi nzk nzm nzs nzu nzy~z
oaa oac oar oav
Expand Down Expand Up @@ -392,7 +392,7 @@
pi pia~j pil~p pir~z
pjt
pka~c pkg~h pkn~p pkr~u
pl pla~h plj~l pln~s plu~w ply~z
pl pla~h plj~l pln~o plq~s plu~w ply~z
pma~b pmd~f pmh~o pmq~t pmw~z
pna pnc~e png~z
poc poe~i pok pom~q pos~t pov~z
Expand Down Expand Up @@ -436,7 +436,7 @@
sa saa~f sah~m sao saq~z
sba~z
sc scb sce~i sck~l scn~q scs~x
sd sda~c sde~h sdj~p sdr~v sdx sdz
sd sda~c sde~h sdj~l sdn~v sdx sdz
se sea~w sey~z
sfb sfe sfm sfs sfw
sg sga~e sgg~k sgm~n sgp sgr~u sgw~z
Expand All @@ -460,13 +460,13 @@
sya~d syi syk~o syr~s syw~y
sza~e szg szl szn szp szs szv~w szy
ta taa~g tai~l tan~s tau~z
tba~z
tba tbc~z
tca~i tck~q tcs~u tcw~z
tda~o tdq~t tdv tdx~y
te tea~i tek tem~z
tfi tfn~o tfr tft
tg tga~f tgh~j tgn~z
th thd~f thh~i thk~n thp~w thy~z
th thd~f thh~i thk~n thp~v thy~z
ti tia tic tif~q tis~z
tja tjg tji~j tjl~p tjs tju tjw
tk tka~b tkd~g tkl~n tkp~x tkz
Expand Down Expand Up @@ -494,7 +494,7 @@
uha uhn
uis uiv
uji
uk uka ukg~h ukk~l ukp~q uks uku ukw uky
uk uka ukg~i ukk~l ukp~q uks uku~w uky
ula~c ule~f uli ulk~n ulu ulw
uma~d umg umi umm~p umr~s
una une ung unk unm~n unr unu unx unz
Expand Down Expand Up @@ -533,7 +533,7 @@
wib~c wie~n wir wiu~v wiy
wja wji
wka~b wkd wkl wkr wku wkw wky
wla wlc wle wlg wli wlk~m wlo wlr~s wlu~y
wla wlc wle wlg~i wlk~m wlo wlr~s wlu~y
wma~e wmh~i wmm~o wms~t wmw~x
wnb~e wng wni wnk wnm~p wnu wnw wny
wo woa~g woi wok wom~o wor~s wow woy
Expand All @@ -558,13 +558,13 @@
xka~g xki~l xkn~z
xla~e xlg xli xln~p xls xlu xly
xma~h xmj~z
xna~b xnd xng~i xnk xnn~o xnr~u xny~z
xna~b xnd xng~i xnk xnm~o xnr~u xny~z
xoc~d xog xoi xok xom~p xor xow
xpa xpc xpg xpi~k xpm~u xpy
xpa~d xpf~z
xqa xqt
xra~b xrd~e xrg xri xrm~n xrq~r xrt~u xrw
xra~b xrd~e xrg xri xrm~n xrr xrt~u xrw
xsa~e xsh~i xsm~s xsu~v xsy
xta~e xtg~j xtl~w xty~z
xta~e xtg~j xtl~w xty
xua~b xud xug xuj xul~p xur xut~u
xve xvi xvn~o xvs
xwa xwc~e xwg xwj~l xwo xwr xwt xww
Expand Down Expand Up @@ -595,13 +595,13 @@
yyr yyu yyz
yzg yzk
za zaa~h zaj~m zao~z
zbc zbe zbl zbt zbw
zba zbc zbe zbl zbt zbw
zca zch
zdj
zea zeg~h zen
zga~b zgh zgm~n zgr
zh zhb zhd zhi zhn zhw~x
zia~b zik~n zir ziw ziz
zia~b zik~n ziw ziz
zka~b zkd zkg~h zkk zkn~p zkr zkt~v zkz
zle zlj zlm~n zlq zls zlw
zma~z
Expand All @@ -621,32 +621,32 @@
mis mul
zxx
</id>
<id type='language' idStatus='deprecated'> <!-- 243 items -->
aam adp agp ais aju als arb asd aue ayr ayx azj
baz bcc bcl bgm bh bhk bjd bjq bkb bmy btb btl bxk bxr bxx byy
cbe cbh ccq cjr cka cld cmk cmn cnr coy cqu cum cwd
daf dap dgo dha dhd dik diq dit djl dkl drh drw dud duj dwl dzd
ekk elp emk emo esk
<id type='language' idStatus='deprecated'> <!-- 265 items -->
aam adp agp ais aju als aoh arb asd aue ayr ayx~y azj
baz bbz bcc bcl bgm bh bhk bjd bjq bkb bmy bpb btb btl bxk bxr bxx byy
cbe cbh cca ccq cdg cjr cka cld cmk cmn cnr coy cqu cum cwd
daf dap dgo dgu dha dhd dik diq dit djl dkl drh drr drw dud duj dwl dzd
ekc ekk elp emk emo esk
fat fuc
gav gaz gbc gbo gfx ggn~o ggr gio gno gti gug guv gya
gav gaz gbc gbo gfx ggn~o ggr gio gli gno gti gug guv gya
hdn hea him hrr
iap ibi ike ill ilw ime in iw izi
jar jeg ji jw
kbf kdv kgc~d kgh khk kmr knc kng knn koj kox kpp kpv krm ktr kvs kwq kxe kzh kzj kzt
lba lbk leg lii llo lmm lsg lvs
kbf kdv kgc~d kgh khk kjf kmr knc kng knn koj kox kpp kpv krm ktr kvs kwq kxe kxl kxu kzh kzj kzt
lba lbk leg lii llo lmm lmz lsg lvs
meg mgx mhh mhr mja mld mnk mnt mo mof mst mup mwd mwj mwx~y myd myi myq myt
nad nbf nbx ncp nln nlr nns nnx no noo npi nts
nad nbf nbx ncp nln nlr nns nnx no noo npi nts nxu
ojg ome ory oun
pbu pbz pcr pes pgy plt pmc pmu pnb pod ppa ppr prb prs pry puk puz
pbu pbz pcr pes pgy plp plt pmc pmu pnb pod ppa ppr prb prs pry puk puz
quz
rie rmr rmy rna rsi
sap sca sgl sgo sh skk snh spy src sul~m svr swc swh
tdu tgg thc thx tid~e tkk tl tlw tmp tne~f toe tsf ttq tw
sap sca sdm sgl sgo sh skk snh spy src sul~m svr swc swh
tbb tdu tgg thc thw~x tid~e tkk tl tlw tmp tne~f toe tsf ttq tw
umu unp uok uzn
wgw wit wiw
xba xbx xia xip xkh xpe xsj xsl
xba xbx xia xip xkh xpe xrq xsj xsl xtz
ybd ydd yds yen yiy yma ymt ynh yos yri yuu
zai zsm zyb
zai zir zsm zyb
</id>
<id type='language' idStatus='reserved'> <!-- 155 items -->
qaa~z qba~z qca~z qda~z qea~z qfa~y
Expand Down
6 changes: 3 additions & 3 deletions common/validity/variant.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<supplementalData>
<version number="$Revision$"/>
<idValidity>
<id type='variant' idStatus='regular'> <!-- 98 items -->
<id type='variant' idStatus='regular'> <!-- 101 items -->
1606nict 1694acad 1901 1959acad 1994 1996
abl1943 akuapem alalc97 aluku ao1990 aranes asante auvern
baku1926 balanka barla basiceng bauddha biscayan biske bohoric boont bornholm
Expand All @@ -30,10 +30,10 @@
metelko monoton
ndyuka nedis newfound nicard njiva nulik
osojs oxendict
pahawh2~4 pamaka petr1708 pinyin polyton provenc puter
pahawh2~4 pamaka peano petr1708 pinyin polyton provenc puter
rigik rozaj rumgr
scotland scouse simple solba sotav spanglis surmiran sursilv sutsilv
tarask
tarask tongyong tunumiit
uccor ucrcor ulster unifon
vaidika valencia vallader vivaraup
wadegile
Expand Down
4 changes: 3 additions & 1 deletion tools/java/org/unicode/cldr/util/data/iso-639-3-macrolanguages.tab
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ ara ayh A
ara ayl A
ara ayn A
ara ayp A
ara bbz A
ara bbz R
ara pga A
ara shu A
ara ssh A
Expand Down Expand Up @@ -437,7 +437,9 @@ zha zzj A
zho cdo A
zho cjy A
zho cmn A
zho cnp A
zho cpx A
zho csp A
zho czh A
zho czo A
zho gan A
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20190408
20200130
Loading

0 comments on commit cd8cdc3

Please sign in to comment.