FOSS
/
BangleApps
mirror of https://github.com/espruino/BangleApps
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Sliding Clock: removing en2 from bangle 1 because it now takes too much memory

pull/2178/head
Adrian Kirk 2022-10-09 11:18:13 +01:00
parent d690d21eed
commit 991fbe63af
No known key found for this signature in database
GPG Key ID: 5A448EB0FC623526
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/slidingtext/slidingtext.js
View File

@ -694,12 +694,7 @@ function loadSettings() {
const settings = Object.assign({}, const settings = Object.assign({},
require('Storage').readJSON(PREFERENCE_FILE, true) || {}); require('Storage').readJSON(PREFERENCE_FILE, true) || {});
if (settings.date_formatter == null) { if (settings.date_formatter == null) {
// for backward compatibility
if(settings.date_format != null){
settings.date_formatter = settings.date_format;
} else {
settings.date_formatter = "en"; settings.date_formatter = "en";
}
} }
console.log("loaded settings:" + JSON.stringify(settings)); console.log("loaded settings:" + JSON.stringify(settings));
setDateformat(settings.date_formatter); setDateformat(settings.date_formatter);

3
apps/slidingtext/slidingtext.settings.js
View File

@ -112,7 +112,6 @@
'dgt': { date_formatter: 'dgt'}, 'dgt': { date_formatter: 'dgt'},
} : { } : {
'en' : { date_formatter: 'en' }, 'en' : { date_formatter: 'en' },
'en2' : { date_formatter: 'en2' },
'fr': { date_formatter:'fr'}, 'fr': { date_formatter:'fr'},
'de': { date_formatter: 'de'}, 'de': { date_formatter: 'de'},
'es': { date_formatter: 'es'}, 'es': { date_formatter: 'es'},
@ -169,7 +168,7 @@
E.showMenu({ E.showMenu({
"" : { "title" : "Sliding Text" }, "" : { "title" : "Sliding Text" },
"< Back" : () => back(), "< Back" : () => back(),
"Colour": stringInSettings("color_scheme", ["white", "black", "red","grey","purple","blue"]), "Colour": stringInSettings("color_scheme", ["black","white", "red","grey","purple","blue"]),
"Style": stringInSettings("date_format", locales, (l)=>locale_mappings[l] ), "Style": stringInSettings("date_format", locales, (l)=>locale_mappings[l] ),
"Live Control": { "Live Control": {
value: (settings.enable_live_controls !== undefined ? settings.enable_live_controls : true), value: (settings.enable_live_controls !== undefined ? settings.enable_live_controls : true),