tweaks to test language modules
This commit is contained in:
parent
12087ecbb1
commit
3a801ae15f
2 changed files with 14 additions and 12 deletions
|
|
@ -425,12 +425,6 @@ let gs_kiri_lang = exports;
|
|||
ag_paws_l: "comma-separated list of layers\nto inject pause commands before"
|
||||
};
|
||||
|
||||
LANG['test'] = { bogus: "not a valid key" };
|
||||
|
||||
Object.keys(LANG.en).forEach(key => {
|
||||
LANG.test[key] = `*${LANG.en[key]}*`;
|
||||
});
|
||||
|
||||
LANG.current = {};
|
||||
|
||||
LANG.set(lset, lset.split('-')[0]);
|
||||
|
|
|
|||
20
js/kiri.js
20
js/kiri.js
|
|
@ -69,7 +69,8 @@ self.kiri.license = exports.LICENSE;
|
|||
camStock = null,
|
||||
camTopZ = 0,
|
||||
topZ = 0,
|
||||
showFavorites = SDB['dev-favorites'] === 'true';
|
||||
showFavorites = SDB['dev-favorites'] === 'true',
|
||||
alerts = [];
|
||||
|
||||
// seed defaults. will get culled on save
|
||||
settings.sproc.FDM.default = clone(settings.process);
|
||||
|
|
@ -80,11 +81,6 @@ self.kiri.license = exports.LICENSE;
|
|||
|
||||
DBUG.enable();
|
||||
|
||||
if (SETUP.rm) renderMode = parseInt(SETUP.rm[0]);
|
||||
if (SETUP.ln) KIRI.lang.set(SETUP.ln[0]);
|
||||
|
||||
let alerts = [ [ `${LANG.version} ${KIRI.version}`, Date.now() ] ];
|
||||
|
||||
// add show() to catalog for API
|
||||
CATALOG.show = showCatalog;
|
||||
|
||||
|
|
@ -187,6 +183,7 @@ self.kiri.license = exports.LICENSE;
|
|||
hide: {
|
||||
import: function() { UI.import.style.display = 'none' }
|
||||
},
|
||||
language: KIRI.lang,
|
||||
modal: {
|
||||
show: showModal,
|
||||
hide: hideModal,
|
||||
|
|
@ -335,6 +332,10 @@ self.kiri.license = exports.LICENSE;
|
|||
while (alerts.length > 5) {
|
||||
alerts.shift();
|
||||
}
|
||||
// return if called before UI configured
|
||||
if (!UI.alert) {
|
||||
return;
|
||||
}
|
||||
if (alerts.length > 0) {
|
||||
UI.alert.text.innerHTML = alerts.map(v => ['<p>',v[0],'</p>'].join('')).join('');
|
||||
UI.alert.dialog.style.display = 'flex';
|
||||
|
|
@ -1822,4 +1823,11 @@ self.kiri.license = exports.LICENSE;
|
|||
kirimod.forEach(function(mod) { mod(kiri.api) });
|
||||
}
|
||||
|
||||
// allow language modules to load first
|
||||
if (SETUP.ln) KIRI.lang.set(SETUP.ln[0]);
|
||||
if (SETUP.rm) renderMode = parseInt(SETUP.rm[0]);
|
||||
|
||||
// show version on startup
|
||||
API.show.alert(`${LANG.version} ${KIRI.version}`);
|
||||
|
||||
})();
|
||||
|
|
|
|||
Loading…
Reference in a new issue