IT4Change/wir.social
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 7 Wiki Activity

remove tmp folder, test for override of existing locales

Browse Source
This commit is contained in:
Moriz Wahl 2022-10-12 15:58:28 +02:00
parent 9045ac3199
commit ebf8894ca2
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
branding/locales/de.json
View File

@ -1,3 +1,8 @@
{
"user": {
"avatar": {
"submitted": "XXXXXXX"
}
},
"new-key": "This is a new key"
}

4
docker/webapp.Dockerfile
View File

@ -10,6 +10,7 @@ ARG APP_IMAGE_CODE=${APP_IMAGE}:${APP_IMAGE_TAG_CODE}
FROM $APP_IMAGE_CODE as code
# copy public constants into the Docker image to brand it
COPY tools/ tools/
COPY branding/static/ static/
COPY branding/constants/ constants/
COPY branding/locales/html/ locales/html/
@ -21,9 +22,6 @@ RUN apk add --no-cache bash jq
RUN tools/merge-locales.sh
## Something like (bash, jq must be installed)
# for locale in `ls locales/*.json`; do jq -s '.[0] * .[1]' source/$locale $locale; done;
##################################################################################
# BUILD ##########################################################################
##################################################################################

4
tools/merge-locales.sh
View File

@ -2,9 +2,11 @@
for locale in `ls locales/*.json`;
do
file = basename $locale;
file=$(basename $locale);
if [ -f locales/tmp/$file ]; then
jq -s '.[0] * .[1]' $locale locales/tmp/$file > locales/tmp/tmp.json;
mv locales/tmp/tmp.json $locale;
fi;
done;
rm -r locales/tmp/