forked from FOSS/BangleApps
Merge branch 'espruino:master' into master
commit
8d6bee3adc
|
@ -2,3 +2,4 @@ apps/animclk/V29.LBM.js
|
|||
apps/banglerun/rollup.config.js
|
||||
apps/schoolCalendar/fullcalendar/main.js
|
||||
apps/authentiwatch/qr_packed.js
|
||||
*.test.js
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
};
|
||||
validSttngs = require("Storage").readJSON("timecal.validSttngs.json", 1) || {};
|
||||
for (const k in validSttngs) if (!DEFAULTS.hasOwnProperty(k)) delete this.validSttngs[k]; //remove invalid settings
|
||||
for (const k in DEFAULTS) if(!validSttngs.hasOwnProperty(k)) validSttngs[k] = validSttngs[k]; //assign missing defaults
|
||||
for (const k in DEFAULTS) if(!validSttngs.hasOwnProperty(k)) validSttngs[k] = DEFAULTS[k]; //assign missing defaults
|
||||
|
||||
var changedSttngs = Object.assign({}, validSttngs);
|
||||
|
||||
|
|
2
core
2
core
|
@ -1 +1 @@
|
|||
Subproject commit bf29f5697445686255a785476e6b1ed6a13ff697
|
||||
Subproject commit a7a80a13fa187a4ff5f89669992babca2d95812c
|
|
@ -202,7 +202,6 @@ window.addEventListener('load', (event) => {
|
|||
}
|
||||
|
||||
var selectLang = document.getElementById("settings-lang");
|
||||
console.log(languages);
|
||||
languages.forEach(lang => {
|
||||
selectLang.innerHTML += `<option value="${lang.code}" ${SETTINGS.language==lang.code?"selected":""}>${lang.name} (${lang.code})</option>`;
|
||||
});
|
||||
|
|
Loading…
Reference in New Issue