Remove setting languages on startup
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
This commit is contained in:
parent
5f15ee4ea5
commit
4961037dbe
2 changed files with 1 additions and 14 deletions
|
@ -91,7 +91,6 @@ async function start() {
|
||||||
loadConfig,
|
loadConfig,
|
||||||
loadSkin,
|
loadSkin,
|
||||||
loadLanguage,
|
loadLanguage,
|
||||||
loadSpellCheckLanguages,
|
|
||||||
loadTheme,
|
loadTheme,
|
||||||
loadApp,
|
loadApp,
|
||||||
showError,
|
showError,
|
||||||
|
@ -135,13 +134,12 @@ async function start() {
|
||||||
|
|
||||||
// Load language after loading config.json so that settingsDefaults.language can be applied
|
// Load language after loading config.json so that settingsDefaults.language can be applied
|
||||||
const loadLanguagePromise = loadLanguage();
|
const loadLanguagePromise = loadLanguage();
|
||||||
const loadSpellCheckLanguagesPromise = loadSpellCheckLanguages();
|
|
||||||
// as quickly as we possibly can, set a default theme...
|
// as quickly as we possibly can, set a default theme...
|
||||||
const loadThemePromise = loadTheme();
|
const loadThemePromise = loadTheme();
|
||||||
const loadSkinPromise = loadSkin();
|
const loadSkinPromise = loadSkin();
|
||||||
|
|
||||||
// await things settling so that any errors we have to render have features like i18n running
|
// await things settling so that any errors we have to render have features like i18n running
|
||||||
await settled(loadSkinPromise, loadThemePromise, loadLanguagePromise, loadSpellCheckLanguagesPromise);
|
await settled(loadSkinPromise, loadThemePromise, loadLanguagePromise);
|
||||||
|
|
||||||
let acceptBrowser = supportedBrowser;
|
let acceptBrowser = supportedBrowser;
|
||||||
if (!acceptBrowser && window.localStorage) {
|
if (!acceptBrowser && window.localStorage) {
|
||||||
|
@ -192,7 +190,6 @@ async function start() {
|
||||||
await loadSkinPromise;
|
await loadSkinPromise;
|
||||||
await loadThemePromise;
|
await loadThemePromise;
|
||||||
await loadLanguagePromise;
|
await loadLanguagePromise;
|
||||||
await loadSpellCheckLanguagesPromise;
|
|
||||||
|
|
||||||
// Finally, load the app. All of the other react-sdk imports are in this file which causes the skinner to
|
// Finally, load the app. All of the other react-sdk imports are in this file which causes the skinner to
|
||||||
// run on the components.
|
// run on the components.
|
||||||
|
|
|
@ -115,16 +115,6 @@ export async function loadLanguage() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function loadSpellCheckLanguages() {
|
|
||||||
const langs = SettingsStore.getValue("spell-check-languages", null, false);
|
|
||||||
|
|
||||||
try {
|
|
||||||
await languageHandler.setSpellCheckLanguages(langs);
|
|
||||||
} catch (e) {
|
|
||||||
console.error("Unable to set spell-check language", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function loadSkin() {
|
export async function loadSkin() {
|
||||||
// Ensure the skin is the very first thing to load for the react-sdk. We don't even want to reference
|
// Ensure the skin is the very first thing to load for the react-sdk. We don't even want to reference
|
||||||
// the SDK until we have to in imports.
|
// the SDK until we have to in imports.
|
||||||
|
|
Loading…
Add table
Reference in a new issue