Use toLocaleFormat, to format time; fix for 12h time formats

openweathermap_3.6
Jens Lody 11 years ago
parent 2db32a94e5
commit fb7ebcb36c
  1. 15
      src/extension.js

@ -1236,13 +1236,16 @@ weather-storm.png = weather-storm-symbolic.svg
break; break;
} }
let lastBuild = (this.lastBuildDate.getHours() % 12) + ":" + ((this.lastBuildDate.getMinutes() < 10) ? "0" : "") + this.lastBuildDate.getMinutes() + " " + ((this.lastBuildDate.getHours() >= 12) ? "pm" : "am"); let lastBuild = '-';
if (this._clockFormat == "24h") { if (this._clockFormat == "24h") {
sunrise = new Date(sunrise * 1000); sunrise = new Date(sunrise * 1000).toLocaleFormat("%R");
sunrise = sunrise.getHours() + ":" + ((sunrise.getMinutes() < 10) ? "0" : "") + sunrise.getMinutes(); sunset = new Date(sunset * 1000).toLocaleFormat("%R");
sunset = new Date(sunset * 1000); lastBuild = this.lastBuildDate.toLocaleFormat("%R");
sunset = sunset.getHours() + ":" + ((sunset.getMinutes() < 10) ? "0" : "") + sunset.getMinutes(); } else {
lastBuild = this.lastBuildDate.getHours() + ":" + ((this.lastBuildDate.getMinutes() < 10) ? "0" : "") + this.lastBuildDate.getMinutes(); sunrise = new Date(sunrise * 1000).toLocaleFormat("%I:%M %p");
sunset = new Date(sunset * 1000).toLocaleFormat("%I:%M %p");
lastBuild = this.lastBuildDate.toLocaleFormat("%I:%M %p");
} }
if (d >= 1) { if (d >= 1) {

Loading…
Cancel
Save