From 1b628c35f05f7de0347bd16b7bd1b5407be598d5 Mon Sep 17 00:00:00 2001 From: Stewart Allen Date: Sat, 9 Oct 2021 19:33:49 -0400 Subject: [PATCH] more lang load cleanup --- src/kiri/init.js | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/kiri/init.js b/src/kiri/init.js index 5a985c50..17e5ee82 100644 --- a/src/kiri/init.js +++ b/src/kiri/init.js @@ -2778,13 +2778,10 @@ function init_lang() { // if a language needs to load, the script is injected and loaded // first. once this loads, or doesn't, the initialization begins - let lang_load = false; - let lang_set = undefined; let lang = SETUP.ln ? SETUP.ln[0] : SDB.getItem('kiri-lang') || KIRI.lang.get(); // inject language script if not english if (lang && lang !== 'en' && lang !== 'en-us') { - lang_set = lang; let map = KIRI.lang.map(lang); let scr = DOC.createElement('script'); // scr.setAttribute('defer',true); @@ -2792,20 +2789,19 @@ (DOC.body || DOC.head).appendChild(scr); STATS.set('ll',lang); scr.onload = function() { - lang_load = true; KIRI.lang.set(map); UI.lang(); init_one(); }; scr.onerror = function(err) { console.log({language_load_error: err, lang}) + KIRI.lang.set(); + UI.lang(); init_one(); } - } - - // set to browser default which will be overridden - // by any future script loads (above) - if (!lang_load) { + } else { + // set to browser default which will be overridden + // by any future script loads (above) KIRI.lang.set(); UI.lang(); init_one();