Skip to content

Commit 23067a2

Browse files
conradarcturusconradarcturus
committed
CLDR-18087 Remove <languageData>
1 parent db1ba18 commit 23067a2

File tree

12 files changed

+17
-1587
lines changed

12 files changed

+17
-1587
lines changed

‎common/dtd/ldmlSupplemental.dtd‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -135,27 +135,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
135135
<!--@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-->
136136
<!--@VALUE-->
137137

138-
<!ELEMENT languageData ( language* ) >
139-
140-
<!ELEMENT language EMPTY >
141-
<!ATTLIST language type NMTOKEN #REQUIRED >
142-
<!--@MATCH:set/validity/language-->
143-
<!ATTLIST language scripts NMTOKENS #IMPLIED >
144-
<!--@MATCH:set/validity/script-->
145-
<!--@VALUE-->
146-
<!ATTLIST language territories NMTOKENS #IMPLIED >
147-
<!--@MATCH:set/validity/region-->
148-
<!--@VALUE-->
149-
<!ATTLIST language variants NMTOKENS #IMPLIED >
150-
<!--@VALUE-->
151-
<!ATTLIST language draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
152-
<!--@METADATA-->
153-
<!--@DEPRECATED:true, false-->
154-
<!ATTLIST language references CDATA #IMPLIED >
155-
<!--@METADATA-->
156-
<!ATTLIST language alt NMTOKENS #IMPLIED >
157-
<!--@MATCH:literal/secondary, variant-->
158-
159138
<!ELEMENT territoryInfo ( territory* ) >
160139
<!ATTLIST territoryInfo draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
161140
<!--@METADATA-->

‎common/dtd/ldmlSupplemental.xsd‎

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
1919
<xs:element minOccurs="0" ref="currencyData"/>
2020
<xs:element minOccurs="0" ref="territoryContainment"/>
2121
<xs:element minOccurs="0" ref="subdivisionContainment"/>
22-
<xs:element minOccurs="0" ref="languageData"/>
2322
<xs:element minOccurs="0" ref="territoryInfo"/>
2423
<xs:element minOccurs="0" ref="postalCodeData"/>
2524
<xs:element minOccurs="0" ref="calendarData"/>
@@ -333,39 +332,6 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
333332

334333

335334

336-
<xs:element name="languageData">
337-
<xs:complexType>
338-
<xs:sequence>
339-
<xs:element maxOccurs="unbounded" minOccurs="0" ref="language"/>
340-
</xs:sequence>
341-
</xs:complexType>
342-
</xs:element>
343-
<xs:element name="language">
344-
<xs:complexType>
345-
<xs:attribute name="type" type="xs:NMTOKEN" use="required"/>
346-
<xs:attribute name="scripts" type="xs:NMTOKENS"/>
347-
<xs:attribute name="territories" type="xs:NMTOKENS"/>
348-
<xs:attribute name="variants" type="xs:NMTOKENS"/>
349-
<xs:attribute name="draft">
350-
<xs:simpleType>
351-
<xs:restriction base="xs:token">
352-
<xs:enumeration value="approved"/>
353-
<xs:enumeration value="contributed"/>
354-
<xs:enumeration value="provisional"/>
355-
<xs:enumeration value="unconfirmed"/>
356-
<xs:enumeration value="true"/>
357-
<xs:enumeration value="false"/>
358-
</xs:restriction>
359-
</xs:simpleType>
360-
</xs:attribute>
361-
<xs:attribute name="references"/>
362-
<xs:attribute name="alt" type="xs:NMTOKENS"/>
363-
</xs:complexType>
364-
</xs:element>
365-
366-
367-
368-
369335

370336

371337

‎common/supplemental/attributeValueValidity.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -192,10 +192,6 @@
192192
<attributeValues dtds='supplementalData' elements='info' attributes='iso4217'>$_bcp47_currency|$defaultCurrencyInfo</attributeValues>
193193
<attributeValues dtds='supplementalData' elements='info' attributes='rounding' type='regex'>[0-9]+</attributeValues>
194194
<attributeValues dtds='ldml' elements='key' attributes='type'>$_bcp47_keys</attributeValues>
195-
<attributeValues dtds='supplementalData' elements='language' attributes='scripts' type='list'>$_script</attributeValues>
196-
<attributeValues dtds='supplementalData' elements='language' attributes='territories' type='list'>$_region</attributeValues>
197-
<attributeValues dtds='ldml' elements='language' attributes='type'>$localeOrDeprecated</attributeValues>
198-
<attributeValues dtds='supplementalData' elements='language' attributes='variants'>$_variant</attributeValues>
199195
<attributeValues dtds='supplementalData' elements='languageAlias' attributes='replacement' type='locale'/>
200196
<attributeValues dtds='supplementalData' elements='languageAlias' attributes='type' type='regex'>[a-zA-Z0-9]{1,3}(_[A-Za-z0-9]{2,8})*</attributeValues>
201197
<!-- <attributeValues dtds='ldml' elements='ldml' attributes='version'>$version</attributeValues> -->

‎common/supplemental/likelySubtags.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -244,11 +244,11 @@ not be patched by hand, as any changes made in that fashion may be lost.
244244
<likelySubtag from="glk" to="glk_Arab_IR"/> <!--Gilaki‧?‧? ➡ Gilaki‧Arabic‧Iran-->
245245
<likelySubtag from="gmy" to="gmy_Linb_GR"/> <!--Mycenaean Greek‧?‧? ➡ Mycenaean Greek‧Linear B‧Greece-->
246246
<likelySubtag from="gn" to="gn_Latn_PY"/> <!--Guarani‧?‧? ➡ Guarani‧Latin‧Paraguay-->
247-
<likelySubtag from="gon" to="gon_Deva_IN"/> <!--Gondi‧?‧? ➡ Gondi‧Devanagari‧India-->
247+
<likelySubtag from="gon" to="gon_Telu_IN"/> <!--Gondi‧?‧? ➡ Gondi‧Telugu‧India-->
248248
<likelySubtag from="gor" to="gor_Latn_ID"/> <!--Gorontalo‧?‧? ➡ Gorontalo‧Latin‧Indonesia-->
249249
<likelySubtag from="gos" to="gos_Latn_NL"/> <!--Gronings‧?‧? ➡ Gronings‧Latin‧Netherlands-->
250250
<likelySubtag from="got" to="got_Goth_UA"/> <!--Gothic‧?‧? ➡ Gothic‧Gothic‧Ukraine-->
251-
<likelySubtag from="grc" to="grc_Grek_GR"/> <!--Ancient Greek‧?‧? ➡ Ancient Greek‧Greek‧Greece-->
251+
<likelySubtag from="grc" to="grc_Cprt_GR"/> <!--Ancient Greek‧?‧? ➡ Ancient Greek‧Cypriot‧Greece-->
252252
<likelySubtag from="grt" to="grt_Beng_IN"/> <!--Garo‧?‧? ➡ Garo‧Bangla‧India-->
253253
<likelySubtag from="gsw" to="gsw_Latn_CH"/> <!--Swiss German‧?‧? ➡ Swiss German‧Latin‧Switzerland-->
254254
<likelySubtag from="gu" to="gu_Gujr_IN"/> <!--Gujarati‧?‧? ➡ Gujarati‧Gujarati‧India-->
@@ -269,7 +269,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
269269
<likelySubtag from="haz" to="haz_Arab_AF"/> <!--Hazaragi‧?‧? ➡ Hazaragi‧Arabic‧Afghanistan-->
270270
<likelySubtag from="he" to="he_Hebr_IL"/> <!--Hebrew‧?‧? ➡ Hebrew‧Hebrew‧Israel-->
271271
<likelySubtag from="hi" to="hi_Deva_IN"/> <!--Hindi‧?‧? ➡ Hindi‧Devanagari‧India-->
272-
<likelySubtag from="hif" to="hif_Deva_FJ"/> <!--Fiji Hindi‧?‧? ➡ Fiji Hindi‧Devanagari‧Fiji-->
272+
<likelySubtag from="hif" to="hif_Latn_FJ"/> <!--Fiji Hindi‧?‧? ➡ Fiji Hindi‧Latin‧Fiji-->
273273
<likelySubtag from="hil" to="hil_Latn_PH"/> <!--Hiligaynon‧?‧? ➡ Hiligaynon‧Latin‧Philippines-->
274274
<likelySubtag from="hlu" to="hlu_Hluw_TR"/> <!--Hieroglyphic Luwian‧?‧? ➡ Hieroglyphic Luwian‧Anatolian Hieroglyphs‧Türkiye-->
275275
<likelySubtag from="hmd" to="hmd_Plrd_CN"/> <!--Large Flowery Miao‧?‧? ➡ Large Flowery Miao‧Pollard Phonetic‧China-->
@@ -325,7 +325,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
325325
<likelySubtag from="kaj" to="kaj_Latn_NG"/> <!--Jju‧?‧? ➡ Jju‧Latin‧Nigeria-->
326326
<likelySubtag from="kam" to="kam_Latn_KE"/> <!--Kamba‧?‧? ➡ Kamba‧Latin‧Kenya-->
327327
<likelySubtag from="kao" to="kao_Latn_ML"/> <!--Xaasongaxango‧?‧? ➡ Xaasongaxango‧Latin‧Mali-->
328-
<likelySubtag from="kaw" to="kaw_Bali_ID"/> <!--Kawi‧?‧? ➡ Kawi‧Balinese‧Indonesia-->
328+
<likelySubtag from="kaw" to="kaw_Kawi_ID"/> <!--Kawi‧?‧? ➡ Kawi‧Kawi‧Indonesia-->
329329
<likelySubtag from="kbd" to="kbd_Cyrl_RU"/> <!--Kabardian‧?‧? ➡ Kabardian‧Cyrillic‧Russia-->
330330
<likelySubtag from="kby" to="kby_Arab_NE"/> <!--Manga Kanuri‧?‧? ➡ Manga Kanuri‧Arabic‧Niger-->
331331
<likelySubtag from="kcg" to="kcg_Latn_NG"/> <!--Tyap‧?‧? ➡ Tyap‧Latin‧Nigeria-->
@@ -364,7 +364,6 @@ not be patched by hand, as any changes made in that fashion may be lost.
364364
<likelySubtag from="kmb" to="kmb_Latn_AO"/> <!--Kimbundu‧?‧? ➡ Kimbundu‧Latin‧Angola-->
365365
<likelySubtag from="kn" to="kn_Knda_IN"/> <!--Kannada‧?‧? ➡ Kannada‧Kannada‧India-->
366366
<likelySubtag from="knf" to="knf_Latn_GW"/> <!--Mankanya‧?‧? ➡ Mankanya‧Latin‧Guinea-Bissau-->
367-
<likelySubtag from="knn" to="knn_Deva_IN"/> <!--Konkani (individual language)‧?‧? ➡ Konkani (individual language)‧Devanagari‧India-->
368367
<likelySubtag from="ko" to="ko_Kore_KR"/> <!--Korean‧?‧? ➡ Korean‧Korean‧South Korea-->
369368
<likelySubtag from="koi" to="koi_Cyrl_RU"/> <!--Komi-Permyak‧?‧? ➡ Komi-Permyak‧Cyrillic‧Russia-->
370369
<likelySubtag from="kok" to="kok_Deva_IN"/> <!--Konkani‧?‧? ➡ Konkani‧Devanagari‧India-->
@@ -1097,6 +1096,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
10971096
<likelySubtag from="und_Copt" to="cop_Copt_EG"/> <!--?‧Coptic‧? ➡ Coptic‧Coptic‧Egypt-->
10981097
<likelySubtag from="und_Cpmn" to="und_Cpmn_CY"/> <!--?‧Cypro-Minoan‧? ➡ ?‧Cypro-Minoan‧Cyprus-->
10991098
<likelySubtag from="und_Cprt" to="ecy_Cprt_CY"/> <!--?‧Cypriot‧? ➡ Eteocypriot‧Cypriot‧Cyprus-->
1099+
<likelySubtag from="und_Cprt_GR" to="grc_Cprt_GR"/> <!--?‧Cypriot‧Greece ➡ Ancient Greek‧Cypriot‧Greece-->
11001100
<likelySubtag from="und_Cyrl" to="ru_Cyrl_RU"/> <!--?‧Cyrillic‧? ➡ Russian‧Cyrillic‧Russia-->
11011101
<likelySubtag from="und_Cyrl_AF" to="kaa_Cyrl_AF"/> <!--?‧Cyrillic‧Afghanistan ➡ Kara-Kalpak‧Cyrillic‧Afghanistan-->
11021102
<likelySubtag from="und_Cyrl_AL" to="mk_Cyrl_AL"/> <!--?‧Cyrillic‧Albania ➡ Macedonian‧Cyrillic‧Albania-->

0 commit comments

Comments
 (0)