From 4ff0adc3fd2e68934890b33f60f249bad0596d55 Mon Sep 17 00:00:00 2001 From: grsutcliffe Date: Wed, 3 Jun 2020 09:57:44 +1000 Subject: [PATCH 1/3] en_AU updated to values metric and corrected date local "en_AU" had some incorrect values, Australia is fully metric, and date is %d/%m/%y. --- apps/locale/locales.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/locale/locales.js b/apps/locale/locales.js index aaae27c93..d54506ce9 100644 --- a/apps/locale/locales.js +++ b/apps/locale/locales.js @@ -212,12 +212,12 @@ var locales = { thousands_sep: ",", currency_symbol: "$", int_curr_symbol: "AUD", - speed: "mph", - distance: { 0: "mi", 1: "kmi" }, - temperature: "°F", + speed: "kmh", + distance: { 0: "m", 1: "km" }, + temperature: "°C", ampm: { 0: "am", 1: "pm" }, timePattern: { 0: "%HH:%MM:%SS ", 1: "%HH:%MM" }, - datePattern: { 0: "%A, %B %d, %Y", "1": "%m/%d/%y" }, // Sunday, 1 March 2020 // 1/3/20 + datePattern: { 0: "%A, %B %d, %Y", "1": "%d/%m/%y" }, // Sunday, 1 March 2020 // 1/3/20 abmonth: "Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec", month: "January,February,March,April,May,June,July,August,September,October,November,December", abday: "Sun,Mon,Tue,Wed,Thu,Fri,Sat", From d2d8c66ae2be6f370062f61c85c0d87a963b7284 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matja=C5=BE=20Lipu=C5=A1?= Date: Wed, 3 Jun 2020 23:58:40 +0200 Subject: [PATCH 2/3] fixed SI on/off translations --- apps/locale/locales.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/locale/locales.js b/apps/locale/locales.js index aaae27c93..6b66799e5 100644 --- a/apps/locale/locales.js +++ b/apps/locale/locales.js @@ -491,7 +491,7 @@ var locales = { month: "januar,februar,marec,april,maj,junij,julij,avgust,september,oktober,november,december", abday: "ned.,pon.,tor.,sre.,čet.,pet.,sob.", day: "nedelja,ponedeljek,torek,sreda,četrtek,petek,sobota", - trans: { yes: "da", Yes: "Da", no: "ne", No: "Ne", ok: "ok", on: "On", off: "Off" } + trans: { yes: "da", Yes: "Da", no: "ne", No: "Ne", ok: "ok", on: "Vklj.", off: "Izklj." } }/*, "he_IL": { // This won't work until we get a font - see https://github.com/espruino/BangleApps/issues/399 codePage : "ISO8859-8", From 9c68b8f6ddfa11414a25f7a5c55138e1c30818c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matja=C5=BE=20Lipu=C5=A1?= Date: Thu, 4 Jun 2020 00:19:23 +0200 Subject: [PATCH 3/3] DRY --- apps/locale/locale.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/locale/locale.html b/apps/locale/locale.html index 6b643f0be..18b36be72 100644 --- a/apps/locale/locale.html +++ b/apps/locale/locale.html @@ -155,10 +155,10 @@ exports = { name : "en_GB", currencySym:"£", "%P": `d.getHours()<12?${js(locale.ampm[0].toLowerCase())}:${js(locale.ampm[1].toLowerCase())}` }; - var timeN = locales[lang].timePattern[0]; - var timeS = locales[lang].timePattern[1]; - var dateN = locales[lang].datePattern[0]; - var dateS = locales[lang].datePattern[1]; + var timeN = locale.timePattern[0]; + var timeS = locale.timePattern[1]; + var dateN = locale.datePattern[0]; + var dateS = locale.datePattern[1]; Object.keys(replaceList).forEach(e => { timeN = timeN.replace(e,"${"+replaceList[e]+"}"); timeS = timeS.replace(e,"${"+replaceList[e]+"}");