Bangle.js: fix 'short' time for built-in locale

espruino · May 6, 2020 · c6d011c · c6d011c
1 parent d543731
commit c6d011c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -19,6 +19,7 @@
             Graphics.drawImage: Allow 8 bit palettes to be specified
             Bangle.js: Remove dumping of hardware state - saves some flash memory
             microbit: Remove dumping of hardware state - saves some flash memory
+            Bangle.js: fix 'short' time for built-in locale
 
      2v05 : Add Array.includes
             Fix (Number.toFixed) rounding, eg (1234.505).toFixed(2)

diff --git a/libs/js/banglejs/locale.js b/libs/js/banglejs/locale.js
@@ -2,10 +2,11 @@ exports = { name : "en_GB", currencySym:"£",
   translate : str=>str, // as-is
   date : (d,short) => short?("0"+d.getDate()).substr(-2)+"/"+("0"+(d.getMonth()+1)).substr(-2)+"/"+d.getFullYear():d.toString().substr(4,11), // Date to "Feb 28 2020" or "28/02/2020"(short)
   time : (d,short) => { // Date to  "4:15.28 pm" or "15:42"(short)
+	var h = d.getHours(), m = d.getMinutes()
     if (short)
-      return d.toString().substr(16,5);
+      return (" "+h).substr(-2)+":"+("0"+m).substr(-2);
     else {
-      var h = d.getHours(), m = d.getMinutes(), r = "am";
+      var h = r = "am";
       if (h==0) { h=12; }
       else if (h>=12) {
         if (h>12) h-=12;

diff --git a/libs/js/banglejs/locale.min.js b/libs/js/banglejs/locale.min.js