OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Remove setting languages on startup 

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
pull/15851/head
Šimon Brandner 2021-02-18 19:16:33 +01:00
parent 5f15ee4ea5
commit 4961037dbe
No known key found for this signature in database
GPG Key ID: 9760693FDD98A790
2 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/vector/index.ts
View File

@ -91,7 +91,6 @@ async function start() {
loadConfig,
loadSkin,
loadLanguage,
loadSpellCheckLanguages,
loadTheme,
loadApp,
showError,
@ -135,13 +134,12 @@ async function start() {
// Load language after loading config.json so that settingsDefaults.language can be applied
const loadLanguagePromise = loadLanguage();
const loadSpellCheckLanguagesPromise = loadSpellCheckLanguages();
// as quickly as we possibly can, set a default theme...
const loadThemePromise = loadTheme();
const loadSkinPromise = loadSkin();
// 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;
if (!acceptBrowser && window.localStorage) {
@ -192,7 +190,6 @@ async function start() {
await loadSkinPromise;
await loadThemePromise;
await loadLanguagePromise;
await loadSpellCheckLanguagesPromise;
// Finally, load the app. All of the other react-sdk imports are in this file which causes the skinner to
// run on the components.

10
src/vector/init.tsx
View File

@ -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() {
// 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.