Merge pull request #2832 from element-hq/feature/bma/fixLocalazyImport

Fix localazy import
This commit is contained in:
Benoit Marty
2024-05-13 14:34:34 +02:00
committed by GitHub
5 changed files with 12 additions and 8 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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