CLDR-15817 merge from main

.github/workflows/gh-pages.yml

@@ -1,5 +1,13 @@
 
-name: Publish to gh-pages
+name: gh-pages
+
+# Note: we have a foot in two camps here, maybe more
+#
+# - docs/ldml is the spec, and it gets special handling and generation. Ends up cldr-smoke for now
+# - docs/rfc needs to end up somewhere. for now, generate to github.io
+
+# - docs/site is an entire 'site' that gets deployed to what will be cldr.unicode.org
+#    This is now handled in site.yml
 
 permissions:
   pages: write
@@ -57,7 +65,7 @@ jobs:
         with:
           ruby-version: 3.2
           bundler-cache: true
-      - name: Build Jekyll part of the site
+      - name: Build Jekyll part of the site (not spec, not site/)
         run: |
           gem install bundler github-pages kramdown-parser-gfm  # should pull in jekyll, etc.
           cd docs &&  github-pages build && mkdir -vp ../_site/ldml
@@ -87,6 +95,7 @@ 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:
     if: github.repository == 'unicode-org/cldr' && github.event_name == 'push'
     environment:

.github/workflows/site.yml

@@ -0,0 +1,67 @@
+name: CLDR Site
+
+permissions:
+  deployments: write
+  id-token: write
+  pull-requests: write
+
+on:
+    pull_request:
+        paths:
+        #  - "tools/scripts/tr-archive/**"
+         - "docs/site/**"
+         - '.github/workflows/site.yml'
+    push:
+        branches:
+         - main
+        # Only run if docs change.
+        paths:
+        #  - "tools/scripts/tr-archive/**"
+         - "docs/site/**"
+         - '.github/workflows/site.yml'
+
+jobs:
+  cloudflare:
+    runs-on: ubuntu-latest
+    environment: cloudflare
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        lfs: false
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 3.2
+        bundler-cache: true
+    - name: Setup Jekyll
+      run: 'gem install bundler jekyll kramdown-parser-gfm webrick'
+    - name: Setup assets
+      run: 'cd docs/site/assets && npm ci && npm run build'
+    - name: Build cldr.pages.dev
+      run: 'cd docs/site && jekyll build'
+    - name: Pre-install Wrangler
+      run: npm i -g [email protected]
+      # see https://github.com/cloudflare/wrangler-action/issues/286
+    - name: Deploy cldr.pages.dev
+      id: deploy
+      uses: cloudflare/wrangler-action@v3
+      with:
+        apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+        accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+        command: pages deploy ./_site --project-name=cldr
+    - name: Add deploy comment to PR
+      uses: actions/github-script@v7
+      if: github.event_name == 'pull_request'
+      with:
+        script: |
+          github.rest.issues.createComment({
+            issue_number: context.issue.number,
+            owner: context.repo.owner,
+            repo: context.repo.repo,
+            body: '✨ deployed to <${{ steps.deploy.outputs.deployment-url }}>'
+            })
+          github.rest.issues.addLabels({
+            issue_number: context.issue.number,
+            owner: context.repo.owner,
+            repo: context.repo.repo,
+            labels: ['Site Update']
+            })

README.md

@@ -47,8 +47,9 @@ A source formatter is now used, please see [spotless](./tools/README.md#spotless
 
 Copyright © 2004-2024 Unicode, Inc. Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the United States and other countries.
 
-The project is released under [LICENSE](./LICENSE).
+A CLA is required to contribute to this project - please refer to the [CONTRIBUTING.md](./CONTRIBUTING.md) file (or start a Pull Request) for more information.
+
+The contents of this repository are governed by the Unicode [Terms of Use](https://www.unicode.org/copyright.html) and are released under [LICENSE](./LICENSE).
 
 Note that some CLDR tools depend on libraries managed via Maven; use of these libraries is governed by separate license agreements.
 
-A CLA is required to contribute to this project - please refer to the [CONTRIBUTING.md](./CONTRIBUTING.md) file (or start a Pull Request) for more information.

common/annotations/de_CH.xml

@@ -3902,11 +3902,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<annotation cp="²" type="tts">↑↑↑</annotation>
 		<annotation cp="³">↑↑↑</annotation>
 		<annotation cp="³" type="tts">↑↑↑</annotation>
-		<annotation cp="₨">Rupie | Währung</annotation>
+		<annotation cp="₨" draft="contributed">Rupie | Währung</annotation>
 		<annotation cp="₨" type="tts">↑↑↑</annotation>
 		<annotation cp="µ">Masseinheit | Mikro-Zeichen | My</annotation>
 		<annotation cp="µ" type="tts">↑↑↑</annotation>
-		<annotation cp="﷼">Rial | Währung</annotation>
+		<annotation cp="﷼" draft="contributed">Rial | Währung</annotation>
 		<annotation cp="﷼" type="tts">↑↑↑</annotation>
 	</annotations>
 </ldml>

common/annotations/en_001.xml

@@ -482,7 +482,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<annotation cp="🚾">closet | lavatory | restroom | toilet | water | wc</annotation>
 		<annotation cp="↮">left-right arrow with stroke</annotation>
 		<annotation cp="↮" type="tts">left-right arrow with stroke</annotation>
-		<annotation cp="🔄">again | anticlockwise | arrow | arrows | button | counterclockwise | deja | refresh | rewindershins | vu</annotation>
+		<annotation cp="🔄">again | anticlockwise | arrow | arrows | button | counterclockwise | deja | refresh | rewind | vu</annotation>
 		<annotation cp="🔄" type="tts">anticlockwise arrows button</annotation>
 		<annotation cp="✡">David | Jewish | Judaism | religion | star | Star of David</annotation>
 		<annotation cp="✡" type="tts">Star of David</annotation>

common/annotations/ka.xml

@@ -3416,7 +3416,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<annotation cp="🧿">ავგაროზი | თილისმა | თურქული თვალი | ნაზარი | ფატიმას თვალი</annotation>
 		<annotation cp="🧿" type="tts">ფატიმას თვალი</annotation>
 		<annotation cp="🪬">ამულეტი | დაცვა | მარიამი | მირიამი | ფატიმა | ხელი | ჰამსა</annotation>
-		<annotation cp="🪬" type="tts">6 / 5000 Результаты перевода ჰამსა</annotation>
+		<annotation cp="🪬" type="tts">ჰამსა</annotation>
 		<annotation cp="🗿">მოაი | სახე | ქანდაკება | ძეგლი</annotation>
 		<annotation cp="🗿" type="tts">მოაი</annotation>
 		<annotation cp="🪧">აბრა | აფიშა | დემონსტრაცია | მიტინგი | პლაკატი | პროტესტი</annotation>