Skip to content

Commit 7761681

Browse files
li-dian-dianli-dian-dian
authored
Merge branch 'unicode-org:main' into patch-5
2 parents ec1fa64 + bd928a1 commit 7761681

File tree

151 files changed

+3691
-2879
lines changed

Some content is hidden

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

151 files changed

+3691
-2879
lines changed

‎.github/workflows/maven.yml

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
name: cldr-mvn
22

3+
env:
4+
## uncomment only ONE of these
5+
# CLDR_CHECK_MODE: FINAL_TESTING
6+
CLDR_CHECK_MODE: BUILD
7+
38
on:
49
push:
510
pull_request:
@@ -196,7 +201,7 @@ jobs:
196201
env:
197202
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
198203
- name: run CLDR console check
199-
run: java -DCLDR_GITHUB_ANNOTATIONS=true -DCLDR_DIR=$(pwd) -Xmx6g -jar tools/cldr-code/target/cldr-code.jar check -S common,seed -e -z FINAL_TESTING
204+
run: java -DCLDR_GITHUB_ANNOTATIONS=true -DCLDR_DIR=$(pwd) -Xmx6g -jar tools/cldr-code/target/cldr-code.jar check -S common,seed -e -z ${CLDR_CHECK_MODE}
200205
deploy:
201206
# don't run deploy on manual builds!
202207
if: github.repository == 'unicode-org/cldr' && github.event_name == 'push' && github.ref == 'refs/heads/main' && github.event.inputs.git-ref == ''

‎.node-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v20.18.0
1+
v22.14.0

‎common/bcp47/timezone.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -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"/>
@@ -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"/>

‎common/collation/blo.xml

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<?xml version="1.0" encoding="UTF-8" ?>
2+
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
3+
<!--
4+
Copyright © 2025 Unicode, Inc.
5+
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
6+
For terms of use, see http://www.unicode.org/copyright.html
7+
-->
8+
<ldml>
9+
<identity>
10+
<version number="$Revision$" />
11+
<language type="blo" />
12+
</identity>
13+
<collations>
14+
<collation type="standard">
15+
<cr><![CDATA[
16+
&a < ǝ <<< Ǝ
17+
&g < gb <<< Gb <<< GB
18+
&k < kp <<< Kp <<< KP
19+
&n < ny <<< Ny <<< NY
20+
&ŋ < ŋm <<< Ŋm <<< ŊM
21+
&s < sh <<< Sh <<< SH
22+
]]></cr>
23+
</collation>
24+
</collations>
25+
</ldml>

‎common/dtd/ldml.dtd

+4
Original file line numberDiff line numberDiff line change
@@ -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 >

‎common/main/blo.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -432,8 +432,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
432432
</codePatterns>
433433
</localeDisplayNames>
434434
<characters>
435-
<exemplarCharacters>[aáàâ b c ɖ eéèê ǝ{ǝ́}{ǝ̀}{ǝ̂} ɛ{ɛ́}{ɛ̀}{ɛ̂} f g {gb} h iíìî ɩ{ɩ́}{ɩ̀}{ɩ̂} j k {kp} l mḿ{m̀} nńǹ {ny} ŋ{ŋ́}{ŋ̀} {ŋm} oóòô ɔ{ɔ́}{ɔ̀}{ɔ̂} p r s {sh} t uúùû ʊ{ʊ́}{ʊ̀}{ʊ̂} w y]</exemplarCharacters>
436-
<exemplarCharacters type="auxiliary">[ăǎåäãā{a̰} æ ɓ ćç d ɗ ĕěëẽēḛ {ǝ̃}{ǝ̄}{ǝ̰} {ə̌} {ɛ̌}{ɛ̃}{ɛ̄}{ɛ̰} ƒ ɣ {hw} ĭǐïĩīḭ ij {ɩ̃}{ɩ̄}{ɩ̰} {m̌}{m̄} ňñ{n̄} {ŋw} ŏǒöõøō{o̰} œ {ɔ̌}{ɔ̃}{ɔ̄}{ɔ̰} ř šſ ß ŭǔüūṵ {̃ũ} {ʊ̌}{ʊ̃}{ʊ̄}{ʊ̰} v ʋ x {xw} ÿ ƴ z ʒ {̃ʼ}]</exemplarCharacters>
435+
<exemplarCharacters>[aáàâ ǝ{ǝ́}{ǝ̀}{ǝ̂} b c ɖ eéèê ɛ{ɛ́}{ɛ̀}{ɛ̂} f g {gb} h iíìî ɩ{ɩ́}{ɩ̀}{ɩ̂} j k {kp} l mḿ{m̀} nńǹ {ny} ŋ{ŋ́}{ŋ̀} {ŋm} oóòô ɔ{ɔ́}{ɔ̀}{ɔ̂} p r s {sh} t uúùû ʊ{ʊ́}{ʊ̀}{ʊ̂} w y]</exemplarCharacters>
436+
<exemplarCharacters type="auxiliary">[ăǎåäãā{a̰} æ {ǝ̃}{ǝ̄}{ǝ̰} ɓ ćç d ɗ ĕěëẽēḛ {ə̌} {ɛ̌}{ɛ̃}{ɛ̄}{ɛ̰} ƒ ɣ {hw} ĭǐïĩīḭ ij {ɩ̃}{ɩ̄}{ɩ̰} {m̌}{m̄} ňñ{n̄} {ŋw} ŏǒöõøō{o̰} œ {ɔ̌}{ɔ̃}{ɔ̄}{ɔ̰} ř šſ ß ŭǔüūṵ {̃ũ} {ʊ̌}{ʊ̃}{ʊ̄}{ʊ̰} v ʋ x {xw} ÿ ƴ z ʒ {̃ʼ}]</exemplarCharacters>
437437
<exemplarCharacters type="numbers">[   \- ‑ , . % ‰ ‱ + 0 1 2² 3³ 4 5 6 7 8 9 {ʲᵃ} {ᵏᵃ}]</exemplarCharacters>
438438
<exemplarCharacters type="punctuation">[_ \- ‐‑ – — ― , ; \: ! ? . … '‘’ ‹ › &quot;“” « » ( ) \[ \] \{ \} § @ * / \\ \&amp; # % ‰ ‱ † ‡ • ‣ ‧ ′ ″ ° &lt; = &gt; | ¦ ~]</exemplarCharacters>
439439
<ellipsis type="final">↑↑↑</ellipsis>

‎common/main/bqi.xml

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?xml version="1.0" encoding="UTF-8" ?>
2+
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
3+
<!-- Copyright © 1991-2025 Unicode, Inc.
4+
For terms of use, see http://www.unicode.org/copyright.html
5+
SPDX-License-Identifier: Unicode-3.0
6+
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
7+
-->
8+
<ldml>
9+
<identity>
10+
<version number="$Revision$"/>
11+
<language type="bqi"/>
12+
</identity>
13+
<layout>
14+
<orientation>
15+
<characterOrder>right-to-left</characterOrder>
16+
</orientation>
17+
</layout>
18+
<characters>
19+
<!-- Using the Persian orthography -->
20+
<exemplarCharacters>[ً ٌ ٍ ّ ٔ ء آ أ ؤ ئ ا ب پ ة ت ث ج چ ح خ د ذ ر ز ژ س ش ص ض ط ظ ع غ ف ق ک گ ل م ن ه و ی]</exemplarCharacters>
21+
<exemplarCharacters type="auxiliary">[ـ\u200C\u200D\u200E\u200F َ ُ ِ ْ ٖ ٰ إ ك ى ي]</exemplarCharacters>
22+
<exemplarCharacters type="index">[آ ا ب پ ت ث ج چ ح خ د ذ ر ز ژ س ش ص ض ط ظ ع غ ف ق ک گ ل م ن ه و ی]</exemplarCharacters>
23+
<exemplarCharacters type="numbers">[\u200E , ٫ ٬ . % ٪ ‰ ؉ + − 0۰ 1۱ 2۲ 3۳ 4۴ 5۵ 6۶ 7۷ 8۸ 9۹]</exemplarCharacters>
24+
<exemplarCharacters type="punctuation">[\- ‐‑ ، ٫ ٬ ؛ \: ! ؟ . … ‹ › « » ( ) \[ \] * / \\]</exemplarCharacters>
25+
</characters>
26+
</ldml>

‎common/main/bqi_IR.xml

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="UTF-8" ?>
2+
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
3+
<!-- Copyright © 1991-2025 Unicode, Inc.
4+
For terms of use, see http://www.unicode.org/copyright.html
5+
SPDX-License-Identifier: Unicode-3.0
6+
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
7+
-->
8+
<ldml>
9+
<identity>
10+
<version number="$Revision$"/>
11+
<language type="bqi"/>
12+
<territory type="IR"/>
13+
</identity>
14+
</ldml>

‎common/main/bua.xml

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0" encoding="UTF-8" ?>
2+
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
3+
<!-- Copyright © 1991-2025 Unicode, Inc.
4+
For terms of use, see http://www.unicode.org/copyright.html
5+
SPDX-License-Identifier: Unicode-3.0
6+
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
7+
-->
8+
<ldml>
9+
<identity>
10+
<version number="$Revision$"/>
11+
<language type="bua"/>
12+
</identity>
13+
<characters>
14+
<exemplarCharacters>[а б в г д её ж з и й к л м н о ө п р с т у ү ф х һ ц ч ш щ ъ ы ь э ю я]</exemplarCharacters>
15+
<exemplarCharacters type="numbers">↑↑↑</exemplarCharacters>
16+
<exemplarCharacters type="punctuation">[\- ‐‑ – — , ; \: ! ? . … '‘‚ &quot;“„ « » ( ) \[ \] \{ \} § @ * / \&amp; #]</exemplarCharacters>
17+
</characters>
18+
</ldml>

‎common/main/bua_RU.xml

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="UTF-8" ?>
2+
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
3+
<!-- Copyright © 1991-2025 Unicode, Inc.
4+
For terms of use, see http://www.unicode.org/copyright.html
5+
SPDX-License-Identifier: Unicode-3.0
6+
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
7+
-->
8+
<ldml>
9+
<identity>
10+
<version number="$Revision$"/>
11+
<language type="bua"/>
12+
<territory type="RU"/>
13+
</identity>
14+
</ldml>

0 commit comments

Comments
 (0)