Added local and support for 12h clock

master
Fredrik Lautrup 2020-04-23 19:05:22 +02:00
parent 14df398bb6
commit 4441f3055c
1 changed files with 17 additions and 12 deletions

View File

@ -4,6 +4,8 @@
var hours;
var date;
var first = true;
var locale = require('locale');
var _12hour = (require("Storage").readJSON("setting.json",1)||{})["12hour"]||false;
const screen = {
width: g.getWidth(),
@ -41,17 +43,7 @@
};
const dateStr = function (date) {
day = date.getDate();
month = date.getMonth();
year = date.getFullYear();
if (day < 10) {
day = "0" + day;
}
if (month < 10) {
month = "0" + month;
}
return year + "-" + month + "-" + day;
return locale.date(new Date(),1);
};
const getArcXY = function (centerX, centerY, radius, angle) {
@ -133,9 +125,22 @@
//Write the time as configured in the settings
hours = currentTime.getHours();
if(_12hour && hours>13) {
hours=hours-12;
}
var medidian=locale.medidian(new Date());
var timestr;
if(medidian.length>0) {
timestr=hour+" "+medidian;
} else {
timestr=hour;
}
g.setColor(settings.time.color);
g.setFont(settings.time.font, settings.time.size);
g.drawString(hours, settings.time.center, settings.time.middle);
g.drawString(timestr, settings.time.center, settings.time.middle);
//Write the date as configured in the settings
g.setColor(settings.date.color);