Bram
/
BangleApps
forked from FOSS/BangleApps
1
0
Fork 0
Code Pull Requests Activity

Merge pull request #2788 from stweedo/12_hour_lead_zero 

Update locale.html to remove leading zero in 12 hour mode
master
Gordon Williams 2023-06-05 09:38:25 +01:00 committed by GitHub
parent d25a6ff667 7df499d277
commit eade9c7c98
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/locale/locale.html
View File

@ -156,7 +156,7 @@ exports = { name : "en_GB", currencySym:"£",
"%-m": "d.getMonth()+1", "%-m": "d.getMonth()+1",
"%d": "('0'+d.getDate()).slice(-2)", "%d": "('0'+d.getDate()).slice(-2)",
"%-d": "d.getDate()", "%-d": "d.getDate()",
"%HH": "('0'+getHours(d)).slice(-2)", "%HH": "getHours(d)",
"%MM": "('0'+d.getMinutes()).slice(-2)", "%MM": "('0'+d.getMinutes()).slice(-2)",
"%SS": "('0'+d.getSeconds()).slice(-2)", "%SS": "('0'+d.getSeconds()).slice(-2)",
"%A": `${js(locale.day)}.split(',')[d.getDay()]`, "%A": `${js(locale.day)}.split(',')[d.getDay()]`,
@ -192,8 +192,8 @@ var is12;
function getHours(d) { function getHours(d) {
var h = d.getHours(); var h = d.getHours();
if (is12 === undefined) is12 = (require('Storage').readJSON('setting.json', 1) || {})["12hour"]; if (is12 === undefined) is12 = (require('Storage').readJSON('setting.json', 1) || {})["12hour"];
if (!is12) return h; if (!is12) return ('0' + h).slice(-2);
return (h%12==0) ? 12 : h%12; return ((h % 12 == 0) ? 12 : h % 12).toString();
} }
exports = { exports = {
name: ${js(locale.lang)}, name: ${js(locale.lang)},