kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-28 12:12:20 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2 from MichMich/develop

Browse Source 
Update Develop from original repo
This commit is contained in:
György Balássy 2018-08-17 06:40:54 +02:00 committed by GitHub
commit 3581158a7b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -15,14 +15,18 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- Hungarian translation for "Feels" and "Week" - Hungarian translation for "Feels" and "Week"
- Spanish translation for "Feels" - Spanish translation for "Feels"
- Add classes instead of inline style to the message from the module Alert - 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 ### Fixed
- Mixup between german and spanish translation for newsfeed. - Mixup between german and spanish translation for newsfeed.
- Fixed close dates to be absolute, if no configured in the config.js - module Calendar
### Updated ### Updated
- Swedish translations - Swedish translations
- Hungarian translations for the updatenotification module - Hungarian translations for the updatenotification module
- Updated Norsk bokmål translation
- Updated Norsk nynorsk translation
## [2.4.1] - 2018-07-04 ## [2.4.1] - 2018-07-04

8
modules/default/calendar/calendar.js
View File

@ -295,8 +295,12 @@ Module.register("calendar", {
// If event is within 6 hour, display 'in xxx' time format or moment.fromNow() // If event is within 6 hour, display 'in xxx' time format or moment.fromNow()
timeWrapper.innerHTML = this.capFirst(moment(event.startDate, "x").fromNow()); timeWrapper.innerHTML = this.capFirst(moment(event.startDate, "x").fromNow());
} else { } else {
// Otherwise just say 'Today/Tomorrow at such-n-such time' if(this.config.timeFormat === "absolute") {
timeWrapper.innerHTML = this.capFirst(moment(event.startDate, "x").calendar()); 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 { } else {
/* Check to see if the user displays absolute or relative dates with their events /* Check to see if the user displays absolute or relative dates with their events

4
modules/default/weatherforecast/weatherforecast.js
View File

@ -177,7 +177,7 @@ Module.register("weatherforecast",{
rainCell.innerHTML = ""; rainCell.innerHTML = "";
} else { } else {
if(config.units !== "imperial") { if(config.units !== "imperial") {
rainCell.innerHTML = forecast.rain + " mm"; rainCell.innerHTML = parseFloat(forecast.rain).toFixed(1) + " mm";
} else { } else {
rainCell.innerHTML = (parseFloat(forecast.rain) / 25.4).toFixed(2) + " in"; 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], icon: this.config.iconTable[forecast.weather[0].icon],
maxTemp: this.roundValue(forecast.temp.max), maxTemp: this.roundValue(forecast.temp.max),
minTemp: this.roundValue(forecast.temp.min), minTemp: this.roundValue(forecast.temp.min),
rain: this.roundValue(forecast.rain) rain: forecast.rain
}; };
this.forecast.push(forecastData); this.forecast.push(forecastData);

4
translations/nb.json
View File

@ -28,5 +28,7 @@
"UPDATE_NOTIFICATION": "MagicMirror²-oppdatering er tilgjengelig.", "UPDATE_NOTIFICATION": "MagicMirror²-oppdatering er tilgjengelig.",
"UPDATE_NOTIFICATION_MODULE": "Oppdatering tilgjengelig for modulen {MODULE_NAME}.", "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"
} }

4
translations/nn.json
View File

@ -26,5 +26,7 @@
"UPDATE_NOTIFICATION": "MagicMirror² oppdatering er tilgjengeleg.", "UPDATE_NOTIFICATION": "MagicMirror² oppdatering er tilgjengeleg.",
"UPDATE_NOTIFICATION_MODULE": "Oppdatering tilgjengeleg for modulen {MODULE_NAME}.", "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"
} }