From e4f671c89822e618bbac866d62c0d7d6db7846d4 Mon Sep 17 00:00:00 2001
From: rejas <github@veeck.de>
Date: Tue, 16 Mar 2021 19:16:07 +0100
Subject: [PATCH] Update error to use translatable text

---
 modules/default/newsfeed/newsfeed.js    | 2 +-
 modules/default/newsfeed/newsfeed.njk   | 2 +-
 modules/default/newsfeed/node_helper.js | 2 +-
 tests/e2e/modules/newsfeed_spec.js      | 4 ++--
 translations/de.json                    | 1 +
 translations/en.json                    | 1 +
 6 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/modules/default/newsfeed/newsfeed.js b/modules/default/newsfeed/newsfeed.js
index 3841223b..84e842e6 100644
--- a/modules/default/newsfeed/newsfeed.js
+++ b/modules/default/newsfeed/newsfeed.js
@@ -90,7 +90,7 @@ Module.register("newsfeed", {
 			this.loaded = true;
 			this.error = null;
 		} else if (notification === "INCORRECT_URL") {
-			this.error = "Newsfeed Error. Incorrect url: " + payload.url;
+			this.error = `Incorrect url: ${payload.url}`;
 			this.scheduleUpdateInterval();
 		}
 	},
diff --git a/modules/default/newsfeed/newsfeed.njk b/modules/default/newsfeed/newsfeed.njk
index f19807c6..551e682c 100644
--- a/modules/default/newsfeed/newsfeed.njk
+++ b/modules/default/newsfeed/newsfeed.njk
@@ -23,7 +23,7 @@
     </div>
 {% elseif error %}
     <div class="small dimmed">
-        {{ error }}
+        {{ "MODULE_CONFIG_ERROR" | translate({MODULE_NAME: "Newsfeed", ERROR: error}) | safe }}
     </div>
 {% else %}
     <div class="small dimmed">
diff --git a/modules/default/newsfeed/node_helper.js b/modules/default/newsfeed/node_helper.js
index db7b82f3..8d365339 100644
--- a/modules/default/newsfeed/node_helper.js
+++ b/modules/default/newsfeed/node_helper.js
@@ -38,7 +38,7 @@ module.exports = NodeHelper.create({
 		try {
 			new URL(url);
 		} catch (error) {
-			this.sendSocketNotification("INCORRECT_URL", { url });
+			this.sendSocketNotification("INCORRECT_URL", { url: url });
 			return;
 		}
 
diff --git a/tests/e2e/modules/newsfeed_spec.js b/tests/e2e/modules/newsfeed_spec.js
index 78874cc6..0b10c47d 100644
--- a/tests/e2e/modules/newsfeed_spec.js
+++ b/tests/e2e/modules/newsfeed_spec.js
@@ -30,7 +30,7 @@ describe("Newsfeed module", function () {
 		});
 
 		it("should show the newsfeed title", function () {
-			return app.client.waitUntilTextExists(".newsfeed .small", "Rodrigo Ramirez Blog", 10000).should.be.fulfilled;
+			return app.client.waitUntilTextExists(".newsfeed .small", "Rodrigo Ramirez Blog", 10000);
 		});
 	});
 
@@ -40,7 +40,7 @@ describe("Newsfeed module", function () {
 		});
 
 		it("should show invalid url warning", function () {
-			return app.client.waitUntilTextExists(".newsfeed .small", "Newsfeed Error. Incorrect url:", 10000).should.be.fulfilled;
+			return app.client.waitUntilTextExists(".newsfeed .small", "Error in the Newsfeed module. Incorrect url:", 10000);
 		});
 	});
 });
diff --git a/translations/de.json b/translations/de.json
index d023cec8..85ede64e 100644
--- a/translations/de.json
+++ b/translations/de.json
@@ -27,6 +27,7 @@
 	"NNW": "NNW",
 
 	"MODULE_CONFIG_CHANGED": "Die Konfigurationsoptionen für das {MODULE_NAME} Modul haben sich geändert. \nBitte überprüfen Sie die Dokumentation.",
+	"MODULE_CONFIG_ERROR": "Fehler im {MODULE_NAME} Modul. {ERROR}",
 
 	"UPDATE_NOTIFICATION": "Aktualisierung für MagicMirror² verfügbar.",
 	"UPDATE_NOTIFICATION_MODULE": "Aktualisierung für das {MODULE_NAME} Modul verfügbar.",
diff --git a/translations/en.json b/translations/en.json
index bdd784d5..f43bd4b9 100644
--- a/translations/en.json
+++ b/translations/en.json
@@ -27,6 +27,7 @@
 	"NNW": "NNW",
 
 	"MODULE_CONFIG_CHANGED": "The configuration options for the {MODULE_NAME} module have changed.\nPlease check the documentation.",
+	"MODULE_CONFIG_ERROR": "Error in the {MODULE_NAME} module. {ERROR}",
 
 	"UPDATE_NOTIFICATION": "MagicMirror² update available.",
 	"UPDATE_NOTIFICATION_MODULE": "Update available for {MODULE_NAME} module.",