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 " }