Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Framasoft
PeerTube
PeerTube
Commits
d73c9888
Verified
Commit
d73c9888
authored
Jul 25, 2018
by
Chocobozzz
Browse files
Hack 459 regarding Angular & i18n
parent
a8bf1d82
Changes
2
Hide whitespace changes
Inline
Side-by-side
scripts/build/client.sh
View file @
d73c9888
...
...
@@ -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
...
...
server/controllers/client.ts
View file @
d73c9888
...
...
@@ -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
)
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment