From 594d47ee0d17492e5afcc99268013b66a15f5050 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 13 May 2024 12:08:05 +0200 Subject: [PATCH 1/2] Use Python 3.12 to be able to use `match` structure. --- .github/workflows/generate_github_pages.yml | 4 ++-- .github/workflows/quality.yml | 4 ++-- .github/workflows/sync-localazy.yml | 4 ++-- .github/workflows/sync-sas-strings.yml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/generate_github_pages.yml b/.github/workflows/generate_github_pages.yml index 3780c7a87dc..96f64eb1f74 100644 --- a/.github/workflows/generate_github_pages.yml +++ b/.github/workflows/generate_github_pages.yml @@ -22,10 +22,10 @@ jobs: uses: gradle/actions/setup-gradle@v3 with: cache-read-only: ${{ github.ref != 'refs/heads/develop' }} - - name: Set up Python 3.9 + - name: Set up Python 3.12 uses: actions/setup-python@v5 with: - python-version: 3.9 + python-version: 3.12 - name: Run World screenshots generation script run: | ./tools/test/generateWorldScreenshots.py diff --git a/.github/workflows/quality.yml b/.github/workflows/quality.yml index 03650dd120a..b62dbb0127b 100644 --- a/.github/workflows/quality.yml +++ b/.github/workflows/quality.yml @@ -26,10 +26,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: Set up Python 3.9 + - name: Set up Python 3.12 uses: actions/setup-python@v5 with: - python-version: 3.9 + python-version: 3.12 - name: Search for invalid screenshot files run: ./tools/test/checkInvalidScreenshots.py diff --git a/.github/workflows/sync-localazy.yml b/.github/workflows/sync-localazy.yml index 3b13fa6a773..c3f19da6ae1 100644 --- a/.github/workflows/sync-localazy.yml +++ b/.github/workflows/sync-localazy.yml @@ -21,10 +21,10 @@ jobs: uses: gradle/actions/setup-gradle@v3 with: cache-read-only: ${{ github.ref != 'refs/heads/develop' }} - - name: Set up Python 3.9 + - name: Set up Python 3.12 uses: actions/setup-python@v5 with: - python-version: 3.9 + python-version: 3.12 - name: Setup Localazy run: | curl -sS https://dist.localazy.com/debian/pubkey.gpg | sudo gpg --dearmor -o /etc/apt/trusted.gpg.d/localazy.gpg diff --git a/.github/workflows/sync-sas-strings.yml b/.github/workflows/sync-sas-strings.yml index 79de1b76919..56336626c7a 100644 --- a/.github/workflows/sync-sas-strings.yml +++ b/.github/workflows/sync-sas-strings.yml @@ -13,10 +13,10 @@ jobs: # No concurrency required, runs every time on a schedule. steps: - uses: actions/checkout@v4 - - name: Set up Python 3.9 + - name: Set up Python 3.12 uses: actions/setup-python@v5 with: - python-version: 3.9 + python-version: 3.12 - name: Install Prerequisite dependencies run: | pip install requests From 9a8519a3445ff0e94c24c34a0b8ab4b22bd47c60 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 13 May 2024 12:11:30 +0200 Subject: [PATCH 2/2] Add case for "zh#Hans". --- tools/localazy/importSupportedLocalesFromLocalazy.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/localazy/importSupportedLocalesFromLocalazy.py b/tools/localazy/importSupportedLocalesFromLocalazy.py index 15f0aed560e..01f50452496 100755 --- a/tools/localazy/importSupportedLocalesFromLocalazy.py +++ b/tools/localazy/importSupportedLocalesFromLocalazy.py @@ -27,6 +27,8 @@ def normalizeForResourceConfigurations(locale): return "in" case "zh_TW#Hant": return "zh-rTW" + case "zh#Hans": + return "zh-rCN" case _: return locale @@ -37,6 +39,8 @@ def normalizeForLocalConfig(locale): return "in" case "zh_TW#Hant": return "zh-TW" + case "zh#Hans": + return "zh-CN" case _: return locale