Merge pull request #176 from AlCalzone/cleanup

Avoid some repetition
ioBroker · Sep 14, 2022 · 4ab344c · 4ab344c
2 parents 69d8dce + 8ed0abc
commit 4ab344c
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 18 deletions.
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/build/translate.js b/build/translate.js
diff --git a/build/translate.js.map b/build/translate.js.map
diff --git a/src/translate-adapter-handlers.ts b/src/translate-adapter-handlers.ts
@@ -193,11 +193,11 @@ async function translateIoPackage(): Promise<void> {
 	// https://github.com/ioBroker/adapter-dev/issues/138
 	if (content.common.messages) {
 		console.log("Translate Messages");
-		for (let n = 0; n < content.common.messages.length; n++) {
-			console.log(`   Message: ${content.common.messages[n].title.en}`);
-			await translateNotExisting(content.common.messages[n].title);
-			await translateNotExisting(content.common.messages[n].text);
-			await translateNotExisting(content.common.messages[n].linkText);
+		for (const message of content.common.messages) {
+			console.log(`   Message: ${message.title.en}`);
+			await translateNotExisting(message.title);
+			await translateNotExisting(message.text);
+			await translateNotExisting(message.linkText);
 		}
 	}
 	await writeJson(ioPackage, content, { spaces: 4, EOL });

diff --git a/src/translate.ts b/src/translate.ts
@@ -139,9 +139,7 @@ class LegacyTranslator implements Translator {
 			const response = await axios(options);
 			if (Array.isArray(response.data)) {
 				// we got a valid response
-				let resText = "";
-				response.data[0].forEach((t: string[]) => (resText += t[0]));
-				return resText;
+				return response.data[0].map((t: string[]) => t[0]).join("");
 			}
 		} catch (e: any) {
 			if (e.response?.status === 429) {