Skip to content

Commit 2c3c470

Browse files
naotojnaotoj
committed
8354548: Update CLDR to Version 48.0
Reviewed-by: joehw, jlu
1 parent 9bc2360 commit 2c3c470

File tree

390 files changed

+120372
-41544
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

390 files changed

+120372
-41544
lines changed

‎make/data/cldr/LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
UNICODE LICENSE V3
1+
UNICODE LICENSE V3
22

33
COPYRIGHT AND PERMISSION NOTICE
44

‎make/data/cldr/common/bcp47/calendar.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ For terms of use, see http://www.unicode.org/copyright.html
4545
<type name="h23" description="Hour system using 0–23; 'H' in patterns" since="28" />
4646
<type name="h11" description="Hour system using 0–11; 'K' in patterns" since="28" />
4747
<type name="h24" description="Hour system using 1–24; 'k' in patterns" since="28" />
48+
<type name="c12" description="Best 12-hour cycle for locale (h11 or h12)" since="48" deprecated="true" /> <!-- Technical Preview -->
49+
<type name="c24" description="Best 24-hour cycle for locale (h23 or h24)" since="48" deprecated="true" /> <!-- Technical Preview -->
4850
</key>
4951
</keyword>
5052
</ldmlBCP47>

‎make/data/cldr/common/bcp47/number.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ For terms of use, see http://www.unicode.org/copyright.html
105105
<type name="thai" description="Thai digits"/>
106106
<type name="tirh" description="Tirhuta digits" since="28"/>
107107
<type name="tibt" description="Tibetan digits"/>
108+
<type name="tols" description="Tolong Siki digits" since="48"/>
108109
<type name="traditio" description="Traditional numerals — may be algorithmic" alias="traditional" since="21"/>
109110
<type name="vaii" description="Vai digits" since="21"/>
110111
<type name="wara" description="Warang Citi digits" since="28"/>

‎make/data/cldr/common/bcp47/timezone.xml‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ For terms of use, see http://www.unicode.org/copyright.html
1717
<type name="aiaxa" description="Anguilla" alias="America/Anguilla"/>
1818
<type name="altia" description="Tirane, Albania" alias="Europe/Tirane"/>
1919
<type name="amevn" description="Yerevan, Armenia" alias="Asia/Yerevan"/>
20-
<type name="ancur" description="Curaçao" alias="America/Curacao"/>
20+
<type name="ancur" description="Curaçao" alias="America/Curacao" region="CW"/>
2121
<type name="aolad" description="Luanda, Angola" alias="Africa/Luanda"/>
22-
<type name="aqams" description="Amundsen-Scott Station, South Pole" deprecated="true" preferred="nzakl"/>
22+
<type name="aqams" description="Amundsen-Scott Station, South Pole" deprecated="true" preferred="aqmcm"/>
2323
<type name="aqcas" description="Casey Station, Bailey Peninsula" alias="Antarctica/Casey"/>
2424
<type name="aqdav" description="Davis Station, Vestfold Hills" alias="Antarctica/Davis"/>
2525
<type name="aqddu" description="Dumont d'Urville Station, Terre Adélie" alias="Antarctica/DumontDUrville"/>
2626
<type name="aqmaw" description="Mawson Station, Holme Bay" alias="Antarctica/Mawson"/>
27-
<type name="aqmcm" description="McMurdo Station, Ross Island" alias="Antarctica/McMurdo"/>
27+
<type name="aqmcm" description="McMurdo Station, Ross Island" alias="Antarctica/McMurdo Antarctica/South_Pole"/>
2828
<type name="aqplm" description="Palmer Station, Anvers Island" alias="Antarctica/Palmer"/>
2929
<type name="aqrot" description="Rothera Station, Adelaide Island" alias="Antarctica/Rothera"/>
3030
<type name="aqsyw" description="Syowa Station, East Ongul Island" alias="Antarctica/Syowa"/>
@@ -130,6 +130,7 @@ For terms of use, see http://www.unicode.org/copyright.html
130130
<type name="chzrh" description="Zurich, Switzerland" alias="Europe/Zurich"/>
131131
<type name="ciabj" description="Abidjan, Côte d'Ivoire" alias="Africa/Abidjan"/>
132132
<type name="ckrar" description="Rarotonga, Cook Islands" alias="Pacific/Rarotonga"/>
133+
<type name="clcxq" description="Aysén Region, Chile" alias="America/Coyhaique" since="48"/>
133134
<type name="clipc" description="Easter Island, Chile" alias="Pacific/Easter Chile/EasterIsland"/>
134135
<type name="clpuq" description="Punta Arenas, Chile" alias="America/Punta_Arenas" since="31"/>
135136
<type name="clscl" description="Santiago, Chile" alias="America/Santiago Chile/Continental"/>
@@ -167,7 +168,7 @@ For terms of use, see http://www.unicode.org/copyright.html
167168
<type name="est5edt" description="POSIX style time zone for US Eastern Time" deprecated="true" preferred="usnyc"/>
168169
<type name="etadd" description="Addis Ababa, Ethiopia" alias="Africa/Addis_Ababa"/>
169170
<type name="fihel" description="Helsinki, Finland" alias="Europe/Helsinki"/>
170-
<type name="fimhq" description="Mariehamn, Åland, Finland" alias="Europe/Mariehamn"/>
171+
<type name="fimhq" description="Mariehamn, Åland, Finland" alias="Europe/Mariehamn" region="AX"/>
171172
<type name="fjsuv" description="Fiji" alias="Pacific/Fiji"/>
172173
<type name="fkpsy" description="Stanley, Falkland Islands" alias="Atlantic/Stanley"/>
173174
<type name="fmksa" description="Kosrae, Micronesia" alias="Pacific/Kosrae"/>
@@ -177,7 +178,7 @@ For terms of use, see http://www.unicode.org/copyright.html
177178
<type name="frpar" description="Paris, France" alias="Europe/Paris"/>
178179
<type name="galbv" description="Libreville, Gabon" alias="Africa/Libreville"/>
179180
<type name="gaza" description="Gaza Strip, Palestinian Territories" deprecated="true" preferred="gazastrp"/>
180-
<type name="gazastrp" description="Gaza Strip, Palestinian Territories" alias="Asia/Gaza" since="40"/>
181+
<type name="gazastrp" description="Gaza Strip, Palestinian Territories" alias="Asia/Gaza" since="40" region="PS"/>
181182
<type name="gblon" description="London, United Kingdom" alias="Europe/London Europe/Belfast GB GB-Eire"/>
182183
<type name="gdgnd" description="Grenada" alias="America/Grenada"/>
183184
<type name="getbs" description="Tbilisi, Georgia" alias="Asia/Tbilisi"/>
@@ -193,16 +194,16 @@ For terms of use, see http://www.unicode.org/copyright.html
193194
<type name="gmt" description="Greenwich Mean Time" alias="Etc/GMT Etc/GMT+0 Etc/GMT-0 Etc/GMT0 Etc/Greenwich GMT GMT+0 GMT-0 GMT0 Greenwich" since="31"/>
194195
<type name="gncky" description="Conakry, Guinea" alias="Africa/Conakry"/>
195196
<type name="gpbbr" description="Guadeloupe" alias="America/Guadeloupe"/>
196-
<type name="gpmsb" description="Marigot, Saint Martin" alias="America/Marigot"/>
197-
<type name="gpsbh" description="Saint Barthélemy" alias="America/St_Barthelemy"/>
197+
<type name="gpmsb" description="Marigot, Saint Martin" alias="America/Marigot" region="MF"/>
198+
<type name="gpsbh" description="Saint Barthélemy" alias="America/St_Barthelemy" region="BL"/>
198199
<type name="gqssg" description="Malabo, Equatorial Guinea" alias="Africa/Malabo"/>
199200
<type name="grath" description="Athens, Greece" alias="Europe/Athens EET"/>
200201
<type name="gsgrv" description="South Georgia and the South Sandwich Islands" alias="Atlantic/South_Georgia"/>
201202
<type name="gtgua" description="Guatemala" alias="America/Guatemala"/>
202203
<type name="gugum" description="Guam" alias="Pacific/Guam"/>
203204
<type name="gwoxb" description="Bissau, Guinea-Bissau" alias="Africa/Bissau"/>
204205
<type name="gygeo" description="Guyana" alias="America/Guyana"/>
205-
<type name="hebron" description="West Bank, Palestinian Territories" alias="Asia/Hebron" since="21"/>
206+
<type name="hebron" description="West Bank, Palestinian Territories" alias="Asia/Hebron" since="21" region="PS"/>
206207
<type name="hkhkg" description="Hong Kong SAR China" alias="Asia/Hong_Kong Hongkong"/>
207208
<type name="hntgu" description="Tegucigalpa, Honduras" alias="America/Tegucigalpa"/>
208209
<type name="hrzag" description="Zagreb, Croatia" alias="Europe/Zagreb"/>
@@ -220,7 +221,7 @@ For terms of use, see http://www.unicode.org/copyright.html
220221
<type name="irthr" description="Tehran, Iran" alias="Asia/Tehran Iran"/>
221222
<type name="isrey" description="Reykjavik, Iceland" alias="Atlantic/Reykjavik Iceland"/>
222223
<type name="itrom" description="Rome, Italy" alias="Europe/Rome"/>
223-
<type name="jeruslm" description="Jerusalem" alias="Asia/Jerusalem Asia/Tel_Aviv Israel"/>
224+
<type name="jeruslm" description="Jerusalem" alias="Asia/Jerusalem Asia/Tel_Aviv Israel" region="IL"/>
224225
<type name="jesth" description="Jersey" alias="Europe/Jersey"/>
225226
<type name="jmkin" description="Jamaica" alias="America/Jamaica Jamaica"/>
226227
<type name="joamm" description="Amman, Jordan" alias="Asia/Amman"/>
@@ -305,7 +306,7 @@ For terms of use, see http://www.unicode.org/copyright.html
305306
<type name="npktm" description="Kathmandu, Nepal" alias="Asia/Katmandu Asia/Kathmandu" iana="Asia/Kathmandu"/>
306307
<type name="nrinu" description="Nauru" alias="Pacific/Nauru"/>
307308
<type name="nuiue" description="Niue" alias="Pacific/Niue"/>
308-
<type name="nzakl" description="Auckland, New Zealand" alias="Pacific/Auckland Antarctica/South_Pole NZ"/>
309+
<type name="nzakl" description="Auckland, New Zealand" alias="Pacific/Auckland NZ"/>
309310
<type name="nzcht" description="Chatham Islands, New Zealand" alias="Pacific/Chatham NZ-CHAT"/>
310311
<type name="ommct" description="Muscat, Oman" alias="Asia/Muscat"/>
311312
<type name="papty" description="Panama" alias="America/Panama EST"/>

‎make/data/cldr/common/dtd/cldrTest.dtd‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
<!--
2-
Copyright © 2003-2010 Unicode, Inc. and others. All rights reserved. Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
3-
4-
Permission is hereby granted, free of charge, to any person obtaining a copy of the Unicode data files and any associated documentation (the "Data Files") or Unicode software and any associated documentation (the "Software") to deal in the Data Files or Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, and/or sell copies of the Data Files or Software, and to permit persons to whom the Data Files or Software are furnished to do so, provided that (a) the above copyright notice(s) and this permission notice appear with all copies of the Data Files or Software, (b) both the above copyright notice(s) and this permission notice appear in associated documentation, and (c) there is clear notice in each modified Data File or in the Software as well as in the documentation associated with the Data File(s) or Software that the data or software has been modified.
5-
6-
THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA FILES OR SOFTWARE.
7-
8-
Except as contained in this notice, the name of a copyright holder shall not be used in advertising or otherwise to promote the sale, use or other dealings in these Data Files or Software without prior written authorization of the copyright holder.
2+
Copyright © 1991-2025 Unicode, Inc.
3+
For terms of use, see http://www.unicode.org/copyright.html
4+
SPDX-License-Identifier: Unicode-3.0
5+
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
96
-->
107

8+
<!-- This is only referenced by the deprecated GenerateLikelySubtagTests.java - see CLDR-17535 -->
9+
1110
<!ELEMENT cldrTest ((number | date | zoneFields | collation | likelySubtags)*) >
1211
<!ATTLIST cldrTest version CDATA #REQUIRED>
1312
<!ATTLIST cldrTest base CDATA #REQUIRED>
@@ -48,4 +47,3 @@ Except as contained in this notice, the name of a copyright holder shall not be
4847
<!-- likelySubtags result attributes -->
4948
<!ATTLIST result add NMTOKEN #IMPLIED>
5049
<!ATTLIST result remove NMTOKEN #IMPLIED>
51-

‎make/data/cldr/common/dtd/ldml.dtd‎

Lines changed: 49 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
4242
<!ATTLIST version number CDATA #REQUIRED >
4343
<!--@MATCH:regex/\$Revision.*\$-->
4444
<!--@METADATA-->
45-
<!ATTLIST version cldrVersion CDATA #FIXED "47" >
45+
<!ATTLIST version cldrVersion CDATA #FIXED "48" >
4646
<!--@MATCH:any-->
4747
<!--@VALUE-->
4848
<!ATTLIST version draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
@@ -64,6 +64,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
6464
<!--@MATCH:validity/locale-for-names-->
6565
<!ATTLIST language alt NMTOKENS #IMPLIED >
6666
<!--@MATCH:literal/long, secondary, short, variant, menu, official-->
67+
<!ATTLIST language menu NMTOKENS #IMPLIED >
68+
<!--@MATCH:literal/core, extension-->
6769
<!ATTLIST language draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
6870
<!--@METADATA-->
6971
<!--@DEPRECATED:true, false-->
@@ -277,6 +279,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
277279
<!--@MATCH:bcp47/anykey-->
278280
<!ATTLIST type type NMTOKEN #REQUIRED >
279281
<!--@MATCH:bcp47/anyvalue-->
282+
<!ATTLIST type scope NMTOKEN #IMPLIED >
283+
<!--@MATCH:literal/core-->
280284
<!ATTLIST type alt NMTOKENS #IMPLIED >
281285
<!--@MATCH:literal/short, variant-->
282286
<!ATTLIST type draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
@@ -456,7 +460,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
456460
<!--@DEPRECATED-->
457461

458462
<!ELEMENT exemplarCharacters ( #PCDATA | cp )* >
459-
<!ATTLIST exemplarCharacters type (auxiliary | standard | punctuation | currencySymbol | index | numbers) #IMPLIED >
463+
<!ATTLIST exemplarCharacters type (standard | auxiliary | numbers | numbers-auxiliary | punctuation | punctuation-auxiliary | punctuation-person | index | currencySymbol) #IMPLIED >
460464
<!--@DEPRECATED:currencySymbol-->
461465
<!ATTLIST exemplarCharacters alt NMTOKENS #IMPLIED >
462466
<!--@MATCH:literal/variant-->
@@ -1528,7 +1532,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
15281532

15291533
<!ELEMENT dateTimeFormat ( alias | ( pattern*, displayName*, special* ) ) >
15301534
<!ATTLIST dateTimeFormat type NMTOKEN "standard" >
1531-
<!--@MATCH:literal/standard, atTime-->
1535+
<!--@MATCH:literal/standard, atTime, relative-->
15321536
<!ATTLIST dateTimeFormat alt NMTOKENS #IMPLIED >
15331537
<!--@MATCH:literal/variant-->
15341538
<!ATTLIST dateTimeFormat draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
@@ -1718,7 +1722,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
17181722
<!ATTLIST relativePeriod draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
17191723
<!--@METADATA-->
17201724

1721-
<!ELEMENT timeZoneNames ( alias | ( hourFormat*, hoursFormat*, gmtFormat*, gmtZeroFormat*, regionFormat*, fallbackFormat*, fallbackRegionFormat*, abbreviationFallback*, preferenceOrdering*, singleCountries*, default*, zone*, metazone*, special* ) ) >
1725+
<!ELEMENT timeZoneNames ( alias | ( hourFormat*, hoursFormat*, gmtFormat*, gmtZeroFormat*, gmtUnknownFormat*, regionFormat*, fallbackFormat*, fallbackRegionFormat*, abbreviationFallback*, preferenceOrdering*, singleCountries*, default*, zone*, metazone*, special* ) ) >
17221726
<!ATTLIST timeZoneNames draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
17231727
<!--@METADATA-->
17241728
<!--@DEPRECATED-->
@@ -1765,6 +1769,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
17651769
<!ATTLIST gmtZeroFormat references CDATA #IMPLIED >
17661770
<!--@METADATA-->
17671771

1772+
<!ELEMENT gmtUnknownFormat ( #PCDATA ) >
1773+
<!ATTLIST gmtUnknownFormat alt NMTOKENS #IMPLIED >
1774+
<!--@MATCH:literal/variant-->
1775+
<!ATTLIST gmtUnknownFormat draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
1776+
<!--@METADATA-->
1777+
<!--@DEPRECATED:true, false-->
1778+
<!ATTLIST gmtUnknownFormat references CDATA #IMPLIED >
1779+
<!--@METADATA-->
1780+
17681781
<!ELEMENT regionFormat ( #PCDATA ) >
17691782
<!ATTLIST regionFormat type (standard | daylight) #IMPLIED >
17701783
<!ATTLIST regionFormat alt NMTOKENS #IMPLIED >
@@ -1963,7 +1976,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
19631976

19641977
<!-- ######################################################### -->
19651978

1966-
<!ELEMENT numbers ( alias | ( defaultNumberingSystem*, otherNumberingSystems*, minimumGroupingDigits*, symbols*, decimalFormats*, scientificFormats*, percentFormats*, currencyFormats*, currencies?, miscPatterns*, minimalPairs*, special* ) ) >
1979+
<!ELEMENT numbers ( alias | ( defaultNumberingSystem*, otherNumberingSystems*, minimumGroupingDigits*, symbols*, decimalFormats*, rationalFormats*, scientificFormats*, percentFormats*, currencyFormats*, currencies?, miscPatterns*, minimalPairs*, special* ) ) >
19671980
<!ATTLIST numbers alt NMTOKENS #IMPLIED >
19681981
<!--@MATCH:literal/variant-->
19691982
<!ATTLIST numbers draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
@@ -2267,6 +2280,28 @@ CLDR data files are interpreted according to the LDML specification (http://unic
22672280
<!--@VALUE-->
22682281
<!--@DEPRECATED-->
22692282

2283+
<!ELEMENT rationalFormats ( alias | ( rationalPattern*, integerAndRationalPattern*, rationalUsage*, special* ) ) >
2284+
<!ATTLIST rationalFormats numberSystem CDATA #REQUIRED >
2285+
<!--@MATCH:bcp47/nu-->
2286+
2287+
<!ELEMENT rationalPattern ( #PCDATA ) >
2288+
<!ATTLIST rationalPattern alt NMTOKENS #IMPLIED >
2289+
<!--@MATCH:literal/variant-->
2290+
<!ATTLIST rationalPattern draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
2291+
<!--@METADATA-->
2292+
2293+
<!ELEMENT integerAndRationalPattern ( #PCDATA ) >
2294+
<!ATTLIST integerAndRationalPattern alt NMTOKENS #IMPLIED >
2295+
<!--@MATCH:literal/superSub-->
2296+
<!ATTLIST integerAndRationalPattern draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
2297+
<!--@METADATA-->
2298+
2299+
<!ELEMENT rationalUsage ( #PCDATA ) >
2300+
<!ATTLIST rationalUsage alt NMTOKENS #IMPLIED >
2301+
<!--@MATCH:literal/variant-->
2302+
<!ATTLIST rationalUsage draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
2303+
<!--@METADATA-->
2304+
22702305
<!ELEMENT scientificFormats ( alias | ( default*, scientificFormatLength*, special* ) ) >
22712306
<!ATTLIST scientificFormats draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
22722307
<!--@METADATA-->
@@ -3100,12 +3135,20 @@ CLDR data files are interpreted according to the LDML specification (http://unic
31003135

31013136
<!ELEMENT rbnf ( alias | ( rulesetGrouping*, special* ) ) >
31023137

3103-
<!ELEMENT rulesetGrouping ( alias | ( ruleset*, special* ) ) >
3138+
<!ELEMENT rulesetGrouping ( alias | ( rbnfRules?, ruleset*, special* ) ) >
31043139
<!ATTLIST rulesetGrouping type NMTOKEN #REQUIRED >
31053140
<!--@MATCH:literal/NumberingSystemRules, OrdinalRules, SpelloutRules-->
31063141
<!ATTLIST rulesetGrouping draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
31073142
<!--@METADATA-->
31083143

3144+
<!ELEMENT rbnfRules ( #PCDATA ) >
3145+
<!--@CDATA-->
3146+
<!ATTLIST rbnfRules alt NMTOKENS #IMPLIED >
3147+
<!--@MATCH:literal/variant-->
3148+
<!ATTLIST rbnfRules draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
3149+
<!--@METADATA-->
3150+
<!--@DEPRECATED:true, false-->
3151+
31093152
<!ELEMENT ruleset ( alias | ( rbnfrule*, special* ) ) >
31103153
<!--@ORDERED-->
31113154
<!ATTLIST ruleset type NMTOKEN #REQUIRED >

0 commit comments

Comments
 (0)