diff --git a/modules/default/alert/alert.js b/modules/default/alert/alert.js index c5d3e650..85d6ef42 100644 --- a/modules/default/alert/alert.js +++ b/modules/default/alert/alert.js @@ -110,11 +110,13 @@ Module.register("alert",{ }, hide_alert: function(sender) { //Dismiss alert and remove from this.alerts - this.alerts[sender.name].dismiss(); - this.alerts[sender.name] = null; - //Remove overlay - var overlay = document.getElementById("overlay"); - overlay.parentNode.removeChild(overlay); + if (this.alerts[sender.name]) { + this.alerts[sender.name].dismiss(); + this.alerts[sender.name] = null; + //Remove overlay + var overlay = document.getElementById("overlay"); + overlay.parentNode.removeChild(overlay); + } }, setPosition: function(pos) { //Add css to body depending on the set position for notifications diff --git a/modules/default/currentweather/currentweather.js b/modules/default/currentweather/currentweather.js index 442e8632..b0ab40dc 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); @@ -293,11 +293,11 @@ Module.register("currentweather",{ } if (notification === "INDOOR_TEMPERATURE") { this.indoorTemperature = this.roundValue(payload); - this.updateDom(self.config.animationSpeed); + this.updateDom(this.config.animationSpeed); } if (notification === "INDOOR_HUMIDITY") { this.indoorHumidity = this.roundValue(payload); - this.updateDom(self.config.animationSpeed); + this.updateDom(this.config.animationSpeed); } }, @@ -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/package-lock.json b/package-lock.json index 1e7e476d..6577be46 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "magicmirror", - "version": "2.3.1", + "version": "2.4.0-dev", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -37,11 +37,6 @@ } } }, - "@types/node": { - "version": "7.0.57", - "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.57.tgz", - "integrity": "sha512-Iikf0IAus1OX++3Jrc1R2bsZggO+m22G5ee56JccYKejx5GNT3nHhY8v6J4OXId1hXXlb0n45hcaVwZwQcZZ6w==" - }, "JSV": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/JSV/-/JSV-4.0.2.tgz", @@ -1572,13 +1567,20 @@ "dev": true }, "electron": { - "version": "1.7.13", - "resolved": "https://registry.npmjs.org/electron/-/electron-1.7.13.tgz", - "integrity": "sha1-EIUbrsd9aG2VgS80QlwX5IrBQT8=", + "version": "2.0.0-beta.7", + "resolved": "https://registry.npmjs.org/electron/-/electron-2.0.0-beta.7.tgz", + "integrity": "sha512-DSUHGT2JkZc4pja2JdlG+TJa/nX2tz2I9UHdYPY0iKUrZngmTpP2FUypVt5pK+O9v0set5sL1lu1Y7c2dG4DDQ==", "requires": { - "@types/node": "7.0.57", + "@types/node": "8.10.2", "electron-download": "3.3.0", "extract-zip": "1.6.5" + }, + "dependencies": { + "@types/node": { + "version": "8.10.2", + "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.2.tgz", + "integrity": "sha512-A6Uv1anbsCvrRDtaUXS2xZ5tlzD+Kg7yMRlSLFDy3z0r7KlGXDzL14vELXIAgpk2aJbU3XeZZQRcEkLkowT92g==" + } } }, "electron-download": { diff --git a/package.json b/package.json index 91c54cee..1215193b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "magicmirror", - "version": "2.3.1", + "version": "2.4.0-dev", "description": "The open source modular smart mirror platform.", "main": "js/electron.js", "scripts": { @@ -57,7 +57,7 @@ "dependencies": { "body-parser": "^1.18.2", "colors": "^1.1.2", - "electron": "^1.4.15", + "electron": "beta", "express": "^4.16.2", "express-ipfilter": "0.3.1", "feedme": "latest", diff --git a/translations/de.json b/translations/de.json index ffbd667f..050060cf 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" } 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" } diff --git a/translations/it.json b/translations/it.json index 4e3041da..f903eb2e 100644 --- a/translations/it.json +++ b/translations/it.json @@ -3,8 +3,11 @@ "TODAY": "Oggi", "TOMORROW": "Domani", + "DAYAFTERTOMORROW": "Dopodomani", "RUNNING": "Termina entro", - "EMPTY": "Nessun evento in arrivo.", + "EMPTY": "Nessun evento imminente.", + + "WEEK": "Settimana {weekNumber}", "N": "N", "NNE": "NNE", @@ -15,11 +18,15 @@ "SE": "SE", "SSE": "SSE", "S": "S", - "SSW": "SSW", - "SW": "SW", - "WSW": "WSW", - "W": "W", - "WNW": "WNW", - "NW": "NW", - "NNW": "NNW" + "SSW": "SSO", + "SW": "SO", + "WSW": "OSO", + "W": "O", + "WNW": "ONO", + "NW": "NO", + "NNW": "NNO", + + "UPDATE_NOTIFICATION": "E' disponibile un aggiornamento di MagicMirror².", + "UPDATE_NOTIFICATION_MODULE": "E' disponibile un aggiornamento del modulo {MODULE_NAME}.", + "UPDATE_INFO": "L'installazione è {COMMIT_COUNT} indietro rispetto all'attuale branch {BRANCH_NAME}." } 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" }