From 959ea69427bb2cf78f792eb862ad4023ec330730 Mon Sep 17 00:00:00 2001 From: BerndKohl Date: Fri, 6 Apr 2018 12:28:47 +0200 Subject: [PATCH 1/7] enabling translation for "feelsLike" in current weather enabled translation fixed typos in comments added German translation --- CHANGELOG.md | 6 ++++-- modules/default/currentweather/currentweather.js | 10 +++++----- translations/de.json | 4 +++- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 708d3470..f7eefc51 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,14 +8,16 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Added +- Enabled translation of feelsLike for module currentweather + ### Changed ### Fixed - Fixed issue where wind chill could not be displayed in Fahrenheit. [#1247](https://github.com/MichMich/MagicMirror/issues/1247) -- Fixed issues where a module crashes when it tries to dismiss a non exsisting alert. [#1240](https://github.com/MichMich/MagicMirror/issues/1240) +- Fixed issues where a module crashes when it tries to dismiss a non existing alert. [#1240](https://github.com/MichMich/MagicMirror/issues/1240) ### Updated -- Updated italian translation +- Updated Italian translation ## [2.3.1] - 2018-04-01 diff --git a/modules/default/currentweather/currentweather.js b/modules/default/currentweather/currentweather.js index 7047f911..7ad84e42 100644 --- a/modules/default/currentweather/currentweather.js +++ b/modules/default/currentweather/currentweather.js @@ -67,7 +67,7 @@ Module.register("currentweather",{ }, }, - // create a variable for the first upcoming calendaar event. Used if no location is specified. + // create a variable for the first upcoming calendar event. Used if no location is specified. firstEvent: false, // create a variable to hold the location name based on the API result. @@ -87,7 +87,7 @@ Module.register("currentweather",{ getTranslations: function() { // The translations for the default modules are defined in the core translation files. // Therefor we can just return false. Otherwise we should have returned a dictionary. - // If you're trying to build yiur own module including translations, check out the documentation. + // If you're trying to build your own module including translations, check out the documentation. return false; }, @@ -251,7 +251,7 @@ Module.register("currentweather",{ var feelsLike = document.createElement("span"); feelsLike.className = "dimmed"; - feelsLike.innerHTML = "Feels " + this.feelsLike + "°" + degreeLabel; + feelsLike.innerHTML = this.translate("Feels") + this.feelsLike + "°" + degreeLabel; small.appendChild(feelsLike); wrapper.appendChild(small); @@ -407,8 +407,8 @@ Module.register("currentweather",{ if (windInMph > 3 && tempInF < 50){ // windchill - var windChillInF = Math.round(35.74+0.6215*tempInF-35.75*Math.pow(windInMph,0.16)+0.4275*tempInF*Math.pow(windInMph,0.16)); - var windChillInC = (windChillInF - 32) * (5/9); + var windchillinF = Math.round(35.74+0.6215*tempInF-35.75*Math.pow(windInMph,0.16)+0.4275*tempInF*Math.pow(windInMph,0.16)); + var windChillInC = (windchillinF - 32) * (5/9); // this.feelsLike = windChillInC.toFixed(0); switch (this.config.units){ diff --git a/translations/de.json b/translations/de.json index ffbd667f..a68ba2b9 100644 --- a/translations/de.json +++ b/translations/de.json @@ -28,5 +28,7 @@ "UPDATE_NOTIFICATION": "Aktualisierung für MagicMirror² verfügbar.", "UPDATE_NOTIFICATION_MODULE": "Aktualisierung für das {MODULE_NAME} Modul verfügbar.", - "UPDATE_INFO": "Die aktuelle Installation ist {COMMIT_COUNT} hinter dem {BRANCH_NAME} branch." + "UPDATE_INFO": "Die aktuelle Installation ist {COMMIT_COUNT} hinter dem {BRANCH_NAME} Branch." + + "Feels": "Gefühlt " } From 1e6201093b310f692a6f9a014763de26b0a0715d Mon Sep 17 00:00:00 2001 From: Michael Teeuw Date: Fri, 6 Apr 2018 13:01:23 +0200 Subject: [PATCH 2/7] restore windChillInF variable. --- modules/default/currentweather/currentweather.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/default/currentweather/currentweather.js b/modules/default/currentweather/currentweather.js index 7ad84e42..7d723e4a 100644 --- a/modules/default/currentweather/currentweather.js +++ b/modules/default/currentweather/currentweather.js @@ -407,8 +407,8 @@ Module.register("currentweather",{ if (windInMph > 3 && tempInF < 50){ // windchill - var windchillinF = Math.round(35.74+0.6215*tempInF-35.75*Math.pow(windInMph,0.16)+0.4275*tempInF*Math.pow(windInMph,0.16)); - var windChillInC = (windchillinF - 32) * (5/9); + var windChillInF = Math.round(35.74+0.6215*tempInF-35.75*Math.pow(windInMph,0.16)+0.4275*tempInF*Math.pow(windInMph,0.16)); + var windChillInC = (windChillInF - 32) * (5/9); // this.feelsLike = windChillInC.toFixed(0); switch (this.config.units){ From af812f3c903377460e72da16fb5dd050c68d3915 Mon Sep 17 00:00:00 2001 From: Michael Teeuw Date: Fri, 6 Apr 2018 13:02:27 +0200 Subject: [PATCH 3/7] Fix translation file. --- translations/de.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/translations/de.json b/translations/de.json index a68ba2b9..050060cf 100644 --- a/translations/de.json +++ b/translations/de.json @@ -28,7 +28,7 @@ "UPDATE_NOTIFICATION": "Aktualisierung für MagicMirror² verfügbar.", "UPDATE_NOTIFICATION_MODULE": "Aktualisierung für das {MODULE_NAME} Modul verfügbar.", - "UPDATE_INFO": "Die aktuelle Installation ist {COMMIT_COUNT} hinter dem {BRANCH_NAME} Branch." + "UPDATE_INFO": "Die aktuelle Installation ist {COMMIT_COUNT} hinter dem {BRANCH_NAME} Branch.", - "Feels": "Gefühlt " + "FEELS": "Gefühlt" } From 3359c3cd459f2155ce58aec2469e334aa28266ab Mon Sep 17 00:00:00 2001 From: Michael Teeuw Date: Fri, 6 Apr 2018 13:03:06 +0200 Subject: [PATCH 4/7] Update currentweather.js --- modules/default/currentweather/currentweather.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/default/currentweather/currentweather.js b/modules/default/currentweather/currentweather.js index 7d723e4a..924a1974 100644 --- a/modules/default/currentweather/currentweather.js +++ b/modules/default/currentweather/currentweather.js @@ -251,7 +251,7 @@ Module.register("currentweather",{ var feelsLike = document.createElement("span"); feelsLike.className = "dimmed"; - feelsLike.innerHTML = this.translate("Feels") + this.feelsLike + "°" + degreeLabel; + feelsLike.innerHTML = this.translate("FEELS") + " " + this.feelsLike + "°" + degreeLabel; small.appendChild(feelsLike); wrapper.appendChild(small); From 1bcc3ab7f1181cfa6ce2bb41d45a1531d9c0c5ad Mon Sep 17 00:00:00 2001 From: Michael Teeuw Date: Fri, 6 Apr 2018 13:04:04 +0200 Subject: [PATCH 5/7] Add default translation. --- translations/en.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/translations/en.json b/translations/en.json index 790d67b9..1cba9a89 100644 --- a/translations/en.json +++ b/translations/en.json @@ -28,5 +28,7 @@ "UPDATE_NOTIFICATION": "MagicMirror² update available.", "UPDATE_NOTIFICATION_MODULE": "Update available for {MODULE_NAME} module.", - "UPDATE_INFO": "The current installation is {COMMIT_COUNT} behind on the {BRANCH_NAME} branch." + "UPDATE_INFO": "The current installation is {COMMIT_COUNT} behind on the {BRANCH_NAME} branch.", + + "FEELS": "Feels" } From 8b5e2f5528fdf8fc5143833329056e3afd423094 Mon Sep 17 00:00:00 2001 From: Michael Teeuw Date: Fri, 6 Apr 2018 13:04:55 +0200 Subject: [PATCH 6/7] Add dutch 'Feels' temperature. --- translations/nl.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/translations/nl.json b/translations/nl.json index 068c52d2..e1497d39 100644 --- a/translations/nl.json +++ b/translations/nl.json @@ -26,5 +26,7 @@ "UPDATE_NOTIFICATION": "MagicMirror² update beschikbaar.", "UPDATE_NOTIFICATION_MODULE": "Update beschikbaar voor {MODULE_NAME} module.", - "UPDATE_INFO": "De huidige installatie loopt {COMMIT_COUNT} achter op de {BRANCH_NAME} branch." + "UPDATE_INFO": "De huidige installatie loopt {COMMIT_COUNT} achter op de {BRANCH_NAME} branch.", + + "FEELS": "Gevoelstemperatuur" } From d90446ad2858e9d3dd26e5b16df536413a7a1ec5 Mon Sep 17 00:00:00 2001 From: Michael Teeuw Date: Fri, 6 Apr 2018 13:10:41 +0200 Subject: [PATCH 7/7] Update CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f7eefc51..4a64ef1d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,8 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Updated - Updated Italian translation +- Updated German translation +- Updated Dutch translation ## [2.3.1] - 2018-04-01