Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CLDR-18087 Remove <languageData> #4223

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 0 additions & 21 deletions common/dtd/ldmlSupplemental.dtd
Original file line number Diff line number Diff line change
Expand Up @@ -135,27 +135,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
<!--@MATCH:set/or/validity/subdivision||literal/itca, itnu, itor, itsd, itss, no01, no02, no03, no04, no05, no06, no07, no08, no09, no10, no11, no12, no14, no15, no18, no19, no20, no21, no22, no50-->
<!--@VALUE-->

<!ELEMENT languageData ( language* ) >

<!ELEMENT language EMPTY >
<!ATTLIST language type NMTOKEN #REQUIRED >
<!--@MATCH:set/validity/language-->
<!ATTLIST language scripts NMTOKENS #IMPLIED >
<!--@MATCH:set/validity/script-->
<!--@VALUE-->
<!ATTLIST language territories NMTOKENS #IMPLIED >
<!--@MATCH:set/validity/region-->
<!--@VALUE-->
<!ATTLIST language variants NMTOKENS #IMPLIED >
<!--@VALUE-->
<!ATTLIST language draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
<!--@METADATA-->
<!--@DEPRECATED:true, false-->
<!ATTLIST language references CDATA #IMPLIED >
<!--@METADATA-->
<!ATTLIST language alt NMTOKENS #IMPLIED >
<!--@MATCH:literal/secondary, variant-->

<!ELEMENT territoryInfo ( territory* ) >
<!ATTLIST territoryInfo draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
<!--@METADATA-->
Expand Down
34 changes: 0 additions & 34 deletions common/dtd/ldmlSupplemental.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
<xs:element minOccurs="0" ref="currencyData"/>
<xs:element minOccurs="0" ref="territoryContainment"/>
<xs:element minOccurs="0" ref="subdivisionContainment"/>
<xs:element minOccurs="0" ref="languageData"/>
<xs:element minOccurs="0" ref="territoryInfo"/>
<xs:element minOccurs="0" ref="postalCodeData"/>
<xs:element minOccurs="0" ref="calendarData"/>
Expand Down Expand Up @@ -333,39 +332,6 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file



<xs:element name="languageData">
<xs:complexType>
<xs:sequence>
<xs:element maxOccurs="unbounded" minOccurs="0" ref="language"/>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="language">
<xs:complexType>
<xs:attribute name="type" type="xs:NMTOKEN" use="required"/>
<xs:attribute name="scripts" type="xs:NMTOKENS"/>
<xs:attribute name="territories" type="xs:NMTOKENS"/>
<xs:attribute name="variants" type="xs:NMTOKENS"/>
<xs:attribute name="draft">
<xs:simpleType>
<xs:restriction base="xs:token">
<xs:enumeration value="approved"/>
<xs:enumeration value="contributed"/>
<xs:enumeration value="provisional"/>
<xs:enumeration value="unconfirmed"/>
<xs:enumeration value="true"/>
<xs:enumeration value="false"/>
</xs:restriction>
</xs:simpleType>
</xs:attribute>
<xs:attribute name="references"/>
<xs:attribute name="alt" type="xs:NMTOKENS"/>
</xs:complexType>
</xs:element>







Expand Down
5 changes: 0 additions & 5 deletions common/supplemental/attributeValueValidity.xml
Original file line number Diff line number Diff line change
Expand Up @@ -192,10 +192,6 @@
<attributeValues dtds='supplementalData' elements='info' attributes='iso4217'>$_bcp47_currency|$defaultCurrencyInfo</attributeValues>
<attributeValues dtds='supplementalData' elements='info' attributes='rounding' type='regex'>[0-9]+</attributeValues>
<attributeValues dtds='ldml' elements='key' attributes='type'>$_bcp47_keys</attributeValues>
<attributeValues dtds='supplementalData' elements='language' attributes='scripts' type='list'>$_script</attributeValues>
<attributeValues dtds='supplementalData' elements='language' attributes='territories' type='list'>$_region</attributeValues>
<attributeValues dtds='ldml' elements='language' attributes='type'>$localeOrDeprecated</attributeValues>
<attributeValues dtds='supplementalData' elements='language' attributes='variants'>$_variant</attributeValues>
<attributeValues dtds='supplementalData' elements='languageAlias' attributes='replacement' type='locale'/>
<attributeValues dtds='supplementalData' elements='languageAlias' attributes='type' type='regex'>[a-zA-Z0-9]{1,3}(_[A-Za-z0-9]{2,8})*</attributeValues>
<!-- <attributeValues dtds='ldml' elements='ldml' attributes='version'>$version</attributeValues> -->
Expand Down Expand Up @@ -346,7 +342,6 @@
<attributeValues dtds='supplementalData' elements='id' attributes='type' type='choice'>currency language region script subdivision unit variant</attributeValues>
<attributeValues dtds='supplementalData' elements='info' attributes='cashDigits' type='choice'>0</attributeValues>
<attributeValues dtds='supplementalData' elements='info' attributes='cashRounding' type='choice'>0 5</attributeValues>
<attributeValues dtds='supplementalData' elements='language' attributes='type' type='TODO'/>
<attributeValues dtds='supplementalData' elements='languageMatch' attributes='desired' type='TODO'>$localeStar</attributeValues>
<attributeValues dtds='supplementalData' elements='languageMatch' attributes='percent' type='regex'>$percent</attributeValues>
<attributeValues dtds='supplementalData' elements='languageMatch' attributes='supported' type='TODO'>$localeStar</attributeValues>
Expand Down
10 changes: 5 additions & 5 deletions common/supplemental/likelySubtags.xml
Original file line number Diff line number Diff line change
Expand Up @@ -244,11 +244,11 @@ not be patched by hand, as any changes made in that fashion may be lost.
<likelySubtag from="glk" to="glk_Arab_IR"/> <!--Gilaki‧?‧? ➡ Gilaki‧Arabic‧Iran-->
<likelySubtag from="gmy" to="gmy_Linb_GR"/> <!--Mycenaean Greek‧?‧? ➡ Mycenaean Greek‧Linear B‧Greece-->
<likelySubtag from="gn" to="gn_Latn_PY"/> <!--Guarani‧?‧? ➡ Guarani‧Latin‧Paraguay-->
<likelySubtag from="gon" to="gon_Deva_IN"/> <!--Gondi‧?‧? ➡ Gondi‧Devanagari‧India-->
<likelySubtag from="gon" to="gon_Telu_IN"/> <!--Gondi‧?‧? ➡ Gondi‧Telugu‧India-->
<likelySubtag from="gor" to="gor_Latn_ID"/> <!--Gorontalo‧?‧? ➡ Gorontalo‧Latin‧Indonesia-->
<likelySubtag from="gos" to="gos_Latn_NL"/> <!--Gronings‧?‧? ➡ Gronings‧Latin‧Netherlands-->
<likelySubtag from="got" to="got_Goth_UA"/> <!--Gothic‧?‧? ➡ Gothic‧Gothic‧Ukraine-->
<likelySubtag from="grc" to="grc_Grek_GR"/> <!--Ancient Greek‧?‧? ➡ Ancient Greek‧Greek‧Greece-->
<likelySubtag from="grc" to="grc_Cprt_GR"/> <!--Ancient Greek‧?‧? ➡ Ancient Greek‧Cypriot‧Greece-->
<likelySubtag from="grt" to="grt_Beng_IN"/> <!--Garo‧?‧? ➡ Garo‧Bangla‧India-->
<likelySubtag from="gsw" to="gsw_Latn_CH"/> <!--Swiss German‧?‧? ➡ Swiss German‧Latin‧Switzerland-->
<likelySubtag from="gu" to="gu_Gujr_IN"/> <!--Gujarati‧?‧? ➡ Gujarati‧Gujarati‧India-->
Expand All @@ -269,7 +269,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
<likelySubtag from="haz" to="haz_Arab_AF"/> <!--Hazaragi‧?‧? ➡ Hazaragi‧Arabic‧Afghanistan-->
<likelySubtag from="he" to="he_Hebr_IL"/> <!--Hebrew‧?‧? ➡ Hebrew‧Hebrew‧Israel-->
<likelySubtag from="hi" to="hi_Deva_IN"/> <!--Hindi‧?‧? ➡ Hindi‧Devanagari‧India-->
<likelySubtag from="hif" to="hif_Deva_FJ"/> <!--Fiji Hindi‧?‧? ➡ Fiji Hindi‧Devanagari‧Fiji-->
<likelySubtag from="hif" to="hif_Latn_FJ"/> <!--Fiji Hindi‧?‧? ➡ Fiji Hindi‧Latin‧Fiji-->
<likelySubtag from="hil" to="hil_Latn_PH"/> <!--Hiligaynon‧?‧? ➡ Hiligaynon‧Latin‧Philippines-->
<likelySubtag from="hlu" to="hlu_Hluw_TR"/> <!--Hieroglyphic Luwian‧?‧? ➡ Hieroglyphic Luwian‧Anatolian Hieroglyphs‧Türkiye-->
<likelySubtag from="hmd" to="hmd_Plrd_CN"/> <!--Large Flowery Miao‧?‧? ➡ Large Flowery Miao‧Pollard Phonetic‧China-->
Expand Down Expand Up @@ -325,7 +325,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
<likelySubtag from="kaj" to="kaj_Latn_NG"/> <!--Jju‧?‧? ➡ Jju‧Latin‧Nigeria-->
<likelySubtag from="kam" to="kam_Latn_KE"/> <!--Kamba‧?‧? ➡ Kamba‧Latin‧Kenya-->
<likelySubtag from="kao" to="kao_Latn_ML"/> <!--Xaasongaxango‧?‧? ➡ Xaasongaxango‧Latin‧Mali-->
<likelySubtag from="kaw" to="kaw_Bali_ID"/> <!--Kawi‧?‧? ➡ Kawi‧Balinese‧Indonesia-->
<likelySubtag from="kaw" to="kaw_Kawi_ID"/> <!--Kawi‧?‧? ➡ Kawi‧Kawi‧Indonesia-->
<likelySubtag from="kbd" to="kbd_Cyrl_RU"/> <!--Kabardian‧?‧? ➡ Kabardian‧Cyrillic‧Russia-->
<likelySubtag from="kby" to="kby_Arab_NE"/> <!--Manga Kanuri‧?‧? ➡ Manga Kanuri‧Arabic‧Niger-->
<likelySubtag from="kcg" to="kcg_Latn_NG"/> <!--Tyap‧?‧? ➡ Tyap‧Latin‧Nigeria-->
Expand Down Expand Up @@ -364,7 +364,6 @@ not be patched by hand, as any changes made in that fashion may be lost.
<likelySubtag from="kmb" to="kmb_Latn_AO"/> <!--Kimbundu‧?‧? ➡ Kimbundu‧Latin‧Angola-->
<likelySubtag from="kn" to="kn_Knda_IN"/> <!--Kannada‧?‧? ➡ Kannada‧Kannada‧India-->
<likelySubtag from="knf" to="knf_Latn_GW"/> <!--Mankanya‧?‧? ➡ Mankanya‧Latin‧Guinea-Bissau-->
<likelySubtag from="knn" to="knn_Deva_IN"/> <!--Konkani (individual language)‧?‧? ➡ Konkani (individual language)‧Devanagari‧India-->
<likelySubtag from="ko" to="ko_Kore_KR"/> <!--Korean‧?‧? ➡ Korean‧Korean‧South Korea-->
<likelySubtag from="koi" to="koi_Cyrl_RU"/> <!--Komi-Permyak‧?‧? ➡ Komi-Permyak‧Cyrillic‧Russia-->
<likelySubtag from="kok" to="kok_Deva_IN"/> <!--Konkani‧?‧? ➡ Konkani‧Devanagari‧India-->
Expand Down Expand Up @@ -1097,6 +1096,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
<likelySubtag from="und_Copt" to="cop_Copt_EG"/> <!--?‧Coptic‧? ➡ Coptic‧Coptic‧Egypt-->
<likelySubtag from="und_Cpmn" to="und_Cpmn_CY"/> <!--?‧Cypro-Minoan‧? ➡ ?‧Cypro-Minoan‧Cyprus-->
<likelySubtag from="und_Cprt" to="ecy_Cprt_CY"/> <!--?‧Cypriot‧? ➡ Eteocypriot‧Cypriot‧Cyprus-->
<likelySubtag from="und_Cprt_GR" to="grc_Cprt_GR"/> <!--?‧Cypriot‧Greece ➡ Ancient Greek‧Cypriot‧Greece-->
<likelySubtag from="und_Cyrl" to="ru_Cyrl_RU"/> <!--?‧Cyrillic‧? ➡ Russian‧Cyrillic‧Russia-->
<likelySubtag from="und_Cyrl_AF" to="kaa_Cyrl_AF"/> <!--?‧Cyrillic‧Afghanistan ➡ Kara-Kalpak‧Cyrillic‧Afghanistan-->
<likelySubtag from="und_Cyrl_AL" to="mk_Cyrl_AL"/> <!--?‧Cyrillic‧Albania ➡ Macedonian‧Cyrillic‧Albania-->
Expand Down
Loading
Loading