diff --git a/scripts/travis/build.sh b/scripts/travis/build.sh index df192d70b2..a353e38a06 100755 --- a/scripts/travis/build.sh +++ b/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 diff --git a/src/languageHandler.js b/src/languageHandler.js index 7c1a47fed9..bc2bd429b5 100644 --- a/src/languageHandler.js +++ b/src/languageHandler.js @@ -338,8 +338,8 @@ 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'); + // Webapp is a webpack resolve alias pointing to the output directory, see webpack config + const url = require('Webapp/i18n/languages.json'); request( { method: "GET", url }, (err, response, body) => {