kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-08-23 13:24:06 +00:00
Code Issues Projects Releases Wiki Activity

Possible fix for #181

Browse Source
This commit is contained in:
Michael Teeuw
2016-05-10 16:18:35 +02:00
parent 80c0e6a4e0
commit 5be5741ac3
4 changed files with 12080 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
modules/default/currentweather/currentweather.js
View File

@@ -226,15 +226,18 @@ Module.register("currentweather",{
var sunriseSunsetDateObject = (sunrise < now && sunset > now) ? sunset : sunrise;
var timeString = moment(sunriseSunsetDateObject).format('HH:mm');
if (this.config.timeFormat !== 24) {
var hours = sunriseSunsetDateObject.getHours() % 12 || 12;
//var hours = sunriseSunsetDateObject.getHours() % 12 || 12;
if (this.config.showPeriod) {
if (this.config.showPeriodUpper) {
timeString = hours + moment(sunriseSunsetDateObject).format(':mm A');
//timeString = hours + moment(sunriseSunsetDateObject).format(':mm A');
timeString = moment(sunriseSunsetDateObject).format('h:mm A');
} else {
timeString = hours + moment(sunriseSunsetDateObject).format(':mm a');
//timeString = hours + moment(sunriseSunsetDateObject).format(':mm a');
timeString = moment(sunriseSunsetDateObject).format('h:mm a');
}
} else {
timeString = hours + moment(sunriseSunsetDateObject).format(':mm');
//timeString = hours + moment(sunriseSunsetDateObject).format(':mm');
timeString = moment(sunriseSunsetDateObject).format('h:mm');
}
}