diff --git a/apps/mosaic/ChangeLog b/apps/mosaic/ChangeLog index 7b83706bf..f26a9df0a 100644 --- a/apps/mosaic/ChangeLog +++ b/apps/mosaic/ChangeLog @@ -1 +1,2 @@ 0.01: First release +0.02: Use locale time diff --git a/apps/mosaic/metadata.json b/apps/mosaic/metadata.json index 267c0de55..92548ce9c 100644 --- a/apps/mosaic/metadata.json +++ b/apps/mosaic/metadata.json @@ -2,7 +2,7 @@ "id":"mosaic", "name":"Mosaic Clock", "shortName": "Mosaic Clock", - "version": "0.01", + "version": "0.02", "description": "A fabulously colourful clock", "readme": "README.md", "icon":"mosaic.png", diff --git a/apps/mosaic/mosaic.app.js b/apps/mosaic/mosaic.app.js index 8b008b848..03eb417fd 100644 --- a/apps/mosaic/mosaic.app.js +++ b/apps/mosaic/mosaic.app.js @@ -58,13 +58,15 @@ function draw() { ); } } - let t = new Date(); + let t = require("locale").time(new Date(), 1); + let hour = parseInt(t.split(":")[0]); + let minute = parseInt(t.split(":")[1]); g.setBgColor(theme.fg); g.setColor(theme.bg); - g.drawImage(digits[Math.floor(t.getHours()/10)], (mid_x-5)*s+o_w, (mid_y-7)*s+o_h, {scale:s}); - g.drawImage(digits[t.getHours() % 10], (mid_x+1)*s+o_w, (mid_y-7)*s+o_h, {scale:s}); - g.drawImage(digits[Math.floor(t.getMinutes()/10)], (mid_x-5)*s+o_w, (mid_y+1)*s+o_h, {scale:s}); - g.drawImage(digits[t.getMinutes() % 10], (mid_x+1)*s+o_w, (mid_y+1)*s+o_h, {scale:s}); + g.drawImage(digits[Math.floor(hour/10)], (mid_x-5)*s+o_w, (mid_y-7)*s+o_h, {scale:s}); + g.drawImage(digits[hour % 10], (mid_x+1)*s+o_w, (mid_y-7)*s+o_h, {scale:s}); + g.drawImage(digits[Math.floor(minute/10)], (mid_x-5)*s+o_w, (mid_y+1)*s+o_h, {scale:s}); + g.drawImage(digits[minute % 10], (mid_x+1)*s+o_w, (mid_y+1)*s+o_h, {scale:s}); queueDraw(timeout); }