From d73c98884ec7f970ed95a01fb2d445d10c53c817 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 25 Jul 2018 09:57:52 +0200 Subject: [PATCH] Hack 459 regarding Angular & i18n --- scripts/build/client.sh | 24 ++++++++++++++++++++++++ server/controllers/client.ts | 2 +- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/scripts/build/client.sh b/scripts/build/client.sh index e4d053e82..567a6e5e0 100755 --- a/scripts/build/client.sh +++ b/scripts/build/client.sh @@ -2,25 +2,49 @@ set -eu +pre_build_hook () { + mkdir "./src/locale/pending_target/" > /dev/null || true + mv ./src/locale/target/angular_*.xml "./src/locale/pending_target" + + if [ ! -z ${1+x} ]; then + mv "./src/locale/pending_target/angular_$1.xml" "./src/locale/target" + fi +} + +post_build_hook () { + mv ./src/locale/pending_target/* "./src/locale/target/" + rmdir "./src/locale/pending_target/" +} + cd client rm -rf ./dist ./compiled +pre_build_hook + defaultLanguage="en_US" npm run ng build -- --output-path "dist/$defaultLanguage/" --deploy-url "/client/$defaultLanguage/" --prod --stats-json mv "./dist/$defaultLanguage/assets" "./dist" +post_build_hook + # Don't build other languages if --light arg is provided if [ -z ${1+x} ] || [ "$1" != "--light" ]; then # Supported languages languages=("fr_FR" "eu_ES" "ca_ES" "cs_CZ" "eo") for lang in "${languages[@]}"; do + # TODO: remove when the project will use runtime translations + pre_build_hook "$lang" + npm run ng build -- --prod --i18n-file "./src/locale/target/angular_$lang.xml" --i18n-format xlf --i18n-locale "$lang" \ --output-path "dist/$lang/" --deploy-url "/client/$lang/" # Do no duplicate assets rm -r "./dist/$lang/assets" + + # TODO: remove when the project will use runtime translations + post_build_hook done fi diff --git a/server/controllers/client.ts b/server/controllers/client.ts index bbb518c1b..c33061289 100644 --- a/server/controllers/client.ts +++ b/server/controllers/client.ts @@ -89,7 +89,7 @@ export { // --------------------------------------------------------------------------- async function generateHTMLPage (req: express.Request, res: express.Response, paramLang?: string) { - const html = await ClientHtml.getIndexHTML(req, res) + const html = await ClientHtml.getIndexHTML(req, res, paramLang) return sendHTML(html, res) }