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

Deprecate currency information

master
Anton 2024-03-20 09:56:19 +01:00
parent b8afbb2aea
commit 9bc3b4c0be
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/locale/ChangeLog
View File

@ -19,3 +19,4 @@
0.16: Remove global variables that used RAM 0.16: Remove global variables that used RAM
Add second 'dp' argument for decimal places in distance/speed/temp (fix #1523) Add second 'dp' argument for decimal places in distance/speed/temp (fix #1523)
0.17: Fix regression where long month names were 'undefined' (fix #1641) 0.17: Fix regression where long month names were 'undefined' (fix #1641)
: Deprecate currency information

8
apps/locale/locale.html
View File

@ -173,9 +173,6 @@ exports = { name : "en_GB", currencySym:"£",
dateN = dateN.replace(e,"${"+replaceList[e]+"}"); dateN = dateN.replace(e,"${"+replaceList[e]+"}");
dateS = dateS.replace(e,"${"+replaceList[e]+"}"); dateS = dateS.replace(e,"${"+replaceList[e]+"}");
}); });
var currency = locale.currency_first ?
`${js(locale.currency_symbol)} + exports.number(n)`:
`exports.number(n) + ${js(locale.currency_symbol)}`;
var temperature = locale.temperature=='°F' ? '(t*9/5)+32' : 't'; var temperature = locale.temperature=='°F' ? '(t*9/5)+32' : 't';
function getLocaleModule(isLocal) { function getLocaleModule(isLocal) {
@ -194,7 +191,8 @@ function getHours(d) {
} }
exports = { exports = {
name: ${js(locale.lang)}, name: ${js(locale.lang)},
currencySym: ${js(locale.currency_symbol)}, get currencySym(){console.log("Warning: Currency information is deprecated");return ${js("£")}},
set currencySym(v){},
dow: (d,short) => ${js(locale.day + ',' + locale.abday)}.split(',')[d.getDay() + (short ? 7 : 0)], dow: (d,short) => ${js(locale.day + ',' + locale.abday)}.split(',')[d.getDay() + (short ? 7 : 0)],
month: (d,short) => ${js(locale.month + ',' + locale.abmonth)}.split(',')[d.getMonth() + (short ? 12 : 0)], month: (d,short) => ${js(locale.month + ',' + locale.abmonth)}.split(',')[d.getMonth() + (short ? 12 : 0)],
number: (n, dec) => { number: (n, dec) => {
@ -212,7 +210,7 @@ exports = {
} }
return s.substr(0, i + 3) + r + (d ? '${locale.decimal_point}' + d: ''); return s.substr(0, i + 3) + r + (d ? '${locale.decimal_point}' + d: '');
}, },
currency: n => ${currency}, currency: n => {console.log("Warning: Currency information is deprecated");return ${js("£")}+exports.number(n)},
distance: (n,dp) => n < ${distanceUnits[locale.distance[1]]} ? round(${unitConv(distanceUnits[locale.distance[0]])},dp) + ${js(locale.distance[0])} : round(${unitConv(distanceUnits[locale.distance[1]])},dp) + ${js(locale.distance[1])}, distance: (n,dp) => n < ${distanceUnits[locale.distance[1]]} ? round(${unitConv(distanceUnits[locale.distance[0]])},dp) + ${js(locale.distance[0])} : round(${unitConv(distanceUnits[locale.distance[1]])},dp) + ${js(locale.distance[1])},
speed: (n,dp) => round(${unitConv(speedUnits[locale.speed])},dp) + ${js(locale.speed)}, speed: (n,dp) => round(${unitConv(speedUnits[locale.speed])},dp) + ${js(locale.speed)},
temp: (t,dp) => round(${temperature},dp) + ${js(locale.temperature)}, temp: (t,dp) => round(${temperature},dp) + ${js(locale.temperature)},