Fixing so that hour is shown right

pull/346/head
Fredrik Lautrup 2020-04-23 19:35:18 +02:00
parent 9ce908761a
commit 5c3e5ff2ee
1 changed files with 11 additions and 4 deletions

View File

@ -129,13 +129,20 @@
hours=hours-12;
}
var medidian=locale.medidian(new Date());
var meridian;
if (typeof locale.meridian === "function") {
meridian=locale.meridian(new Date());
} else {
meridian="";
}
var timestr;
if(medidian.length>0) {
timestr=hour+" "+medidian;
if(meridian.length>0 && _12hour) {
timestr=hours+" "+meridian;
} else {
timestr=hour;
timestr=hours;
}
g.setColor(settings.time.color);