bryan
/
BangleApps_old
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
deirdreobyrne 2022-09-23 20:14:51 +01:00
parent 1963eea12c
commit b239fa69b5
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
apps/bigdclock/bigdclock.app.js
View File

@ -26,12 +26,19 @@ function draw() {
var date = new Date(); var date = new Date();
var h = date.getHours(), var h = date.getHours(),
m = date.getMinutes(); m = date.getMinutes();
var d = date.getDate(), var d = date.getDate();
w = date.getDay(); // d=1..31; w=0..6
var is12Hour = (require("Storage").readJSON("setting.json", 1) || {})["12hour"]; var is12Hour = (require("Storage").readJSON("setting.json", 1) || {})["12hour"];
// var dows = require("date_utils").dows(0,1); var dow;
var dows = ["SU","MO","TU","WE","TH","FR","SA"];
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()) { if ((date.getTime() >= lastBattCheck + 15*60000) || Bangle.isCharging()) {
lastBattcheck = date.getTime(); lastBattcheck = date.getTime();
width = E.getBattery(); width = E.getBattery();
@ -54,7 +61,7 @@ function draw() {
g.drawString(d, g.getWidth() -6, 98); g.drawString(d, g.getWidth() -6, 98);
g.setFont('Vector', 52); g.setFont('Vector', 52);
g.setFontAlign(-1, -1); 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(9,159,166,171);
g.fillRect(167,163,170,167); g.fillRect(167,163,170,167);