From a90b58bc0d67e0b6729d037cde07ee21f175bf31 Mon Sep 17 00:00:00 2001 From: deirdreobyrne Date: Mon, 26 Sep 2022 16:01:23 +0100 Subject: [PATCH] Implementing locale fix --- apps/bigdclock/ChangeLog | 2 +- apps/bigdclock/bigdclock.app.js | 13 ++----------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/apps/bigdclock/ChangeLog b/apps/bigdclock/ChangeLog index e9791dab8..98b232467 100644 --- a/apps/bigdclock/ChangeLog +++ b/apps/bigdclock/ChangeLog @@ -4,4 +4,4 @@ 0.04: bug fix 0.05: proper fix for the race condition in queueDraw() 0.06: Tell clock widgets to hide. -0.07: Better battery graphic - now has green, yellow and red sections; battery status reflected in the bar across the middle of the screen; better handling of locale +0.07: Better battery graphic - now has green, yellow and red sections; battery status reflected in the bar across the middle of the screen; better handling of locale; current battery state checked only once every 15 minutes, leading to longer-lasting battery charge diff --git a/apps/bigdclock/bigdclock.app.js b/apps/bigdclock/bigdclock.app.js index 2f8b7cd4d..a8e2b38df 100644 --- a/apps/bigdclock/bigdclock.app.js +++ b/apps/bigdclock/bigdclock.app.js @@ -28,17 +28,8 @@ function draw() { m = date.getMinutes(); var d = date.getDate(); var is12Hour = (require("Storage").readJSON("setting.json", 1) || {})["12hour"]; - 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()]; - } - } + var dow = require("date_utils").dows(0,1)[date.getDay()]; + if ((date.getTime() >= lastBattCheck + 15*60000) || Bangle.isCharging()) { lastBattcheck = date.getTime(); width = E.getBattery();