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

sliding text clock: BUGFIX - settings unresponsive

pull/2178/head
adrian w kirk 2022-09-30 09:13:58 +01:00
parent bd2fad743d
commit 267709fc7b
3 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apps/slidingtext/slidingtext.js
View File

@ -698,9 +698,15 @@ const PREFERENCE_FILE = "slidingtext.settings.json";
*/
function loadSettings() {
try {
var settings = require("Storage").readJSON(PREFERENCE_FILE);
if (settings == null || settings.date_formatter == null) {
settings.date_formatter = "en"
var settings = Object.assign({},
require('Storage').readJSON(PREFERENCE_FILE, true) || {});
if (settings.date_formatter == null) {
// for backward compatibility
if(settings.date_format != null){
settings.date_formatter = settings.date_format;
} else {
settings.date_formatter = "en";
}
}
console.log("loaded settings:" + JSON.stringify(settings));
setDateformat(settings.date_formatter);

2
apps/slidingtext/slidingtext.locale.en.js
View File

@ -37,7 +37,7 @@ class EnglishDateFormatter extends DateFormatter {
constructor() {
super();
this.row_types = {
small: {size: 'vsmall'}
small: {size: 'small'}
};
this.row_defs = [
{

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

@ -9,7 +9,7 @@
console.log("loaded:" + JSON.stringify(settings));
var locale_mappings = {
'en' : { date_formatter: 'en' },
'en patchwork': {
'en p': {
date_formatter: 'en',
row_types: {
large:{
@ -38,7 +38,7 @@
]
},
'en2': { date_formatter: 'en2' },
'en2 patchwork': { date_formatter: 'en2',
'en2 p': { date_formatter: 'en2',
row_types: {
vsmall: {
scroll_off: ['right'],
@ -81,10 +81,10 @@
},
]
},
'French': { date_formatter:'fr'},
'German': { date_formatter: 'de'},
'Spanish': { date_formatter: 'es'},
'Japanese': { date_formatter: 'jp'},
'fr': { date_formatter:'fr'},
'de': { date_formatter: 'de'},
'es': { date_formatter: 'es'},
'jp': { date_formatter: 'jp'},
}
var locales = Object.keys(locale_mappings);