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

Fix import of language index 

This is a similar fix to 18ac2db2ea
pull/21833/head
Travis Ralston 2019-12-20 13:58:46 -07:00
parent 539a33c722
commit 3eb3be45d1
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/languageHandler.js
View File

@ -410,11 +410,12 @@ export function pickBestLanguage(langs) {
} }
function getLangsJson() { function getLangsJson() {
return new Promise((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 // $webapp is a webpack resolve alias pointing to the output directory, see webpack config
url = require('$webapp/i18n/languages.json'); 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';
} }