Fix for various locale methods
Someone may or may not have a locale set up, and also it seems that date_utils aren't available when a locale is set???master
parent
1963eea12c
commit
b239fa69b5
|
|
@ -26,12 +26,19 @@ function draw() {
|
|||
var date = new Date();
|
||||
var h = date.getHours(),
|
||||
m = date.getMinutes();
|
||||
var d = date.getDate(),
|
||||
w = date.getDay(); // d=1..31; w=0..6
|
||||
var d = date.getDate();
|
||||
var is12Hour = (require("Storage").readJSON("setting.json", 1) || {})["12hour"];
|
||||
// var dows = require("date_utils").dows(0,1);
|
||||
var dows = ["SU","MO","TU","WE","TH","FR","SA"];
|
||||
|
||||
var dow;
|
||||
|
||||
try {
|
||||
dow = require("locale").dow(date,1);
|
||||
} catch (e) {
|
||||
try {
|
||||
dow = require("date_utils").dows(0,1)[date.getDay()];
|
||||
} catch (e) {
|
||||
dow = ["SU","MO","TU","WE","TH","FR","SA"][date.getDay()];
|
||||
}
|
||||
}
|
||||
if ((date.getTime() >= lastBattCheck + 15*60000) || Bangle.isCharging()) {
|
||||
lastBattcheck = date.getTime();
|
||||
width = E.getBattery();
|
||||
|
|
@ -54,7 +61,7 @@ function draw() {
|
|||
g.drawString(d, g.getWidth() -6, 98);
|
||||
g.setFont('Vector', 52);
|
||||
g.setFontAlign(-1, -1);
|
||||
g.drawString(dows[w].slice(0,2).toUpperCase(), 6, 103);
|
||||
g.drawString(dow.slice(0,2).toUpperCase(), 6, 103);
|
||||
|
||||
g.fillRect(9,159,166,171);
|
||||
g.fillRect(167,163,170,167);
|
||||
|
|
|
|||
Loading…
Reference in New Issue