archive-gh-me/Espruino
1
0
Fork 0
mirror of https://github.com/espruino/Espruino.git synced 2025-12-08 19:06:15 +00:00
Code Issues Projects Releases Wiki Activity

Bangle.js: fix require("locale").time(new Date()) for default locale

Browse Source
This commit is contained in:
Gordon Williams 2020-10-27 08:09:30 +00:00
parent 542265bdb9
commit d802fcd592
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -1,6 +1,7 @@
Bangle.js: increase default advertising interval from 375 to 200ms to ease connections
Fix Math.acos for negative values (fix #1950)
nRF5x: Add callback param to 'NRF.restart', allowing code to be called with softdevice disabled
Bangle.js: fix require("locale").time(new Date()) for default locale
2v08 : nRF52: Added option to build in I2C slave support
Fix Tensorflow aiGesture regression from 2v07 (re-add opcodes) (fix #1936)

4
libs/js/banglejs/locale.js
View File

@ -2,11 +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()
var h = d.getHours(), m = d.getMinutes()
if (short)
return (" "+h).substr(-2)+":"+("0"+m).substr(-2);
else {
var h = r = "am";
var r = "am";
if (h==0) { h=12; }
else if (h>=12) {
if (h>12) h-=12;

2
libs/js/banglejs/locale.min.js vendored
View File

@ -1,3 +1,3 @@
exports={name:"en_GB",currencySym:"\u00a3",translate:function(a){return a},date:function(a,c){return c?("0"+a.getDate()).substr(-2)+"/"+("0"+(a.getMonth()+1)).substr(-2)+"/"+a.getFullYear():a.toString().substr(4,11)},time:function(a,c){var b=a.getHours(),d=a.getMinutes();if(c)return(" "+b).substr(-2)+":"+("0"+d).substr(-2);b=r="am";0==b?b=12:12<=b&&(12<b&&(b-=12),r="pm");return(" "+b).substr(-2)+":"+("0"+d).substr(-2)+"."+("0"+a.getSeconds()).substr(-2)+" "+r},dow:function(a,c){return c?
exports={name:"en_GB",currencySym:"\u00a3",translate:function(a){return a},date:function(a,c){return c?("0"+a.getDate()).substr(-2)+"/"+("0"+(a.getMonth()+1)).substr(-2)+"/"+a.getFullYear():a.toString().substr(4,11)},time:function(a,c){var b=a.getHours(),d=a.getMinutes();if(c)return(" "+b).substr(-2)+":"+("0"+d).substr(-2);r="am";0==b?b=12:12<=b&&(12<b&&(b-=12),r="pm");return(" "+b).substr(-2)+":"+("0"+d).substr(-2)+"."+("0"+a.getSeconds()).substr(-2)+" "+r},dow:function(a,c){return c?
a.toString().substr(0,3):"Sunday Monday Tuesday Wednesday Thursday Friday Saturday".split(" ")[a.getDay()]},month:function(a,c){return c?a.toString().substr(4,3):"January February March April May June July August September October November December".split(" ")[a.getMonth()]},number:function(a){return a.toString()},currency:function(a){return"\u00a3"+a.toFixed(2)},distance:function(a){return 1E3>a?Math.round(a)+"m":Math.round(a/160.934)/10+"mi"},speed:function(a){return Math.round(a/1.60934)+"mph"},temp:function(a){return Math.round(a)+
"'C"},meridian:function(a){return 12>=a.getHours()?"am":"pm"}}