diff --git a/apps/fwupdate/custom.html b/apps/fwupdate/custom.html
index 3f8f50b3f..8ef117933 100644
--- a/apps/fwupdate/custom.html
+++ b/apps/fwupdate/custom.html
@@ -83,6 +83,7 @@ function onInit(device) {
if (crc==3508163280 || crc==1418074094) version = "2v12";
if (crc==4056371285) version = "2v13";
if (crc==1038322422) version = "2v14";
+ if (crc==2560806221) version = "2v15";
if (!ok) {
version += `(⚠ update required)`;
}
diff --git a/apps/macwatch2/ChangeLog b/apps/macwatch2/ChangeLog
index a60193ba7..8f1fd496e 100644
--- a/apps/macwatch2/ChangeLog
+++ b/apps/macwatch2/ChangeLog
@@ -1,3 +1,4 @@
0.01: Created first version of the app with numeric date, only works in light mode
0.02: New icon, shimmied date right a bit
0.03: Incorporated improvements from Peer David for accuracy, fix dark mode, widgets run in background
+0.04: Changed clock to use 12/24 hour format based on locale
diff --git a/apps/macwatch2/app.js b/apps/macwatch2/app.js
index 3b78d5baf..d0f3aafaa 100644
--- a/apps/macwatch2/app.js
+++ b/apps/macwatch2/app.js
@@ -30,15 +30,15 @@ function draw() {
g.setFontAlign(0, -1, 0);
g.setColor(0,0,0);
var d = new Date();
- var da = d.toString().split(" ");
- hh = da[4].substr(0,2);
- mi = da[4].substr(3,2);
+ var dt = require("locale").time(d, 1);
+ var hh = dt.split(":")[0];
+ var mm = dt.split(":")[1];
+ g.drawString(hh, 52, 65, true);
+ g.drawString(mm, 132, 65, true);
+ g.drawString(':', 93,65);
dd = ("0"+(new Date()).getDate()).substr(-2);
mo = ("0"+((new Date()).getMonth()+1)).substr(-2);
yy = ("0"+((new Date()).getFullYear())).substr(-2);
- g.drawString(hh, 52, 65, true);
- g.drawString(mi, 132, 65, true);
- g.drawString(':', 93,65);
g.setFontCustom(font, 48, 8, 521);
g.drawString(dd + ':' + mo + ':' + yy, 88, 120, true);
diff --git a/apps/macwatch2/metadata.json b/apps/macwatch2/metadata.json
index 09ec01e06..09e2c5243 100644
--- a/apps/macwatch2/metadata.json
+++ b/apps/macwatch2/metadata.json
@@ -2,7 +2,7 @@
"name": "MacWatch2",
"shortName":"MacWatch2",
"icon": "app.png",
- "version":"0.03",
+ "version":"0.04",
"description": "Classic Mac Finder clock",
"type": "clock",
"tags": "clock",