- (Grizzlebee) only translate linkText from messages if existent

- (Apollon77) Add ukrainian as language for translations
ioBroker · Oct 23, 2022 · b51999d · b51999d
1 parent 720fbb0
commit b51999d
Show file tree

Hide file tree

Showing 23 changed files with 480 additions and 402 deletions.
diff --git a/README.md b/README.md
@@ -230,6 +230,11 @@ module.exports = {
 	Placeholder for the next version (at the beginning of the line):
 	### **WORK IN PROGRESS**
 -->
+
+### __WORK IN PROGRESS__
+-   (Grizzlebee) only translate linkText from messages if existent
+-   (Apollon77) Add ukrainian as language for translations
+
 ### 1.1.0 (2022-09-14)
 -	(Grizzelbee) Also translate admin messages in io-package.json
 -   (AlCalzone) support specifying raw esbuild options, like loaders/plugins

diff --git a/build/translate-adapter-handlers.js b/build/translate-adapter-handlers.js
diff --git a/build/translate-adapter-handlers.js.map b/build/translate-adapter-handlers.js.map
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -51,20 +51,20 @@
     "@tsconfig/node12": "^1.0.11",
     "@types/chai": "^4.3.3",
     "@types/fs-extra": "^9.0.13",
-    "@types/iobroker": "^4.0.4",
-    "@types/mocha": "^9.1.1",
-    "@types/node": "^18.7.23",
+    "@types/iobroker": "^4.0.5",
+    "@types/mocha": "^10.0.0",
+    "@types/node": "^18.11.3",
     "@types/rimraf": "^3.0.2",
-    "@types/yargs": "^17.0.12",
-    "@typescript-eslint/eslint-plugin": "^5.38.1",
-    "@typescript-eslint/parser": "^5.38.1",
+    "@types/yargs": "^17.0.13",
+    "@typescript-eslint/eslint-plugin": "^5.40.1",
+    "@typescript-eslint/parser": "^5.40.1",
     "chai": "^4.3.6",
     "chai-as-promised": "^7.1.1",
     "dir-compare": "^4.0.0",
-    "eslint": "^8.24.0",
+    "eslint": "^8.26.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-prettier": "^4.2.1",
-    "mocha": "^10.0.0",
+    "mocha": "^10.1.0",
     "prettier": "^2.7.1",
     "prettier-plugin-organize-imports": "^3.1.1",
     "rimraf": "^3.0.2",
@@ -77,10 +77,10 @@
     "@google-cloud/translate": "^7.0.3",
     "ansi-colors": "^4.1.3",
     "axios": "^0.27.2",
-    "esbuild": "^0.15.10",
+    "esbuild": "^0.15.12",
     "@esm2cjs/execa": "^6.1.1-cjs.1",
     "fs-extra": "^10.1.0",
     "tiny-glob": "^0.2.9",
-    "yargs": "^17.5.1"
+    "yargs": "^17.6.0"
   }
 }
diff --git a/src/translate-adapter-handlers.ts b/src/translate-adapter-handlers.ts
@@ -32,6 +32,7 @@ const _languages: Record<ioBroker.Languages, any> = {
 	it: {},
 	es: {},
 	pl: {},
+	uk: {},
 	"zh-cn": {},
 };
 export const allLanguages = Object.keys(_languages) as ioBroker.Languages[];
@@ -197,7 +198,9 @@ async function translateIoPackage(): Promise<void> {
 			console.log(`   Message: ${message.title.en}`);
 			await translateNotExisting(message.title);
 			await translateNotExisting(message.text);
-			await translateNotExisting(message.linkText);
+			if (message.linkText) {
+				await translateNotExisting(message.linkText);
+			}
 		}
 	}
 	await writeJson(ioPackage, content, { spaces: 4, EOL });

diff --git a/test/data/changing-translations/expected/admin/i18n/uk/translations.json b/test/data/changing-translations/expected/admin/i18n/uk/translations.json
@@ -0,0 +1,3 @@
+{
+    "Example": "Mock translation of 'Example' to 'uk'"
+}
diff --git a/test/data/continue-translate-io-package/expected/io-package.json b/test/data/continue-translate-io-package/expected/io-package.json
@@ -11,6 +11,7 @@
                 "it": "Mock translation of 'Next version' to 'it'",
                 "es": "Mock translation of 'Next version' to 'es'",
                 "pl": "Mock translation of 'Next version' to 'pl'",
+                "uk": "Mock translation of 'Next version' to 'uk'",
                 "zh-cn": "Mock translation of 'Next version' to 'zh-cn'"
             },
             "1.0.0": {
@@ -23,7 +24,8 @@
                 "it": "My translation of 'Initial version' to 'it'",
                 "es": "My translation of 'Initial version' to 'es'",
                 "pl": "My translation of 'Initial version' to 'pl'",
-                "zh-cn": "My translation of 'Initial version' to 'zh-cn'"
+                "zh-cn": "My translation of 'Initial version' to 'zh-cn'",
+                "uk": "Mock translation of 'Initial version' to 'uk'"
             }
         },
         "titleLang": {
@@ -36,7 +38,8 @@
             "it": "My translation of 'My title' to 'it'",
             "es": "My translation of 'My title' to 'es'",
             "pl": "My translation of 'My title' to 'pl'",
-            "zh-cn": "My translation of 'My title' to 'zh-cn'"
+            "zh-cn": "My translation of 'My title' to 'zh-cn'",
+            "uk": "Mock translation of 'My title' to 'uk'"
         },
         "desc": {
             "en": "My description",
@@ -48,7 +51,8 @@
             "it": "My translation of 'My description' to 'it'",
             "es": "My translation of 'My description' to 'es'",
             "pl": "My translation of 'My description' to 'pl'",
-            "zh-cn": "My translation of 'My description' to 'zh-cn'"
+            "zh-cn": "My translation of 'My description' to 'zh-cn'",
+            "uk": "Mock translation of 'My description' to 'uk'"
         }
     }
 }
diff --git a/test/data/new-translations/expected/admin/i18n/uk/translations.json b/test/data/new-translations/expected/admin/i18n/uk/translations.json
@@ -0,0 +1,3 @@
+{
+    "Example": "Mock translation of 'Example' to 'uk'"
+}
diff --git a/test/data/no-json-yet/expected/admin/i18n/uk/translations.json b/test/data/no-json-yet/expected/admin/i18n/uk/translations.json
@@ -0,0 +1,3 @@
+{
+    "Example": "Приклад"
+}
diff --git a/test/data/no-json-yet/expected/admin/words.js b/test/data/no-json-yet/expected/admin/words.js
@@ -12,6 +12,7 @@ systemDictionary = {
 		it: "Esempio",
 		es: "Ejemplo",
 		pl: "Przykład",
+		uk: "Приклад",
 		"zh-cn": "例子",
 	},
 };
diff --git a/test/data/no-json-yet/input/admin/words.js b/test/data/no-json-yet/input/admin/words.js
@@ -12,6 +12,7 @@ systemDictionary = {
 		it: "Esempio",
 		es: "Ejemplo",
 		pl: "Przykład",
+		uk: "Приклад",
 		"zh-cn": "例子",
 	},
 };
diff --git a/test/data/no-words-yet/expected/admin/i18n/uk/translations.json b/test/data/no-words-yet/expected/admin/i18n/uk/translations.json
@@ -0,0 +1,3 @@
+{
+    "Example": "Приклад"
+}
diff --git a/test/data/no-words-yet/expected/admin/words.js b/test/data/no-words-yet/expected/admin/words.js
@@ -8,5 +8,5 @@
 'use strict';
 
 systemDictionary = {
-    "Example": {                                      "en": "Example",                                          "de": "Beispiel",                                         "ru": "пример",                                           "pt": "Exemplo",                                          "nl": "Voorbeeld",                                        "fr": "Exemple",                                          "it": "Esempio",                                          "es": "Ejemplo",                                          "pl": "Przykład",                                         "zh-cn": "例子"},
+    "Example": {                                      "en": "Example",                                          "de": "Beispiel",                                         "ru": "пример",                                           "pt": "Exemplo",                                          "nl": "Voorbeeld",                                        "fr": "Exemple",                                          "it": "Esempio",                                          "es": "Ejemplo",                                          "pl": "Przykład",                                         "uk": "Приклад",                                          "zh-cn": "例子"},
 };
diff --git a/test/data/no-words-yet/input/admin/i18n/uk/translations.json b/test/data/no-words-yet/input/admin/i18n/uk/translations.json
@@ -0,0 +1,3 @@
+{
+    "Example": "Приклад"
+}
diff --git a/test/data/translate-io-package/expected/io-package.json b/test/data/translate-io-package/expected/io-package.json
@@ -11,6 +11,7 @@
                 "it": "Mock translation of 'Initial version' to 'it'",
                 "es": "Mock translation of 'Initial version' to 'es'",
                 "pl": "Mock translation of 'Initial version' to 'pl'",
+                "uk": "Mock translation of 'Initial version' to 'uk'",
                 "zh-cn": "Mock translation of 'Initial version' to 'zh-cn'"
             }
         },
@@ -24,6 +25,7 @@
             "it": "Mock translation of 'My title' to 'it'",
             "es": "Mock translation of 'My title' to 'es'",
             "pl": "Mock translation of 'My title' to 'pl'",
+            "uk": "Mock translation of 'My title' to 'uk'",
             "zh-cn": "Mock translation of 'My title' to 'zh-cn'"
         },
         "desc": {
@@ -36,6 +38,7 @@
             "it": "Mock translation of 'My description' to 'it'",
             "es": "Mock translation of 'My description' to 'es'",
             "pl": "Mock translation of 'My description' to 'pl'",
+            "uk": "Mock translation of 'My description' to 'uk'",
             "zh-cn": "Mock translation of 'My description' to 'zh-cn'"
         }
     }

diff --git a/test/data/update-json/expected/admin/i18n/uk/translations.json b/test/data/update-json/expected/admin/i18n/uk/translations.json
@@ -0,0 +1,4 @@
+{
+    "Example": "Приклад",
+    "Example 2": "Приклад 2"
+}
diff --git a/test/data/update-json/expected/admin/words.js b/test/data/update-json/expected/admin/words.js
@@ -12,6 +12,7 @@ systemDictionary = {
 		it: "Esempio",
 		es: "Ejemplo",
 		pl: "Przykład",
+		uk: "Приклад",
 		"zh-cn": "例子",
 	},
 	"Example 2": {
@@ -24,6 +25,7 @@ systemDictionary = {
 		it: "Esempio 2",
 		es: "Ejemplo 2",
 		pl: "Przykład 2",
+		uk: "Приклад 2",
 		"zh-cn": "例子2",
 	},
 };
diff --git a/test/data/update-json/input/admin/i18n/uk/translations.json b/test/data/update-json/input/admin/i18n/uk/translations.json
@@ -0,0 +1,3 @@
+{
+    "Example": "Приклад"
+}
diff --git a/test/data/update-json/input/admin/words.js b/test/data/update-json/input/admin/words.js
@@ -12,6 +12,7 @@ systemDictionary = {
 		it: "Esempio",
 		es: "Ejemplo",
 		pl: "Przykład",
+		uk: "Приклад",
 		"zh-cn": "例子",
 	},
 	"Example 2": {
@@ -24,6 +25,7 @@ systemDictionary = {
 		it: "Esempio 2",
 		es: "Ejemplo 2",
 		pl: "Przykład 2",
+		uk: "Приклад 2",
 		"zh-cn": "例子2",
 	},
 };
diff --git a/test/data/update-words/expected/admin/i18n/uk/translations.json b/test/data/update-words/expected/admin/i18n/uk/translations.json
@@ -0,0 +1,4 @@
+{
+    "Example": "Приклад",
+    "Example 2": "Приклад 2"
+}
diff --git a/test/data/update-words/expected/admin/words.js b/test/data/update-words/expected/admin/words.js
diff --git a/test/data/update-words/input/admin/i18n/uk/translations.json b/test/data/update-words/input/admin/i18n/uk/translations.json
@@ -0,0 +1,4 @@
+{
+    "Example": "Приклад",
+    "Example 2": "Приклад 2"
+}