kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-07-05 23:27:40 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2224 from ashishtank/develop

Browse Source 
Issue 2221 - Weather module always shows night icons for locale other then english
This commit is contained in:
Michael Teeuw 2020-12-21 11:33:05 +01:00 committed by GitHub
commit 684dcdcef3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -28,6 +28,7 @@ _This release is scheduled to be released on 2021-01-01._
- Update dependencies to latest versions. - Update dependencies to latest versions.
- Update dependencies eslint, feedme, simple-git and socket.io to latest versions. - Update dependencies eslint, feedme, simple-git and socket.io to latest versions.
- Update lithuanian translation. - Update lithuanian translation.
- Weather module - Always displays night icons when local is other then English. (#2221)
### Deleted ### Deleted

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

@ -371,10 +371,10 @@ Module.register("weatherforecast", {
var hour; var hour;
if (forecast.dt_txt) { if (forecast.dt_txt) {
day = moment(forecast.dt_txt, "YYYY-MM-DD hh:mm:ss").format("ddd"); day = moment(forecast.dt_txt, "YYYY-MM-DD hh:mm:ss").format("ddd");
hour = moment(forecast.dt_txt, "YYYY-MM-DD hh:mm:ss").format("H"); hour = moment(forecast.dt_txt, "YYYY-MM-DD hh:mm:ss").toDate().getHours();
} else { } else {
day = moment(forecast.dt, "X").format("ddd"); day = moment(forecast.dt, "X").format("ddd");
hour = moment(forecast.dt, "X").format("H"); hour = moment(forecast.dt, "X").toDate().getHours();
} }
if (day !== lastDay) { if (day !== lastDay) {
@ -385,7 +385,6 @@ Module.register("weatherforecast", {
minTemp: this.roundValue(forecast.temp.min), minTemp: this.roundValue(forecast.temp.min),
rain: this.processRain(forecast, forecastList) rain: this.processRain(forecast, forecastList)
}; };
this.forecast.push(forecastData); this.forecast.push(forecastData);
lastDay = day; lastDay = day;