From e633236d9f4e2fe7ddc5a65e2616b9ee7d29048e Mon Sep 17 00:00:00 2001 From: "Steven R. Loomis" Date: Mon, 15 Jul 2024 17:37:23 -0500 Subject: [PATCH 1/2] CLDR-17566 fix pages action to always build - even on PRs, we should build the gh-pages action to make sure there aren't syntax errs. --- .github/workflows/gh-pages.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index aaf05274549..aa6d0746c1d 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -7,6 +7,7 @@ permissions: id-token: write on: + pull_request: push: branches: - main @@ -68,7 +69,7 @@ jobs: if: github.event_name == 'push' && github.ref == 'refs/heads/main' uses: actions/upload-pages-artifact@v2 - name: Deploy to Smoketest - if: github.repository == 'unicode-org/cldr' + if: github.repository == 'unicode-org/cldr' && github.event_name == 'push' shell: bash env: RSA_KEY_CCC: ${{ secrets.RSA_KEY_CCC }} @@ -87,6 +88,7 @@ jobs: 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: name: github-pages url: ${{steps.deployment.outputs.page_url}} @@ -96,8 +98,7 @@ jobs: - name: Deploy to GitHub Pages id: deployment uses: actions/deploy-pages@v2 - -# only run one of these at a time -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true + # only run one deployment at once. + concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true From c4ea20b897b946860fab49dc83aea807ce76f96e Mon Sep 17 00:00:00 2001 From: "Steven R. Loomis" Date: Mon, 15 Jul 2024 17:45:33 -0500 Subject: [PATCH 2/2] CLDR-17566 fix broken site page - use a raw tag for liquid, see: --- .../design-proposals/xmb.md | 29 +++++++++++++------ 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/docs/site/development/development-process/design-proposals/xmb.md b/docs/site/development/development-process/design-proposals/xmb.md index 382695f2bf4..886b8d9455a 100644 --- a/docs/site/development/development-process/design-proposals/xmb.md +++ b/docs/site/development/development-process/design-proposals/xmb.md @@ -28,7 +28,7 @@ Examples: \ -\**Ouzbékistan**\ @@ -70,7 +70,7 @@ Examples: ### Placeholders -Replaces the placeholders ("{0}", "MMM", etc.) in patterns by variable names with examples. This is data-driven, using the file at [xmbPlaceholders.txt](http://unicode.org/cldr/trac/browser/trunk/tools/java/org/unicode/cldr/tool/xmbPlaceholders.txt). +Replaces the placeholders ("{0}", "MMM", etc.) in patterns by variable names with examples. This is data-driven, using the file at [xmbPlaceholders.txt](http://unicode.org/cldr/trac/browser/trunk/tools/java/org/unicode/cldr/tool/xmbPlaceholders.txt). Format: @@ -96,7 +96,7 @@ Format: 1. If the value is SKIP, then the path is skipped. 2. The description can have {0}-style variables in it. If so, then the (...) values in the path\_regex are substituted for them. -3. If the value starts with ROOT, then the path is skipped if the type\_value is not in ROOT, where the type\_value is from the first capture group. This is used to make sure that the type\_value is in the major coverage requirements for: language, script, territory, currency, timezone, and metazone. The description can have placeholders, as in case 21. +3. If the value starts with ROOT, then the path is skipped if the type\_value is not in ROOT, where the type\_value is from the first capture group. This is used to make sure that the type\_value is in the major coverage requirements for: language, script, territory, currency, timezone, and metazone. The description can have placeholders, as in case 21. Example: @@ -108,11 +108,19 @@ Example: Plurals are represented with ICU Syntax, such as: -\{LENGTH, select, + Disable liquid parsing on this codeblock to prevent errors reading '{{' + See: https://talk.jekyllrb.com/t/code-block-is-improperly-handled-and-generates-liquid-syntax-error/7599/2 +--> -abbreviated {{NUMBER\_OF\_WEEKS, plural, +```xml + + +{LENGTH, select, + +abbreviated {{NUMBER_OF_WEEKS, plural, =0 {0 wks} @@ -130,7 +138,7 @@ many {# wks} other {# wks}}} -other {{NUMBER\_OF\_WEEKS, plural, +other {{NUMBER_OF_WEEKS, plural, =0 {0 weeks} @@ -146,7 +154,10 @@ few {# weeks} many {# weeks} -other {# weeks}}}}\ +other {# weeks}}}} +``` + + ### TODO @@ -160,4 +171,4 @@ other {# weeks}}}}\ - Figure out how to do the differences between HH and hh, etc. - Current thoughts: don't let the translator choose, but make it part of the xtb-cldr processing. -![Unicode copyright](https://www.unicode.org/img/hb_notice.gif) \ No newline at end of file +![Unicode copyright](https://www.unicode.org/img/hb_notice.gif)