Merge pull request #2730 from matrix-org/dbkr/langs_file_resolve_alias

Use webpack alias to resolve the languages file

Author: dbkr

scripts/travis/build.sh

@@ -23,5 +23,5 @@ ln -s "$REACT_SDK_DIR/node_modules/matrix-js-sdk" node_modules/matrix-js-sdk
 rm -r node_modules/matrix-react-sdk
 ln -s "$REACT_SDK_DIR" node_modules/matrix-react-sdk
 
-RIOT_LANGUAGES_FILE="../riot-web/webapp/i18n/languages.json" npm run build
+npm run build
 popd

src/languageHandler.js

@@ -338,8 +338,13 @@ export function getCurrentLanguage() {
 
 function getLangsJson() {
     return new Promise((resolve, reject) => {
-        // LANGUAGES_FILE is a webpack compile-time define, see webpack config
-        const url = (typeof LANGUAGES_FILE === "string") ? require(LANGUAGES_FILE) : (i18nFolder + 'languages.json');
+        let url;
+        try {
+            // $webapp is a webpack resolve alias pointing to the output directory, see webpack config
+            url = require('$webapp/i18n/languages.json');
+        } catch (e) {
+            url = i18nFolder + 'languages.json';
+        }
         request(
             { method: "GET", url },
             (err, response, body) => {