Skip to content

Commit

Permalink
Merge branch 'main' into CLDR-17600-BRS-7-Update-language-names
Browse files Browse the repository at this point in the history
  • Loading branch information
macchiati authored May 2, 2024
2 parents 2422ec6 + dd4a0bd commit e3b0e3a
Show file tree
Hide file tree
Showing 70 changed files with 5,459 additions and 5,029 deletions.
2 changes: 1 addition & 1 deletion .node-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v18.15.0
v20.12.2
16 changes: 16 additions & 0 deletions common/annotations/en.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3907,5 +3907,21 @@ annotations.
<annotation cp="³" type="tts">superscript three</annotation>
<annotation cp="µ">measure | micro sign</annotation>
<annotation cp="µ" type="tts">micro sign</annotation>
<!-- start hand-generated lines from E16 -->
<annotation cp='🪉' type='tts'>harp</annotation>
<annotation cp='🪉'>music | instrument | love | cupid | orchestra</annotation>
<annotation cp='🪏' type='tts'>shovel</annotation>
<annotation cp='🪏'>dig | spade | hole | scoop</annotation>
<annotation cp='🪾' type='tts'>leafless tree</annotation>
<annotation cp='🪾'>winter | barren | drought</annotation>
<annotation cp='🫆' type='tts'>fingerprint</annotation>
<annotation cp='🫆'>forensics | identity | safety</annotation>
<annotation cp='🫜' type='tts'>root vegetable</annotation>
<annotation cp='🫜'>root | vegetable | garden | beet | turnip</annotation>
<annotation cp='🫟' type='tts'>splatter</annotation>
<annotation cp='🫟'>paint | holi | spill | stain</annotation>
<annotation cp='🫩' type='tts'>face with bags under eyes</annotation>
<annotation cp='🫩'>tired | sleepy | exhausted</annotation>
<!-- end hand-generated lines from E16 -->
</annotations>
</ldml>
16 changes: 16 additions & 0 deletions common/annotations/root.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3908,5 +3908,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
<annotation cp="³" type="tts">E13-137</annotation>
<annotation cp="µ">E13-150</annotation>
<annotation cp="µ" type="tts">E13-150</annotation>
<!-- start hand-generated lines from E16 -->
<annotation cp='🪉'>E16-001</annotation>
<annotation cp='🪉' type='tts'>E16-001</annotation>
<annotation cp='🪏'>E16-002</annotation>
<annotation cp='🪏' type='tts'>E16-002</annotation>
<annotation cp='🪾'>E16-003</annotation>
<annotation cp='🪾' type='tts'>E16-003</annotation>
<annotation cp='🫆'>E16-004</annotation>
<annotation cp='🫆' type='tts'>E16-004</annotation>
<annotation cp='🫜'>E16-005</annotation>
<annotation cp='🫜' type='tts'>E16-005</annotation>
<annotation cp='🫟'>E16-006</annotation>
<annotation cp='🫟' type='tts'>E16-006</annotation>
<annotation cp='🫩'>E16-007</annotation>
<annotation cp='🫩' type='tts'>E16-007</annotation>
<!-- end hand-generated lines from E16 -->
</annotations>
</ldml>
2 changes: 1 addition & 1 deletion common/main/ar.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6000,7 +6000,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
</timeZoneNames>
</dates>
<numbers>
<defaultNumberingSystem>arab</defaultNumberingSystem>
<defaultNumberingSystem>latn</defaultNumberingSystem>
<defaultNumberingSystem alt="latn">latn</defaultNumberingSystem>
<otherNumberingSystems>
<native>arab</native>
Expand Down
2 changes: 1 addition & 1 deletion common/main/ar_AE.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
</fields>
</dates>
<numbers>
<defaultNumberingSystem>latn</defaultNumberingSystem>
<defaultNumberingSystem>↑↑↑</defaultNumberingSystem>
<symbols numberSystem="arab">
<decimal draft="contributed">↑↑↑</decimal>
<group draft="contributed">↑↑↑</group>
Expand Down
2 changes: 1 addition & 1 deletion common/main/ar_BH.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
<territory type="BH"/>
</identity>
<numbers>
<defaultNumberingSystem>↑↑↑</defaultNumberingSystem>
<defaultNumberingSystem>arab</defaultNumberingSystem>
<symbols numberSystem="arab">
<decimal draft="contributed">↑↑↑</decimal>
<group draft="contributed">↑↑↑</group>
Expand Down
2 changes: 1 addition & 1 deletion common/main/ar_DJ.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
<territory type="DJ"/>
</identity>
<numbers>
<defaultNumberingSystem>↑↑↑</defaultNumberingSystem>
<defaultNumberingSystem>arab</defaultNumberingSystem>
<currencies>
<currency type="DJF">
<symbol>Fdj</symbol>
Expand Down
2 changes: 1 addition & 1 deletion common/main/ar_DZ.xml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
</calendars>
</dates>
<numbers>
<defaultNumberingSystem>latn</defaultNumberingSystem>
<defaultNumberingSystem>↑↑↑</defaultNumberingSystem>
<symbols numberSystem="arab">
<decimal draft="contributed">↑↑↑</decimal>
<group draft="contributed">↑↑↑</group>
Expand Down
2 changes: 1 addition & 1 deletion common/main/ar_EG.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
</languages>
</localeDisplayNames>
<numbers>
<defaultNumberingSystem>↑↑↑</defaultNumberingSystem>
<defaultNumberingSystem>arab</defaultNumberingSystem>
<symbols numberSystem="arab">
<decimal draft="contributed">↑↑↑</decimal>
<group draft="contributed">↑↑↑</group>
Expand Down
2 changes: 1 addition & 1 deletion common/main/ar_EH.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
<territory type="EH"/>
</identity>
<numbers>
<defaultNumberingSystem>latn</defaultNumberingSystem>
<defaultNumberingSystem>↑↑↑</defaultNumberingSystem>
</numbers>
</ldml>
2 changes: 1 addition & 1 deletion common/main/ar_ER.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
<territory type="ER"/>
</identity>
<numbers>
<defaultNumberingSystem>↑↑↑</defaultNumberingSystem>
<defaultNumberingSystem>arab</defaultNumberingSystem>
<currencies>
<currency type="ERN">
<symbol>Nfk</symbol>
Expand Down
2 changes: 1 addition & 1 deletion common/main/ar_IL.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
</calendars>
</dates>
<numbers>
<defaultNumberingSystem>↑↑↑</defaultNumberingSystem>
<defaultNumberingSystem>arab</defaultNumberingSystem>
</numbers>
</ldml>
2 changes: 1 addition & 1 deletion common/main/ar_IQ.xml
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
</calendars>
</dates>
<numbers>
<defaultNumberingSystem>↑↑↑</defaultNumberingSystem>
<defaultNumberingSystem>arab</defaultNumberingSystem>
<symbols numberSystem="arab">
<decimal draft="contributed">↑↑↑</decimal>
<group draft="contributed">↑↑↑</group>
Expand Down
2 changes: 1 addition & 1 deletion common/main/ar_JO.xml
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
</calendars>
</dates>
<numbers>
<defaultNumberingSystem>↑↑↑</defaultNumberingSystem>
<defaultNumberingSystem>arab</defaultNumberingSystem>
<symbols numberSystem="arab">
<decimal draft="contributed">↑↑↑</decimal>
<group draft="contributed">↑↑↑</group>
Expand Down
2 changes: 1 addition & 1 deletion common/main/ar_KM.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
</calendars>
</dates>
<numbers>
<defaultNumberingSystem>↑↑↑</defaultNumberingSystem>
<defaultNumberingSystem>arab</defaultNumberingSystem>
<currencies>
<currency type="KMF">
<symbol>CF</symbol>
Expand Down
2 changes: 1 addition & 1 deletion common/main/ar_KW.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
<territory type="KW"/>
</identity>
<numbers>
<defaultNumberingSystem>↑↑↑</defaultNumberingSystem>
<defaultNumberingSystem>arab</defaultNumberingSystem>
<symbols numberSystem="arab">
<decimal draft="contributed">↑↑↑</decimal>
<group draft="contributed">↑↑↑</group>
Expand Down
2 changes: 1 addition & 1 deletion common/main/ar_LB.xml
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
</calendars>
</dates>
<numbers>
<defaultNumberingSystem>↑↑↑</defaultNumberingSystem>
<defaultNumberingSystem>arab</defaultNumberingSystem>
<symbols numberSystem="latn">
<decimal>,</decimal>
<group>.</group>
Expand Down
2 changes: 1 addition & 1 deletion common/main/ar_LY.xml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
</calendars>
</dates>
<numbers>
<defaultNumberingSystem>latn</defaultNumberingSystem>
<defaultNumberingSystem>↑↑↑</defaultNumberingSystem>
<symbols numberSystem="latn">
<decimal>,</decimal>
<group>.</group>
Expand Down
2 changes: 1 addition & 1 deletion common/main/ar_MA.xml
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
</calendars>
</dates>
<numbers>
<defaultNumberingSystem>latn</defaultNumberingSystem>
<defaultNumberingSystem>↑↑↑</defaultNumberingSystem>
<symbols numberSystem="arab">
<decimal draft="contributed">↑↑↑</decimal>
<group draft="contributed">↑↑↑</group>
Expand Down
2 changes: 1 addition & 1 deletion common/main/ar_MR.xml
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
</calendars>
</dates>
<numbers>
<defaultNumberingSystem>↑↑↑</defaultNumberingSystem>
<defaultNumberingSystem>arab</defaultNumberingSystem>
<symbols numberSystem="latn">
<decimal>,</decimal>
<group>.</group>
Expand Down
2 changes: 1 addition & 1 deletion common/main/ar_OM.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
<territory type="OM"/>
</identity>
<numbers>
<defaultNumberingSystem>↑↑↑</defaultNumberingSystem>
<defaultNumberingSystem>arab</defaultNumberingSystem>
<symbols numberSystem="arab">
<decimal draft="contributed">↑↑↑</decimal>
<group draft="contributed">↑↑↑</group>
Expand Down
2 changes: 1 addition & 1 deletion common/main/ar_PS.xml
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
</calendars>
</dates>
<numbers>
<defaultNumberingSystem>↑↑↑</defaultNumberingSystem>
<defaultNumberingSystem>arab</defaultNumberingSystem>
</numbers>
</ldml>
2 changes: 1 addition & 1 deletion common/main/ar_QA.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
<territory type="QA"/>
</identity>
<numbers>
<defaultNumberingSystem>↑↑↑</defaultNumberingSystem>
<defaultNumberingSystem>arab</defaultNumberingSystem>
<symbols numberSystem="arab">
<decimal draft="contributed">↑↑↑</decimal>
<group draft="contributed">↑↑↑</group>
Expand Down
2 changes: 1 addition & 1 deletion common/main/ar_SA.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1375,7 +1375,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
</timeZoneNames>
</dates>
<numbers>
<defaultNumberingSystem>↑↑↑</defaultNumberingSystem>
<defaultNumberingSystem>arab</defaultNumberingSystem>
<minimumGroupingDigits draft="contributed">↑↑↑</minimumGroupingDigits>
<symbols numberSystem="arab">
<decimal>↑↑↑</decimal>
Expand Down
2 changes: 1 addition & 1 deletion common/main/ar_SD.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
<territory type="SD"/>
</identity>
<numbers>
<defaultNumberingSystem>↑↑↑</defaultNumberingSystem>
<defaultNumberingSystem>arab</defaultNumberingSystem>
<symbols numberSystem="arab">
<decimal draft="contributed">↑↑↑</decimal>
<group draft="contributed">↑↑↑</group>
Expand Down
2 changes: 1 addition & 1 deletion common/main/ar_SO.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
<exemplarCharacters type="numbers">[\u200E \- ‑ , . ٪ ‰ + 0 1 2 3 4 5 6 7 8 9]</exemplarCharacters>
</characters>
<numbers>
<defaultNumberingSystem>↑↑↑</defaultNumberingSystem>
<defaultNumberingSystem>arab</defaultNumberingSystem>
<symbols numberSystem="latn">
<percentSign draft="contributed">٪</percentSign>
</symbols>
Expand Down
2 changes: 1 addition & 1 deletion common/main/ar_SS.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
<territory type="SS"/>
</identity>
<numbers>
<defaultNumberingSystem>↑↑↑</defaultNumberingSystem>
<defaultNumberingSystem>arab</defaultNumberingSystem>
<currencies>
<currency type="GBP">
<symbol>GB£</symbol>
Expand Down
2 changes: 1 addition & 1 deletion common/main/ar_SY.xml
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
</calendars>
</dates>
<numbers>
<defaultNumberingSystem>↑↑↑</defaultNumberingSystem>
<defaultNumberingSystem>arab</defaultNumberingSystem>
<symbols numberSystem="arab">
<decimal draft="contributed">↑↑↑</decimal>
<group draft="contributed">↑↑↑</group>
Expand Down
2 changes: 1 addition & 1 deletion common/main/ar_TD.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
<territory type="TD"/>
</identity>
<numbers>
<defaultNumberingSystem>↑↑↑</defaultNumberingSystem>
<defaultNumberingSystem>arab</defaultNumberingSystem>
</numbers>
</ldml>
2 changes: 1 addition & 1 deletion common/main/ar_TN.xml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
</calendars>
</dates>
<numbers>
<defaultNumberingSystem>latn</defaultNumberingSystem>
<defaultNumberingSystem>↑↑↑</defaultNumberingSystem>
<symbols numberSystem="arab">
<decimal draft="contributed">↑↑↑</decimal>
<group draft="contributed">↑↑↑</group>
Expand Down
2 changes: 1 addition & 1 deletion common/main/ar_YE.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
<territory type="YE"/>
</identity>
<numbers>
<defaultNumberingSystem>↑↑↑</defaultNumberingSystem>
<defaultNumberingSystem>arab</defaultNumberingSystem>
<symbols numberSystem="arab">
<decimal draft="contributed">↑↑↑</decimal>
<group draft="contributed">↑↑↑</group>
Expand Down
13 changes: 13 additions & 0 deletions common/main/mhn.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
<ldml>
<identity>
<version number="$Revision$"/>
<language type="mhn"/>
</identity>
<characters>
<exemplarCharacters>[a-z á à é è ë ì í ò ó ù ú ]</exemplarCharacters>
<exemplarCharacters type="numbers">[0-9 , + \-]</exemplarCharacters>
<exemplarCharacters type="punctuation">[, . ; ? ! ' &quot;]</exemplarCharacters>
</characters>
</ldml>
9 changes: 9 additions & 0 deletions common/main/mhn_IT.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
<ldml>
<identity>
<version number="$Revision$"/>
<language type="mhn"/>
<territory type="IT"/>
</identity>
</ldml>
20 changes: 10 additions & 10 deletions common/main/uk.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1555,7 +1555,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
<dateFormats>
<dateFormatLength type="full">
<dateFormat>
<pattern>cccc, d MMMM y 'р'. G</pattern>
<pattern>EEEE, d MMMM y 'р'. G</pattern>
<datetimeSkeleton>↑↑↑</datetimeSkeleton>
</dateFormat>
</dateFormatLength>
Expand Down Expand Up @@ -1921,13 +1921,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
<day type="sat">↑↑↑</day>
</dayWidth>
<dayWidth type="wide">
<day type="sun">неділю</day>
<day type="sun">неділя</day>
<day type="mon">понеділок</day>
<day type="tue">вівторок</day>
<day type="wed">середу</day>
<day type="wed">середа</day>
<day type="thu">четвер</day>
<day type="fri">пʼятницю</day>
<day type="sat">суботу</day>
<day type="fri">пʼятниця</day>
<day type="sat">субота</day>
</dayWidth>
</dayContext>
<dayContext type="stand-alone">
Expand Down Expand Up @@ -1959,13 +1959,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
<day type="sat">↑↑↑</day>
</dayWidth>
<dayWidth type="wide">
<day type="sun">неділя</day>
<day type="sun">↑↑↑</day>
<day type="mon">↑↑↑</day>
<day type="tue">↑↑↑</day>
<day type="wed">середа</day>
<day type="wed">↑↑↑</day>
<day type="thu">↑↑↑</day>
<day type="fri">пʼятниця</day>
<day type="sat">субота</day>
<day type="fri">↑↑↑</day>
<day type="sat">↑↑↑</day>
</dayWidth>
</dayContext>
</days>
Expand Down Expand Up @@ -2098,7 +2098,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
<dateFormats>
<dateFormatLength type="full">
<dateFormat>
<pattern>cccc, d MMMM y 'р'.</pattern>
<pattern>EEEE, d MMMM y 'р'.</pattern>
<datetimeSkeleton>↑↑↑</datetimeSkeleton>
</dateFormat>
</dateFormatLength>
Expand Down
2 changes: 1 addition & 1 deletion common/supplemental/attributeValueValidity.xml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
jbo jgo jmc
kab kaj kam kcg kde ken khq ki kkj kl kln kpe ksb ksf ksh kw
la lag lg lkt lld ln lrc ltg lu luo luy
mas mdf mer mfe mg mgh mgo mic moh mua mus myv mzn
mas mdf mer mfe mhn mg mgh mgo mic moh mua mus myv mzn
naq nb nd nmg nnh nr nso nus nv ny nyn om
os osa
pap pis
Expand Down
3 changes: 2 additions & 1 deletion common/supplemental/likelySubtags.xml
Original file line number Diff line number Diff line change
Expand Up @@ -908,6 +908,8 @@ not be patched by hand, as any changes made in that fashion may be lost.
<!--{ Mbunga; ?; ? } => { Mbunga; Latin; Tanzania }-->
<likelySubtag from="mh" to="mh_Latn_MH"/>
<!--{ Marshallese; ?; ? } => { Marshallese; Latin; Marshall Islands }-->
<likelySubtag from="mhn" to="mhn_Latn_IT"/>
<!--{ Mocheno; ?; ? } => { Mocheno; Latin; Italy }-->
<likelySubtag from="mi" to="mi_Latn_NZ"/>
<!--{ Māori; ?; ? } => { Māori; Latin; New Zealand }-->
<likelySubtag from="mic" to="mic_Latn_CA"/>
Expand Down Expand Up @@ -5831,7 +5833,6 @@ not be patched by hand, as any changes made in that fashion may be lost.
<likelySubtag from="mhj" to="mhj_Arab_AF" origin="sil1"/> <!-- Mogholi ➡︎ Mogholi (Arabic, Afghanistan) -->
<likelySubtag from="mhk" to="mhk_Latn_CM" origin="sil1"/> <!-- Mungaka ➡︎ Mungaka (Latin, Cameroon) -->
<likelySubtag from="mhm" to="mhm_Latn_MZ" origin="sil1"/> <!-- Makhuwa-Moniga ➡︎ Makhuwa-Moniga (Latin, Mozambique) -->
<likelySubtag from="mhn" to="mhn_Latn_IT" origin="sil1"/> <!-- Mócheno ➡︎ Mócheno (Latin, Italy) -->
<likelySubtag from="mho" to="mho_Latn_ZM" origin="sil1"/> <!-- Mashi [Zambia] ➡︎ Mashi [Zambia] (Latin, Zambia) -->
<likelySubtag from="mhp" to="mhp_Latn_ID" origin="sil1"/> <!-- Balinese Malay ➡︎ Balinese Malay (Latin, Indonesia) -->
<likelySubtag from="mhq" to="mhq_Latn_US" origin="sil1"/> <!-- Mandan ➡︎ Mandan (Latin, United States) -->
Expand Down
Loading

0 comments on commit e3b0e3a

Please sign in to comment.