matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-08 21:42:24 +03:00
Code Activity

Move lang import to the top of the file

Browse Source
This commit is contained in:
Travis Ralston
2020-01-09 13:56:14 -07:00
parent 36b7be920b
commit 4e4871c281
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/languageHandler.js
View File

@@ -22,6 +22,9 @@ import counterpart from 'counterpart';
import React from 'react'; import React from 'react';
import SettingsStore, {SettingLevel} from "./settings/SettingsStore"; import SettingsStore, {SettingLevel} from "./settings/SettingsStore";
// $webapp is a webpack resolve alias pointing to the output directory, see webpack config
import webpackLangJsonUrl from "$webapp/i18n/languages.json";
const i18nFolder = 'i18n/'; const i18nFolder = 'i18n/';
// Control whether to also return original, untranslated strings // Control whether to also return original, untranslated strings
@@ -417,9 +420,7 @@ function getLangsJson() {
return new Promise(async (resolve, reject) => { return new Promise(async (resolve, reject) => {
let url; let url;
try { try {
// $webapp is a webpack resolve alias pointing to the output directory, see webpack config url = webpackLangJsonUrl;
url = import('$webapp/i18n/languages.json');
if (url.then) url = (await url).default; // webpack resolves to a Module through a promise.
} catch (e) { } catch (e) {
url = i18nFolder + 'languages.json'; url = i18nFolder + 'languages.json';
} }