bryan
/
BangleApps_old
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #952 from rigrig/locale-12h 

locale: Apply 12hour setting to time
master
Gordon Williams 2021-11-29 09:48:20 +00:00 committed by GitHub
parent 30e421e225 6220a88d29
commit 99ec40cd8e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps.json
View File

@ -170,7 +170,7 @@
{ {
"id": "locale", "id": "locale",
"name": "Languages", "name": "Languages",
"version": "0.09", "version": "0.10",
"description": "Translations for different countries", "description": "Translations for different countries",
"icon": "locale.png", "icon": "locale.png",
"type": "locale", "type": "locale",

1
apps/locale/ChangeLog
View File

@ -9,3 +9,4 @@
0.07: Improve handling of non-ASCII characters (fix #469) 0.07: Improve handling of non-ASCII characters (fix #469)
0.08: Added Mavigation units and en_NAV 0.08: Added Mavigation units and en_NAV
0.09: Added New Zealand en_NZ 0.09: Added New Zealand en_NZ
0.10: Apply 12hour setting to time

9
apps/locale/locale.html
View File

@ -146,7 +146,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'+d.getHours()).slice(-2)", "%HH": "('0'+getHours(d)).slice(-2)",
"%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": "day.split(',')[d.getDay()]", "%A": "day.split(',')[d.getDay()]",
@ -178,6 +178,13 @@ var month = ${js(locale.month + ',' + locale.abmonth)};
function round(n) { function round(n) {
return n < 10 ? Math.round(n * 10) / 10 : Math.round(n); return n < 10 ? Math.round(n * 10) / 10 : Math.round(n);
} }
var is12;
function getHours(d) {
var h = d.getHours();
if (is12==undefined) is12 = (require('Storage',1).readJSON('setting.json')||{})["12hour"];
if (!is12) return h;
return (h%12==0) ? 12 : h%12;
}
exports = { exports = {
name: ${js(locale.lang)}, name: ${js(locale.lang)},
currencySym: ${js(locale.currency_symbol)}, currencySym: ${js(locale.currency_symbol)},