From 0d8f065d653dd06cd103a7c8e3c1ea3a3847751b Mon Sep 17 00:00:00 2001 From: Peter Bengtsson Date: Thu, 28 Mar 2024 14:08:00 -0400 Subject: [PATCH 1/2] Run changed-files before cloning github/github (#49916) --- .github/workflows/validate-github-github-docs-urls.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/validate-github-github-docs-urls.yml b/.github/workflows/validate-github-github-docs-urls.yml index 7092d8565c..8e1e651aae 100644 --- a/.github/workflows/validate-github-github-docs-urls.yml +++ b/.github/workflows/validate-github-github-docs-urls.yml @@ -34,6 +34,12 @@ jobs: steps: - name: Check out repo's default branch uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + with: + # Picking this number is a "best guess". If we make it too large, + # the checkout will take potentially unnecessariily long. + # This reduces the chance that tj-actions/changed-files has to + # fetch deeper history. But if it needs to, it will. + fetch-depth: 10 - uses: ./.github/actions/node-npm-setup @@ -100,6 +106,7 @@ jobs: # workaround for the time being. # First, gather the URLs that were relevant - name: Get changed content/data files + if: ${{ github.event_name == 'pull_request' }} id: changed-files uses: tj-actions/changed-files@77af4bed286740ef1a6387dc4e4e4dec39f96054 # v43.0.0 with: @@ -109,6 +116,7 @@ jobs: safe_output: false files: | content/** + - name: Generate PR comment if: ${{ github.event_name == 'pull_request' && steps.changed-files.outputs.any_changed == 'true' }} env: From 61fc24738ca150025a945dd9ace0d60c0b532ae2 Mon Sep 17 00:00:00 2001 From: Peter Bengtsson Date: Thu, 28 Mar 2024 14:18:43 -0400 Subject: [PATCH 2/2] Fix easy Russian translation corrupt Liquid (#49917) --- src/languages/lib/correct-translation-content.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/languages/lib/correct-translation-content.js b/src/languages/lib/correct-translation-content.js index 7999255cf1..dbf0397654 100644 --- a/src/languages/lib/correct-translation-content.js +++ b/src/languages/lib/correct-translation-content.js @@ -27,7 +27,8 @@ export function correctTranslatedContentStrings(content, englishContent, context content = content.replaceAll('{% данных variables', '{% data variables') content = content.replaceAll('{% данными variables', '{% data variables') content = content.replaceAll('{% данных организации variables', '{% data variables') - content = content.replaceAll('{% данным variables', '{% data variables') + content = content.replaceAll('{% данным variables.', '{% data variables.') + content = content.replaceAll('{% данные variables.', '{% data variables.') content = content.replaceAll('{% данных reusables', '{% data reusables') content = content.replaceAll('{% данными reusables', '{% data reusables') content = content.replaceAll('{% variables.', '{% data variables.') @@ -36,6 +37,14 @@ export function correctTranslatedContentStrings(content, englishContent, context content = content.replaceAll('{% ifversion fpt или ghec %}', '{% ifversion fpt or ghec %}') content = content.replaceAll('{% endif _%}', '{% endif %}') content = content.replaceAll('{% конечным %}', '{% endif %}') + content = content.replaceAll('{% переменных данных.', '{% data variables.') + content = content.replaceAll('{% повторно используемых данных.', '{% data reusables.') + content = content.replaceAll('{% примечание %}', '{% note %}') + content = content.replaceAll('{% конечных головщиков %}', '{% endrowheaders %}') + content = content.replaceAll('{% данных для повторного использования.', '{% data reusables.') + content = content.replaceAll('{% еще %}', '{% else %}') + content = content.replaceAll('{% необработанные %}', '{% raw %}') + content = content.replaceAll('{% подсказки %}', '{% tip %}') // For the rather custom Russian translation of // the content/get-started/learning-about-github/github-glossary.md page