Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding

.github/workflows/publish.yml

@@ -4,7 +4,7 @@ on:
   push:
     branches:
       - master
-      # - 55-implement-PRODUCTION_DB_CLEAN_ALLOW-for-staging-production-evironments # for testing while developing
+      # - 79-fix-implementation-of-overwriting-locales # for testing while developing
 
 jobs:
   ##############################################################################

branding/locales/de.json

@@ -0,0 +1,2 @@
+{
+}

branding/locales/en.json

@@ -0,0 +1,2 @@
+{
+}

docker/webapp.Dockerfile

@@ -10,11 +10,18 @@ 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/ locales/
+COPY branding/locales/html/ locales/html/
+# COPY branding/locales/index.js locales/index.js
+COPY branding/locales/*.json locales/tmp/
 COPY branding/assets/styles/imports/ assets/styles/imports/
 
+RUN apk add --no-cache bash jq
+
+RUN tools/merge-locales.sh
+
 ##################################################################################
 # BUILD ##########################################################################
 ##################################################################################

tools/merge-locales.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+for locale in `ls locales/*.json`;
+do
+    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/