Translation fixes (#502)

hacs · Oct 10, 2021 · db2db16 · db2db16
1 parent 3efe20e
commit db2db16
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 6 deletions.
diff --git a/.github/workflows/ReleaseActions.yml b/.github/workflows/ReleaseActions.yml
@@ -4,6 +4,10 @@ on:
   release:
     types: ["published"]
 
+env:
+  NODE_VERSION: 14
+  PYTHON_VERSION: "3.x"
+
 jobs:
   deploy:
     runs-on: ubuntu-latest
@@ -15,7 +19,13 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v2.2.2
         with:
-          python-version: "3.x"
+          python-version: ${{ env.PYTHON_VERSION }}
+
+      - name: Set up Node ${{ env.NODE_VERSION }}
+        uses: actions/setup-node@v2
+        with:
+          node-version: ${{ env.NODE_VERSION }}
+          cache: yarn
 
       # Get updated translations
       - name: Download Lokalise CLI

diff --git a/.github/workflows/TestBuild.yml b/.github/workflows/TestBuild.yml
@@ -8,6 +8,9 @@ on:
     branches:
       - main
 
+env:
+  NODE_VERSION: 14
+
 jobs:
   build_frontend:
     name: Test build
@@ -17,6 +20,13 @@ jobs:
       - uses: actions/checkout@v2
       - name: Checkout submodules
         uses: textbook/git-checkout-submodule-action@master
+
+      - name: Set up Node ${{ env.NODE_VERSION }}
+        uses: actions/setup-node@v2
+        with:
+          node-version: ${{ env.NODE_VERSION }}
+          cache: yarn
+
       - name: Install dependencies
         run: script/bootstrap
       - name: Build

diff --git a/script/gulp/translations.js b/script/gulp/translations.js
@@ -14,7 +14,7 @@ function recursiveFlatten(prefix, data) {
         ...recursiveFlatten(prefix + key + ".", data[key]),
       };
     } else {
-      output[prefix + key] = data[key];
+      output[prefix + key] = data[key].replace(/'{/g, "''{").replace(/}'/g, "}''");
     }
   });
   return Object.fromEntries(Object.entries(output).sort());

diff --git a/src/localize/languages/en.json b/src/localize/languages/en.json
@@ -340,7 +340,7 @@
         "title": "Pending restart",
         "content": "You have {number} {pluralWording} for which a restart of Home Assistant is required. You can do that from the 'Server management' section under the configuration part of Home Assistant UI."
       },
-      "removed_repository": "Removed repository ''{repository}''"
+      "removed_repository": "Removed repository '{repository}'"
     },
     "intro": "Updates and important messages will show here if there are any",
     "information": "Information",

diff --git a/src/localize/localize.ts b/src/localize/localize.ts
@@ -17,17 +17,16 @@ export function localize(language: string, string: string, replace?: Record<stri
     .replace("-", "_");
 
   if (!languages[lang]) {
-    lang = DEFAULT_LANGUAGE;
-
     if (!warnings.language?.includes(lang)) {
       warnings.language.push(lang);
       logger.warn(
         `Language '${lang.replace(
           "_",
           "-"
-        )}' is not added to HACS. https://hacs.xyz/docs/developer/translation`
+        )}' is not added to HACS, using '${DEFAULT_LANGUAGE}' instead. https://hacs.xyz/docs/developer/translation`
       );
     }
+    lang = DEFAULT_LANGUAGE;
   }
 
   const translatedValue = languages[lang]?.[string] || languages[DEFAULT_LANGUAGE][string];