diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index d73f3119755..23956cb570c 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -1,5 +1,11 @@ + name: Publish to gh-pages +permissions: + pages: write + deployments: write + id-token: write + on: push: branches: @@ -53,22 +59,16 @@ jobs: - name: Build Jekyll part of the site run: | gem install bundler github-pages kramdown-parser-gfm # should pull in jekyll, etc. - jekyll build -s docs -d _site + cd docs && github-pages build && mkdir -vp ../_site/ldml + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Rearrange stuff run: 'cp -vr tools/scripts/tr-archive/dist/* ./_site/ldml/ && cp tools/scripts/tr-archive/reports-v2.css ./_site/' - name: Deploy to GitHub Pages (main) if: github.event_name == 'push' && github.ref == 'refs/heads/main' - uses: Cecilapp/GitHub-Pages-deploy@v3 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - # email: username@domain.tld - build_dir: _site # optional - branch: gh-pages # optional - # cname: domain.tld # optional - # jekyll: no # optional - commit_message: CLDR-00000 Automated Build of Pages # optional + uses: actions/upload-pages-artifact@v2 - name: Deploy to Smoketest + if: github.repository == 'unicode-org/cldr' shell: bash env: RSA_KEY_CCC: ${{ secrets.RSA_KEY_CCC }} @@ -86,6 +86,16 @@ jobs: rsync -cav --delete-after -e "ssh -o UserKnownHostsFile=${HOME}/.knownhosts -i ${HOME}/.key -p ${CCC_PORT}" ./_site/ ${CCC_USER}@${CCC_HOST}:spec/$(basename ${GITHUB_REF_NAME})/ echo "::endgroup::" echo "Now go to https://cldr-smoke.unicode.org/spec/"$(basename ${GITHUB_REF_NAME}) + deploy: + environment: + name: github-pages + url: ${{steps.deployment.outputs.page_url}} + runs-on: ubuntu-latest + needs: build + steps: + - name: Deploy to GitHub Pages + id: deployment + uses: actions/deploy-pages@v2 # only run one of these at a time concurrency: diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 14ed3163248..c9e61af4087 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -187,7 +187,7 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: run CLDR console check - 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 + run: java -DCLDR_GITHUB_ANNOTATIONS=true -DCLDR_DIR=$(pwd) -Xmx6g -jar tools/cldr-code/target/cldr-code.jar check -S common,seed -e -z BUILD deploy: # don't run deploy on manual builds! if: github.repository == 'unicode-org/cldr' && github.event_name == 'push' && github.ref == 'refs/heads/main' && github.event.inputs.git-ref == '' diff --git a/.node-version b/.node-version index e048c8ca198..a81debaeef4 100644 --- a/.node-version +++ b/.node-version @@ -1 +1 @@ -v18.15.0 +v20.12.2 diff --git a/README.md b/README.md index 37c25704c48..be5b3f825f6 100644 --- a/README.md +++ b/README.md @@ -10,14 +10,14 @@ For current CLDR release information, see [cldr.unicode.org](https://cldr.unicod ## Status -Update: 2024-04-03 +Update: 2024-04-22 - - - -**Note:** This is a pre-release candidate version of CLDR 45, intended for testing. It is not recommended for production use. - +**Note:** CLDR 46 is in development and not recommended for use at this stage. + + + + ### What is CLDR? The Unicode Common Locale Data Repository (CLDR) provides key building blocks for software to support the world's languages, with the largest and most extensive standard repository of locale data available. This data is used by a [wide spectrum of companies](https://cldr.unicode.org/index#h.ezpykkomyltl) for their software internationalization and localization, adapting software to the conventions of different languages for such common software tasks. diff --git a/common/annotations/en.xml b/common/annotations/en.xml index 51df7ef7609..3049562b43a 100644 --- a/common/annotations/en.xml +++ b/common/annotations/en.xml @@ -3907,5 +3907,21 @@ annotations. superscript three measure | micro sign micro sign + + harp + music | instrument | love | cupid | orchestra + shovel + dig | spade | hole | scoop + leafless tree + winter | barren | drought + fingerprint + forensics | identity | safety + root vegetable + root | vegetable | garden | beet | turnip + splatter + paint | holi | spill | stain + face with bags under eyes + tired | sleepy | exhausted + diff --git a/common/annotations/root.xml b/common/annotations/root.xml index e742446290a..340841a4f40 100644 --- a/common/annotations/root.xml +++ b/common/annotations/root.xml @@ -3908,5 +3908,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ E13-137 E13-150 E13-150 + + E16-001 + E16-001 + E16-002 + E16-002 + E16-003 + E16-003 + E16-004 + E16-004 + E16-005 + E16-005 + E16-006 + E16-006 + E16-007 + E16-007 + diff --git a/common/bcp47/number.xml b/common/bcp47/number.xml index 19579ac5a9f..7d242ac07e1 100644 --- a/common/bcp47/number.xml +++ b/common/bcp47/number.xml @@ -28,12 +28,14 @@ For terms of use, see http://www.unicode.org/copyright.html + + @@ -52,6 +54,7 @@ For terms of use, see http://www.unicode.org/copyright.html + @@ -69,6 +72,8 @@ For terms of use, see http://www.unicode.org/copyright.html + + @@ -76,8 +81,10 @@ For terms of use, see http://www.unicode.org/copyright.html + + @@ -88,6 +95,7 @@ For terms of use, see http://www.unicode.org/copyright.html + diff --git a/common/dtd/ldml.dtd b/common/dtd/ldml.dtd index d968a6962d5..32bbd81e30d 100644 --- a/common/dtd/ldml.dtd +++ b/common/dtd/ldml.dtd @@ -42,7 +42,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - + diff --git a/common/dtd/ldml.xsd b/common/dtd/ldml.xsd index 92a0f548286..ee03c2275cc 100644 --- a/common/dtd/ldml.xsd +++ b/common/dtd/ldml.xsd @@ -128,10 +128,10 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file - + - + diff --git a/common/dtd/ldmlBCP47.dtd b/common/dtd/ldmlBCP47.dtd index f608a6e8a60..e69ae1e7724 100644 --- a/common/dtd/ldmlBCP47.dtd +++ b/common/dtd/ldmlBCP47.dtd @@ -12,7 +12,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - + diff --git a/common/dtd/ldmlBCP47.xsd b/common/dtd/ldmlBCP47.xsd index 39d6cd2d2c6..d55d3f40728 100644 --- a/common/dtd/ldmlBCP47.xsd +++ b/common/dtd/ldmlBCP47.xsd @@ -24,10 +24,10 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file - + - + diff --git a/common/dtd/ldmlSupplemental.dtd b/common/dtd/ldmlSupplemental.dtd index 864e696e030..8d84b56afca 100644 --- a/common/dtd/ldmlSupplemental.dtd +++ b/common/dtd/ldmlSupplemental.dtd @@ -12,10 +12,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic - + - + @@ -1078,7 +1078,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - + @@ -1155,17 +1155,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic - + - + - + - + diff --git a/common/dtd/ldmlSupplemental.xsd b/common/dtd/ldmlSupplemental.xsd index 2aeeecf1084..6716f017f62 100644 --- a/common/dtd/ldmlSupplemental.xsd +++ b/common/dtd/ldmlSupplemental.xsd @@ -64,17 +64,17 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file - + - + - + - + diff --git a/common/main/ar.xml b/common/main/ar.xml index 33c4f2b3c5c..57cf6bf3f95 100644 --- a/common/main/ar.xml +++ b/common/main/ar.xml @@ -6000,7 +6000,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - arab + latn latn arab diff --git a/common/main/ar_AE.xml b/common/main/ar_AE.xml index 5b5b772ab0a..6e05d78ae80 100644 --- a/common/main/ar_AE.xml +++ b/common/main/ar_AE.xml @@ -47,7 +47,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - latn + ↑↑↑ ↑↑↑ ↑↑↑ diff --git a/common/main/ar_BH.xml b/common/main/ar_BH.xml index e54fd9c49c0..68f4953fca0 100644 --- a/common/main/ar_BH.xml +++ b/common/main/ar_BH.xml @@ -12,7 +12,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - ↑↑↑ + arab ↑↑↑ ↑↑↑ diff --git a/common/main/ar_DJ.xml b/common/main/ar_DJ.xml index fba02cf10c5..1c26b06ed85 100644 --- a/common/main/ar_DJ.xml +++ b/common/main/ar_DJ.xml @@ -12,7 +12,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - ↑↑↑ + arab Fdj diff --git a/common/main/ar_DZ.xml b/common/main/ar_DZ.xml index 9b92377e63a..00e247e8652 100644 --- a/common/main/ar_DZ.xml +++ b/common/main/ar_DZ.xml @@ -81,7 +81,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - latn + ↑↑↑ ↑↑↑ ↑↑↑ diff --git a/common/main/ar_EG.xml b/common/main/ar_EG.xml index 152ac49dbc4..04a5829378a 100644 --- a/common/main/ar_EG.xml +++ b/common/main/ar_EG.xml @@ -17,7 +17,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - ↑↑↑ + arab ↑↑↑ ↑↑↑ diff --git a/common/main/ar_EH.xml b/common/main/ar_EH.xml index c95f176e065..a1aa11e3d79 100644 --- a/common/main/ar_EH.xml +++ b/common/main/ar_EH.xml @@ -12,6 +12,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic - latn + ↑↑↑ diff --git a/common/main/ar_ER.xml b/common/main/ar_ER.xml index c3394767a62..4af01255c81 100644 --- a/common/main/ar_ER.xml +++ b/common/main/ar_ER.xml @@ -12,7 +12,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - ↑↑↑ + arab Nfk diff --git a/common/main/ar_IL.xml b/common/main/ar_IL.xml index d4e679d8414..a5398a4857f 100644 --- a/common/main/ar_IL.xml +++ b/common/main/ar_IL.xml @@ -44,6 +44,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic - ↑↑↑ + arab diff --git a/common/main/ar_IQ.xml b/common/main/ar_IQ.xml index f7920015d30..9a23c3dd055 100644 --- a/common/main/ar_IQ.xml +++ b/common/main/ar_IQ.xml @@ -108,7 +108,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - ↑↑↑ + arab ↑↑↑ ↑↑↑ diff --git a/common/main/ar_JO.xml b/common/main/ar_JO.xml index cecc5604b40..18984502aac 100644 --- a/common/main/ar_JO.xml +++ b/common/main/ar_JO.xml @@ -108,7 +108,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - ↑↑↑ + arab ↑↑↑ ↑↑↑ diff --git a/common/main/ar_KM.xml b/common/main/ar_KM.xml index 58b55d014de..8dcd37c974b 100644 --- a/common/main/ar_KM.xml +++ b/common/main/ar_KM.xml @@ -44,7 +44,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - ↑↑↑ + arab CF diff --git a/common/main/ar_KW.xml b/common/main/ar_KW.xml index fcae469941d..3066e5992c1 100644 --- a/common/main/ar_KW.xml +++ b/common/main/ar_KW.xml @@ -12,7 +12,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - ↑↑↑ + arab ↑↑↑ ↑↑↑ diff --git a/common/main/ar_LB.xml b/common/main/ar_LB.xml index 96c6f4f845e..48561d333bb 100644 --- a/common/main/ar_LB.xml +++ b/common/main/ar_LB.xml @@ -111,7 +111,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - ↑↑↑ + arab , . diff --git a/common/main/ar_LY.xml b/common/main/ar_LY.xml index bbcf4480348..bd1cf81898e 100644 --- a/common/main/ar_LY.xml +++ b/common/main/ar_LY.xml @@ -52,7 +52,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - latn + ↑↑↑ , . diff --git a/common/main/ar_MA.xml b/common/main/ar_MA.xml index 22f5ca1dd3f..9dc1bb14b1f 100644 --- a/common/main/ar_MA.xml +++ b/common/main/ar_MA.xml @@ -109,7 +109,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - latn + ↑↑↑ ↑↑↑ ↑↑↑ diff --git a/common/main/ar_MR.xml b/common/main/ar_MR.xml index 27913630b40..d929886c891 100644 --- a/common/main/ar_MR.xml +++ b/common/main/ar_MR.xml @@ -111,7 +111,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - ↑↑↑ + arab , . diff --git a/common/main/ar_OM.xml b/common/main/ar_OM.xml index 4f3f28e06fc..d483bfd262a 100644 --- a/common/main/ar_OM.xml +++ b/common/main/ar_OM.xml @@ -12,7 +12,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - ↑↑↑ + arab ↑↑↑ ↑↑↑ diff --git a/common/main/ar_PS.xml b/common/main/ar_PS.xml index 3934a7311fe..4caf66947b9 100644 --- a/common/main/ar_PS.xml +++ b/common/main/ar_PS.xml @@ -108,6 +108,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic - ↑↑↑ + arab diff --git a/common/main/ar_QA.xml b/common/main/ar_QA.xml index 0c978ea0a05..dba60afdd60 100644 --- a/common/main/ar_QA.xml +++ b/common/main/ar_QA.xml @@ -12,7 +12,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - ↑↑↑ + arab ↑↑↑ ↑↑↑ diff --git a/common/main/ar_SA.xml b/common/main/ar_SA.xml index 76d21d18fed..89c52ceaa1f 100644 --- a/common/main/ar_SA.xml +++ b/common/main/ar_SA.xml @@ -1375,7 +1375,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - ↑↑↑ + arab ↑↑↑ ↑↑↑ diff --git a/common/main/ar_SD.xml b/common/main/ar_SD.xml index 7d1b0387378..0c51eabef18 100644 --- a/common/main/ar_SD.xml +++ b/common/main/ar_SD.xml @@ -12,7 +12,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - ↑↑↑ + arab ↑↑↑ ↑↑↑ diff --git a/common/main/ar_SO.xml b/common/main/ar_SO.xml index 4e3ebc418d8..126d56544b1 100644 --- a/common/main/ar_SO.xml +++ b/common/main/ar_SO.xml @@ -15,7 +15,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic [\u200E \- ‑ , . ٪ ‰ + 0 1 2 3 4 5 6 7 8 9] - ↑↑↑ + arab ٪ diff --git a/common/main/ar_SS.xml b/common/main/ar_SS.xml index 0255bb5e7c4..4575541aae6 100644 --- a/common/main/ar_SS.xml +++ b/common/main/ar_SS.xml @@ -12,7 +12,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - ↑↑↑ + arab GB£ diff --git a/common/main/ar_SY.xml b/common/main/ar_SY.xml index 2a3dbef0097..3db11037132 100644 --- a/common/main/ar_SY.xml +++ b/common/main/ar_SY.xml @@ -108,7 +108,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - ↑↑↑ + arab ↑↑↑ ↑↑↑ diff --git a/common/main/ar_TD.xml b/common/main/ar_TD.xml index 1e0556cb7f0..31e52575c19 100644 --- a/common/main/ar_TD.xml +++ b/common/main/ar_TD.xml @@ -12,6 +12,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic - ↑↑↑ + arab diff --git a/common/main/ar_TN.xml b/common/main/ar_TN.xml index 1f234ad102e..80386f5079b 100644 --- a/common/main/ar_TN.xml +++ b/common/main/ar_TN.xml @@ -81,7 +81,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - latn + ↑↑↑ ↑↑↑ ↑↑↑ diff --git a/common/main/ar_YE.xml b/common/main/ar_YE.xml index 83e157d8f14..4478a5d5468 100644 --- a/common/main/ar_YE.xml +++ b/common/main/ar_YE.xml @@ -12,7 +12,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - ↑↑↑ + arab ↑↑↑ ↑↑↑ diff --git a/common/main/en.xml b/common/main/en.xml index 9627d3608cf..e9a8b78ad6e 100644 --- a/common/main/en.xml +++ b/common/main/en.xml @@ -1543,12 +1543,14 @@ annotations. Ethiopic Numerals Financial Numerals Full-Width Digits + Garay Digits Georgian Numerals Gunjala Gondi digits Masaram Gondi digits Greek Numerals Greek Lowercase Numerals Gujarati Digits + Gurung Khema Digits Gurmukhi Digits Chinese Calendar Day-of-Month Numerals Chinese Decimal Numerals @@ -1567,6 +1569,7 @@ annotations. Kawi Digits Khmer Digits Kannada Digits + Kirat Rai Digits Tai Tham Hora Digits Tai Tham Tham Digits Lao Digits @@ -1584,6 +1587,8 @@ annotations. Mro Digits Meetei Mayek Digits Myanmar Digits + Myanmar Eastern Pwo Karen Digits + Myanmar Pao Digits Myanmar Shan Digits Myanmar Tai Laing Digits Nag Mundari Digits @@ -1591,8 +1596,10 @@ annotations. Newa Digits N’Ko Digits Ol Chiki Digits + Ol Onal Digits Odia Digits Osmanya Digits + Outlined Digits Hanifi Rohingya digits Roman Numerals Roman Lowercase Numerals @@ -1603,6 +1610,7 @@ annotations. Sinhala Lith Digits Sora Sompeng Digits Sundanese Digits + Sunuwar Digits Takri Digits New Tai Lue Digits Traditional Tamil Numerals diff --git a/common/main/fr.xml b/common/main/fr.xml index b2f6934c239..61482d627f1 100644 --- a/common/main/fr.xml +++ b/common/main/fr.xml @@ -1426,12 +1426,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ chiffres éthiopiens Chiffres financiers chiffres pleine chasse + chiffres garays chiffres géorgiens chiffres gondi gunjala chiffres gondi masaram chiffres grecs chiffres grecs minuscules chiffres goudjarâtîs + chiffres gurung khemas chiffres gourmoukhîs nombres décimaux chinois chiffres en chinois simplifié @@ -1448,6 +1450,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ chiffres kawis chiffres khmers chiffres en kannada + chiffres kirat rais chiffres lannas horas chiffres lannas thams chiffres laotiens @@ -1465,14 +1468,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ chiffres mros chiffres meitei-mayeks chiffres birmans + chiffres birmans de pwo karen de l’Est + chiffres birmans pao chiffres birmans shans chiffres birmans tai laings chiffres nag mundaris chiffres natifs chiffres n’kos chiffres ol-chikis + chiffres ol onals chiffres oriyas chiffres osmanyas + chiffres entourés chiffres rohingyas hanifis chiffres romains chiffres romains minuscules @@ -1482,6 +1489,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ chiffres cinghalais liths chiffres sora-sompengs chiffres soundanais + chiffres sunuwars chiffres takris chiffres néo-taï-luës chiffres tamouls traditionnels diff --git a/common/main/kaa.xml b/common/main/kaa.xml new file mode 100644 index 00000000000..e3f46110aa1 --- /dev/null +++ b/common/main/kaa.xml @@ -0,0 +1,14 @@ + + + + + + + + + [а ә б в г ғ д е ё ж з и й к қ л м н ң о ө п р с т у ү ў ф х ҳ ц ч ш щ ъ ы ь э ю я] + [А Ә Б В Г Ғ Д Е Ё Ж З И Й К Қ Л М Н Ң О Ө П Р С Т У Ү Ў Ф Х Ҳ Ц Ч Ш Щ Ъ Ы Ь Э Ю Я] + [\- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9] + [\- ‐‑ – — , ; \: ! ? . … '‘’ "“” ( ) \[ \] § @ * / \& # † ‡ ′ ″] + + \ No newline at end of file diff --git a/common/main/kaa_Cyrl.xml b/common/main/kaa_Cyrl.xml new file mode 100644 index 00000000000..ada78ab94d7 --- /dev/null +++ b/common/main/kaa_Cyrl.xml @@ -0,0 +1,9 @@ + + + + + + +