OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Update weblateToCounterpart to be more resilient (#22247) 

* Update i18n check CI to ignore RiotTranslateBot

* Update `weblateToCounterpart` to be more resilient
pull/22249/head
Michael Telatynski 2022-05-17 17:44:30 +01:00 committed by GitHub
parent aca0346f4e
commit b3ef2c179a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.github/workflows/static_analysis.yaml vendored
View File

@ -44,7 +44,10 @@ jobs:
files_ignore: | files_ignore: |
src/i18n/strings/en_EN.json src/i18n/strings/en_EN.json
- name: "Assert only en_EN was modified" - name: "Assert only en_EN was modified"
if: github.event_name == 'pull_request' && steps.changed_files.outputs.any_modified == 'true' if: |
github.event_name == 'pull_request' &&
github.actor != 'RiotTranslateBot' &&
steps.changed_files.outputs.any_modified == 'true'
run: | run: |
echo "You can only modify en_EN.json, do not touch any of the other i18n files as Weblate will be confused" echo "You can only modify en_EN.json, do not touch any of the other i18n files as Weblate will be confused"
exit 1 exit 1

10
scripts/copy-res.js
View File

@ -232,8 +232,14 @@ function weblateToCounterpart(inTrs) {
if (keyParts.length === 2) { if (keyParts.length === 2) {
let obj = outTrs[keyParts[0]]; let obj = outTrs[keyParts[0]];
if (obj === undefined) { if (obj === undefined) {
obj = {}; obj = outTrs[keyParts[0]] = {};
outTrs[keyParts[0]] = obj; } else if (typeof obj === "string") {
// This is a transitional edge case if a string went from singular to pluralised and both still remain
// in the translation json file. Use the singular translation as `other` and merge pluralisation atop.
obj = outTrs[keyParts[0]] = {
"other": inTrs[key],
};
console.warn("Found entry in i18n file in both singular and pluralised form", keyParts[0]);
} }
obj[keyParts[1]] = inTrs[key]; obj[keyParts[1]] = inTrs[key];
} else { } else {