diff --git a/apps.json b/apps.json index d43c47a25..296cece1e 100644 --- a/apps.json +++ b/apps.json @@ -40,7 +40,7 @@ { "id": "locale", "name": "Languages", "icon": "locale.png", - "version":"0.02", + "version":"0.03", "description": "Translations for different countries", "tags": "tool,system,locale,translate", "type": "locale", diff --git a/apps/locale/ChangeLog b/apps/locale/ChangeLog index c7023f485..eda18a8b4 100644 --- a/apps/locale/ChangeLog +++ b/apps/locale/ChangeLog @@ -1,2 +1,3 @@ 0.01: New App! 0.02: Fix locale.currencySym +0.03: Fix global 'locale' variable diff --git a/apps/locale/locale.html b/apps/locale/locale.html index a7017ccce..faf53084a 100644 --- a/apps/locale/locale.html +++ b/apps/locale/locale.html @@ -60,22 +60,21 @@ }); - var app = ` - locale = ${JSON.stringify(locales[lang])}; - exports = { - lang: locale.lang, - currencySym: locale.currency_symbol, - dow: (d,short) => {day = d.getDay();return (short) ? locale.abday.split(",")[day] : locale.day.split(",")[day];}, - month: (d,short) => { month = d.getMonth(); return (short) ? locale.abmonth.split(",")[month] : locale.month.split(",")[month];}, - number: n => n.toString().replace(locale.thousands_sep, locale.decimal_point), - currency: n => n.toFixed(2).replace(locale.thousands_sep, locale.decimal_point) + locale.currency_symbol, - distance: n => (n < 1000) ? Math.round(n) + locale.distance[0] : Math.round(n/1000) + locale.distance[1], - speed: s => Math.round(s) +locale.speed, - temp: t => Math.round(t) + locale.temperature, - translate: s => {s=""+s;return locale.trans[s]||locale.trans[s.toLowerCase()]||s}, - date: (d,short) => (short) ? \`${dateS}\`: \`${dateN}\`, - time: (d,short) => (short) ? \`${timeS}\`: \`${timeN}\`, - };`; + var app = `var locale = ${JSON.stringify(locales[lang])}; +exports = { + lang: locale.lang, + currencySym: locale.currency_symbol, + dow: (d,short) => {day = d.getDay();return (short) ? locale.abday.split(",")[day] : locale.day.split(",")[day];}, + month: (d,short) => { month = d.getMonth(); return (short) ? locale.abmonth.split(",")[month] : locale.month.split(",")[month];}, + number: n => n.toString().replace(locale.thousands_sep, locale.decimal_point), + currency: n => n.toFixed(2).replace(locale.thousands_sep, locale.decimal_point) + locale.currency_symbol, + distance: n => (n < 1000) ? Math.round(n) + locale.distance[0] : Math.round(n/1000) + locale.distance[1], + speed: s => Math.round(s) +locale.speed, + temp: t => Math.round(t) + locale.temperature, + translate: s => {s=""+s;return locale.trans[s]||locale.trans[s.toLowerCase()]||s}, + date: (d,short) => (short) ? \`${dateS}\`: \`${dateN}\`, + time: (d,short) => (short) ? \`${timeS}\`: \`${timeN}\`, +};`; sendCustomizedApp({ storage:[