From ae86b75d89fa54692ac307c55597ef0080e9bfbf Mon Sep 17 00:00:00 2001 From: heskja Date: Fri, 3 Aug 2018 20:22:44 +0200 Subject: [PATCH 1/6] Update nb.json Added translation for "FEELS" --- translations/nb.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/translations/nb.json b/translations/nb.json index 0a0595ac..30f271c6 100644 --- a/translations/nb.json +++ b/translations/nb.json @@ -28,5 +28,7 @@ "UPDATE_NOTIFICATION": "MagicMirror²-oppdatering er tilgjengelig.", "UPDATE_NOTIFICATION_MODULE": "Oppdatering tilgjengelig for modulen {MODULE_NAME}.", - "UPDATE_INFO": "Nåværende installasjon er {COMMIT_COUNT} bak {BRANCH_NAME} grenen." + "UPDATE_INFO": "Nåværende installasjon er {COMMIT_COUNT} bak {BRANCH_NAME} grenen.", + + "FEELS": "Føles som" } From 20a9ac841df51eec1723de298d7953fbb1801c5a Mon Sep 17 00:00:00 2001 From: heskja Date: Fri, 3 Aug 2018 20:23:19 +0200 Subject: [PATCH 2/6] Update nn.json Added translation for "FEELS" --- translations/nn.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/translations/nn.json b/translations/nn.json index 3c33c597..5e321fea 100644 --- a/translations/nn.json +++ b/translations/nn.json @@ -26,5 +26,7 @@ "UPDATE_NOTIFICATION": "MagicMirror² oppdatering er tilgjengeleg.", "UPDATE_NOTIFICATION_MODULE": "Oppdatering tilgjengeleg for modulen {MODULE_NAME}.", - "UPDATE_INFO": "noverande installasjon er {COMMIT_COUNT} bak {BRANCH_NAME} greinen." + "UPDATE_INFO": "noverande installasjon er {COMMIT_COUNT} bak {BRANCH_NAME} greinen.", + + "FEELS": "Kjenst som" } From c9577bcdc50d7d62090fdd54ac169a69309acaaa Mon Sep 17 00:00:00 2001 From: Janne Kalliola Date: Sun, 5 Aug 2018 19:47:27 +0300 Subject: [PATCH 3/6] Added an if to use absolute dates with all events --- modules/default/calendar/calendar.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/default/calendar/calendar.js b/modules/default/calendar/calendar.js index 0780fb5c..7a4c2206 100755 --- a/modules/default/calendar/calendar.js +++ b/modules/default/calendar/calendar.js @@ -295,8 +295,12 @@ Module.register("calendar", { // If event is within 6 hour, display 'in xxx' time format or moment.fromNow() timeWrapper.innerHTML = this.capFirst(moment(event.startDate, "x").fromNow()); } else { - // Otherwise just say 'Today/Tomorrow at such-n-such time' - timeWrapper.innerHTML = this.capFirst(moment(event.startDate, "x").calendar()); + if(this.config.timeFormat === "absolute") { + timeWrapper.innerHTML = this.capFirst(moment(event.startDate, "x").format(this.config.dateFormat)); + } else { + // Otherwise just say 'Today/Tomorrow at such-n-such time' + timeWrapper.innerHTML = this.capFirst(moment(event.startDate, "x").calendar()); + } } } else { /* Check to see if the user displays absolute or relative dates with their events From 7c5e8a66e4269561d28b5d0dcf48495c23876edb Mon Sep 17 00:00:00 2001 From: Janne Kalliola Date: Sun, 5 Aug 2018 19:49:26 +0300 Subject: [PATCH 4/6] Added also description of the change to changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4b8c087c..67237d0c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Fixed - Mixup between german and spanish translation for newsfeed. +- Fixed close dates to be absolute, if no configured in the config.js - module Calendar ### Updated From 6598ae080fe06e01f110cad0d45429ec7c3c7e42 Mon Sep 17 00:00:00 2001 From: vincep5 Date: Tue, 7 Aug 2018 11:48:10 -0500 Subject: [PATCH 5/6] weatherforecast rainfall rounding --- CHANGELOG.md | 1 + modules/default/weatherforecast/weatherforecast.js | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4b8c087c..5c6953d8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Hungarian translation for "Feels" and "Week" - Spanish translation for "Feels" - Add classes instead of inline style to the message from the module Alert +- Fix for weatherforecast rainfall rounding [#1374](https://github.com/MichMich/MagicMirror/issues/1374) ### Fixed - Mixup between german and spanish translation for newsfeed. diff --git a/modules/default/weatherforecast/weatherforecast.js b/modules/default/weatherforecast/weatherforecast.js index c06f5f5b..19e004ff 100644 --- a/modules/default/weatherforecast/weatherforecast.js +++ b/modules/default/weatherforecast/weatherforecast.js @@ -177,7 +177,7 @@ Module.register("weatherforecast",{ rainCell.innerHTML = ""; } else { if(config.units !== "imperial") { - rainCell.innerHTML = forecast.rain + " mm"; + rainCell.innerHTML = parseFloat(forecast.rain).toFixed(1) + " mm"; } else { rainCell.innerHTML = (parseFloat(forecast.rain) / 25.4).toFixed(2) + " in"; } @@ -350,7 +350,7 @@ Module.register("weatherforecast",{ icon: this.config.iconTable[forecast.weather[0].icon], maxTemp: this.roundValue(forecast.temp.max), minTemp: this.roundValue(forecast.temp.min), - rain: this.roundValue(forecast.rain) + rain: forecast.rain }; this.forecast.push(forecastData); From a6965342e7bbc0016aa82d9f17ddaf8147c4fc19 Mon Sep 17 00:00:00 2001 From: Michael Teeuw Date: Thu, 16 Aug 2018 12:00:06 +0200 Subject: [PATCH 6/6] Update CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5c6953d8..166f84b4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,8 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Swedish translations - Hungarian translations for the updatenotification module +- Updated Norsk bokmål translation +- Updated Norsk nynorsk translation ## [2.4.1] - 2018-07-04