From 111b1da00d3d45d0708ca33036d33a2502b3f6a6 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Tue, 11 Oct 2022 18:59:52 +0200 Subject: [PATCH 01/16] test jq to merge locale files --- docker/webapp.Dockerfile | 3 +++ tools/test/file1.json | 12 ++++++++++++ tools/test/file2.json | 11 +++++++++++ tools/test/result.json | 15 +++++++++++++++ 4 files changed, 41 insertions(+) create mode 100644 tools/test/file1.json create mode 100644 tools/test/file2.json create mode 100644 tools/test/result.json diff --git a/docker/webapp.Dockerfile b/docker/webapp.Dockerfile index 81748e08f..5c3f98f6e 100644 --- a/docker/webapp.Dockerfile +++ b/docker/webapp.Dockerfile @@ -15,6 +15,9 @@ COPY branding/constants/ constants/ COPY branding/locales/ locales/ COPY branding/assets/styles/imports/ assets/styles/imports/ +## Something like (bash, jq must be installed) +# for locale in `ls locales/*.json`; do jq -s '.[0] * .[1]' source/$locale $locale; done; + ################################################################################## # BUILD ########################################################################## ################################################################################## diff --git a/tools/test/file1.json b/tools/test/file1.json new file mode 100644 index 000000000..19ec4e19e --- /dev/null +++ b/tools/test/file1.json @@ -0,0 +1,12 @@ +{ + "a-key": "A", + "b-key": { + "a-subkey": "A", + "b-subkey": "B", + "c-subkey": { + "a-subsubkey": "A", + "b-subsubkey": "B" + } + }, + "c-key": "C" +} diff --git a/tools/test/file2.json b/tools/test/file2.json new file mode 100644 index 000000000..e4d7ade81 --- /dev/null +++ b/tools/test/file2.json @@ -0,0 +1,11 @@ +{ + "a-key": "AA", + "b-key": { + "b-subkey": "BB", + "c-subkey": { + "b-subsubkey": "BB", + "c-subsubkey": "C" + } + }, + "d-key": "D" +} diff --git a/tools/test/result.json b/tools/test/result.json new file mode 100644 index 000000000..843c23538 --- /dev/null +++ b/tools/test/result.json @@ -0,0 +1,15 @@ +{ + "a-key": "AA", + "b-key": { + "a-subkey": "A", + "b-subkey": "BB", + "c-subkey": { + "a-subsubkey": "A", + "b-subsubkey": "BB", + "c-subsubkey": "C" + } + }, + "c-key": "C", + "d-key": "D" +} + From 9045ac3199545789ffd47ece6f5997371b0ebe0f Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Wed, 12 Oct 2022 15:33:07 +0200 Subject: [PATCH 02/16] add script to merge variables --- branding/locales/de.json | 3 +++ docker/webapp.Dockerfile | 8 +++++++- tools/merge-locales.sh | 10 ++++++++++ 3 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 branding/locales/de.json create mode 100755 tools/merge-locales.sh diff --git a/branding/locales/de.json b/branding/locales/de.json new file mode 100644 index 000000000..7fa1f1b48 --- /dev/null +++ b/branding/locales/de.json @@ -0,0 +1,3 @@ +{ + "new-key": "This is a new key" +} diff --git a/docker/webapp.Dockerfile b/docker/webapp.Dockerfile index 5c3f98f6e..104b48429 100644 --- a/docker/webapp.Dockerfile +++ b/docker/webapp.Dockerfile @@ -12,9 +12,15 @@ FROM $APP_IMAGE_CODE as code # copy public constants into the Docker image to brand it 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 + ## Something like (bash, jq must be installed) # for locale in `ls locales/*.json`; do jq -s '.[0] * .[1]' source/$locale $locale; done; diff --git a/tools/merge-locales.sh b/tools/merge-locales.sh new file mode 100755 index 000000000..8fc5c75d2 --- /dev/null +++ b/tools/merge-locales.sh @@ -0,0 +1,10 @@ +#!/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; From ebf8894ca25b5dfeec032390ea42fc5c961891b4 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Wed, 12 Oct 2022 15:58:28 +0200 Subject: [PATCH 03/16] remove tmp folder, test for override of existing locales --- branding/locales/de.json | 5 +++++ docker/webapp.Dockerfile | 4 +--- tools/merge-locales.sh | 4 +++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/branding/locales/de.json b/branding/locales/de.json index 7fa1f1b48..8f42e8998 100644 --- a/branding/locales/de.json +++ b/branding/locales/de.json @@ -1,3 +1,8 @@ { +"user": { + "avatar": { + "submitted": "XXXXXXX" + } + }, "new-key": "This is a new key" } diff --git a/docker/webapp.Dockerfile b/docker/webapp.Dockerfile index 104b48429..ba7cbffb0 100644 --- a/docker/webapp.Dockerfile +++ b/docker/webapp.Dockerfile @@ -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 ########################################################################## ################################################################################## diff --git a/tools/merge-locales.sh b/tools/merge-locales.sh index 8fc5c75d2..21d263265 100755 --- a/tools/merge-locales.sh +++ b/tools/merge-locales.sh @@ -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/ From a1ce8049957bfb4388a12f3cec64e1309ed6d15a Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Wed, 12 Oct 2022 16:29:20 +0200 Subject: [PATCH 04/16] clean up --- branding/locales/de.json | 8 -------- tools/test/file1.json | 12 ------------ tools/test/file2.json | 11 ----------- tools/test/result.json | 15 --------------- 4 files changed, 46 deletions(-) delete mode 100644 branding/locales/de.json delete mode 100644 tools/test/file1.json delete mode 100644 tools/test/file2.json delete mode 100644 tools/test/result.json diff --git a/branding/locales/de.json b/branding/locales/de.json deleted file mode 100644 index 8f42e8998..000000000 --- a/branding/locales/de.json +++ /dev/null @@ -1,8 +0,0 @@ -{ -"user": { - "avatar": { - "submitted": "XXXXXXX" - } - }, - "new-key": "This is a new key" -} diff --git a/tools/test/file1.json b/tools/test/file1.json deleted file mode 100644 index 19ec4e19e..000000000 --- a/tools/test/file1.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "a-key": "A", - "b-key": { - "a-subkey": "A", - "b-subkey": "B", - "c-subkey": { - "a-subsubkey": "A", - "b-subsubkey": "B" - } - }, - "c-key": "C" -} diff --git a/tools/test/file2.json b/tools/test/file2.json deleted file mode 100644 index e4d7ade81..000000000 --- a/tools/test/file2.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "a-key": "AA", - "b-key": { - "b-subkey": "BB", - "c-subkey": { - "b-subsubkey": "BB", - "c-subsubkey": "C" - } - }, - "d-key": "D" -} diff --git a/tools/test/result.json b/tools/test/result.json deleted file mode 100644 index 843c23538..000000000 --- a/tools/test/result.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "a-key": "AA", - "b-key": { - "a-subkey": "A", - "b-subkey": "BB", - "c-subkey": { - "a-subsubkey": "A", - "b-subsubkey": "BB", - "c-subsubkey": "C" - } - }, - "c-key": "C", - "d-key": "D" -} - From be603a5af237d031693e8429f4c0499af7c4fdd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Thu, 13 Oct 2022 15:11:42 +0200 Subject: [PATCH 05/16] =?UTF-8?q?Set=20this=20branch=20as=20publishing=20b?= =?UTF-8?q?ranch=20for=20testing=20purposes=20=E2=80=93=20revert=20later?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 2743a25df..7ad535dc6 100644 --- a/.github/workflows/publish.yml +++ b/.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: ############################################################################## From 0cf00fdc078514d173563b92249e91c8f49da975 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Thu, 13 Oct 2022 15:13:34 +0200 Subject: [PATCH 06/16] Fix copy error by adding two empty JSON files to the locales --- branding/locales/de.json | 2 ++ branding/locales/en.json | 2 ++ 2 files changed, 4 insertions(+) create mode 100644 branding/locales/de.json create mode 100644 branding/locales/en.json diff --git a/branding/locales/de.json b/branding/locales/de.json new file mode 100644 index 000000000..2c63c0851 --- /dev/null +++ b/branding/locales/de.json @@ -0,0 +1,2 @@ +{ +} diff --git a/branding/locales/en.json b/branding/locales/en.json new file mode 100644 index 000000000..2c63c0851 --- /dev/null +++ b/branding/locales/en.json @@ -0,0 +1,2 @@ +{ +} From 4479fb4cbc7aeec86f5b451353635a221f49e6f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Thu, 13 Oct 2022 16:55:39 +0200 Subject: [PATCH 07/16] Revert the publish branch --- .github/workflows/publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 7ad535dc6..5cbdf9004 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -4,7 +4,7 @@ on: push: branches: - master - - 79-fix-implementation-of-overwriting-locales # for testing while developing + # - 79-fix-implementation-of-overwriting-locales # for testing while developing jobs: ############################################################################## From 323826ca20f84ae34cbe555a6d13c7a6a1132686 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Sat, 15 Oct 2022 15:04:28 +0200 Subject: [PATCH 08/16] Add '/dns.values*-ME.yaml' to .gitignore --- deployment/kubernetes/.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/deployment/kubernetes/.gitignore b/deployment/kubernetes/.gitignore index 092cda60e..3bcb187b9 100644 --- a/deployment/kubernetes/.gitignore +++ b/deployment/kubernetes/.gitignore @@ -1,4 +1,5 @@ /dns.values.yaml +/dns.values*-ME.yaml /nginx.values.yaml /values.yaml /values*-ME.yaml \ No newline at end of file From 0794115b3fdb4e1b7d86631692af62705bd98179 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Sat, 15 Oct 2022 15:57:36 +0200 Subject: [PATCH 09/16] Release v1.1.2-XXX - configurable header menu is translatable --- branding/constants/headerMenu.js | 6 +++--- branding/locales/de.json | 4 ++++ branding/locales/en.json | 4 ++++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/branding/constants/headerMenu.js b/branding/constants/headerMenu.js index c95e79122..8f0293485 100644 --- a/branding/constants/headerMenu.js +++ b/branding/constants/headerMenu.js @@ -1,11 +1,11 @@ export default { MENU: [ { - name: 'Beiträge', - path: '/#', + nameIdent: 'ocelotRebranding.newsFeed', + path: '/', }, { - name: 'Über Yunite', + nameIdent: 'ocelotRebranding.about', url: 'https://yunite.org', }, ], diff --git a/branding/locales/de.json b/branding/locales/de.json index 2c63c0851..0fac27985 100644 --- a/branding/locales/de.json +++ b/branding/locales/de.json @@ -1,2 +1,6 @@ { + "yuniteRebranding": { + "newsFeed": "Beiträge", + "about": "Über Yunite" + } } diff --git a/branding/locales/en.json b/branding/locales/en.json index 2c63c0851..11a82212c 100644 --- a/branding/locales/en.json +++ b/branding/locales/en.json @@ -1,2 +1,6 @@ { + "yuniteRebranding": { + "newsFeed": "News Feed", + "about": "About Yunite" + } } From 4dca4269cb6b21373d69423870b9afe2db99647b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Sat, 22 Oct 2022 20:04:52 +0200 Subject: [PATCH 10/16] Change and correct readme's --- README.md | 2 +- TODO-next-update.md | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 9b70d3a8c..e6fd53546 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ __Try out our deployed [development environment](https://stage.ocelot.social).__ Visit our staging networks: -- central staging network: [stage.ocelot.social](https://stage.ocelot.social). +- central staging network: [stage.ocelot.social](https://stage.ocelot.social) Logins: diff --git a/TODO-next-update.md b/TODO-next-update.md index 4cf3c8d10..bc1207f20 100644 --- a/TODO-next-update.md +++ b/TODO-next-update.md @@ -2,9 +2,19 @@ When you overtake this deploy and rebrand repo to your network you have to recognize the following changes and doings … +## This Latest Version >= 2.0.0 with 'ocelotDockerVersionTag' 2.0.0-XXX + +### Main Code PR – feat: 🍰 Implement LOGO_HEADER_CLICK As Configuration #5525 + +- You have to set `LOGO_HEADER_CLICK` in `branding/constants/logos.js` originally in main code file `webapp/constants/logos.js` to your prevered value. + +### Main Code Issue – 🌟 [EPIC] Release v2.0.0 – Beta Test → Final #5547 + +- You have to set `SHOW_GROUP_BUTTON_IN_HEADER` in `branding/constants/groups.js` originally in main code file `webapp/constants/groups.js` to your prevered value. + ## This Latest Version >= 1.1.0 with 'ocelotDockerVersionTag' 1.1.0-205 -### Deployment/Rebranding PR – chore: 🍰 Release v1.1.0 - Implement Categories Again #63 +### Deployment/Rebranding PR – chore: 🍰 Release v1.1.0 - Implement Categories Again #63 - You have to add the `CATEGORIES_ACTIVE` from the `deployment/kubernetes/values.template.yaml` to your `deployment/kubernetes/values.yaml` and set it to your prevered value. - Make sure the correct categories are in your Neo4j database on the server. From b0ff413d8351f40def20ce737f3b4d72a92393b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Sat, 22 Oct 2022 20:05:29 +0200 Subject: [PATCH 11/16] Adjust and add constants files --- branding/constants/groups.js | 5 +++++ branding/constants/headerMenu.js | 8 ++++---- branding/constants/logos.js | 9 +++++++++ 3 files changed, 18 insertions(+), 4 deletions(-) create mode 100644 branding/constants/groups.js diff --git a/branding/constants/groups.js b/branding/constants/groups.js new file mode 100644 index 000000000..1c49d3ff3 --- /dev/null +++ b/branding/constants/groups.js @@ -0,0 +1,5 @@ +// this file is duplicated in `backend/src/constants/group.js` and `webapp/constants/group.js` +export const NAME_LENGTH_MIN = 3 +export const NAME_LENGTH_MAX = 50 +export const DESCRIPTION_WITHOUT_HTML_LENGTH_MIN = 100 // with removed HTML tags +export const SHOW_GROUP_BUTTON_IN_HEADER = true diff --git a/branding/constants/headerMenu.js b/branding/constants/headerMenu.js index 33cba8d5c..6d0a0afad 100644 --- a/branding/constants/headerMenu.js +++ b/branding/constants/headerMenu.js @@ -1,12 +1,12 @@ export default { MENU: [ // { - // name: 'Beiträge', - // path: '/#', + // nameIdent: 'nameIdent', + // path: '/', // }, // { - // name: 'Über Yunite', - // url: 'https://yunite.org', + // nameIdent: 'nameIdent', + // url: 'https://ocelot.social', // }, ], } diff --git a/branding/constants/logos.js b/branding/constants/logos.js index 2bea199da..136918762 100644 --- a/branding/constants/logos.js +++ b/branding/constants/logos.js @@ -3,6 +3,15 @@ export default { LOGO_HEADER_PATH: '/img/custom/logo-horizontal.svg', LOGO_HEADER_WIDTH: '130px', + LOGO_HEADER_CLICK: { + externalLink: null, + internalPath: { + to: { + name: 'index', + }, + scrollTo: '.main-navigation', + }, + }, LOGO_SIGNUP_PATH: '/img/custom/logo-squared.svg', LOGO_WELCOME_PATH: '/img/custom/logo-squared.svg', LOGO_LOGOUT_PATH: '/img/custom/logo-squared.svg', From 94921627125399482d8fd46d07f6d977c24998b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Sat, 22 Oct 2022 20:14:51 +0200 Subject: [PATCH 12/16] Set footer --- branding/constants/links.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/branding/constants/links.js b/branding/constants/links.js index 7e89159eb..ecde14ebb 100644 --- a/branding/constants/links.js +++ b/branding/constants/links.js @@ -126,9 +126,9 @@ export default { FOOTER_LINK_LIST: [ ORGANIZATION, // TERMS_AND_CONDITIONS, - CODE_OF_CONDUCT, + // CODE_OF_CONDUCT, DATA_PRIVACY, - FAQ, + // FAQ, // DONATE, // SUPPORT, IMPRINT, From 7ec3ee09dfecad761f93af6adeeedc00295bff4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Sat, 22 Oct 2022 20:26:31 +0200 Subject: [PATCH 13/16] Adjust merge of groups branch by fixing header menu lacales idents --- branding/constants/headerMenu.js | 6 +++--- branding/locales/de.json | 5 +++-- branding/locales/en.json | 5 +++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/branding/constants/headerMenu.js b/branding/constants/headerMenu.js index 37c46e202..eea94e14b 100644 --- a/branding/constants/headerMenu.js +++ b/branding/constants/headerMenu.js @@ -1,15 +1,15 @@ export default { MENU: [ { - nameIdent: 'ocelotRebranding.newsFeed', + nameIdent: 'yuniteRebranding.newsFeed', path: '/', }, { - nameIdent: 'ocelotRebranding.myGroups', + nameIdent: 'yuniteRebranding.myGroups', path: '/my-groups', }, { - nameIdent: 'ocelotRebranding.about', + nameIdent: 'yuniteRebranding.about', url: 'https://yunite.org', }, ], diff --git a/branding/locales/de.json b/branding/locales/de.json index 0fac27985..6237e4428 100644 --- a/branding/locales/de.json +++ b/branding/locales/de.json @@ -1,6 +1,7 @@ { "yuniteRebranding": { - "newsFeed": "Beiträge", - "about": "Über Yunite" + "about": "Über Yunite", + "myGroups": "Gruppen", + "newsFeed": "Beiträge" } } diff --git a/branding/locales/en.json b/branding/locales/en.json index 11a82212c..9b78f48b5 100644 --- a/branding/locales/en.json +++ b/branding/locales/en.json @@ -1,6 +1,7 @@ { "yuniteRebranding": { - "newsFeed": "News Feed", - "about": "About Yunite" + "about": "About Yunite", + "myGroups": "Groups", + "newsFeed": "News Feed" } } From c13b2859925d7ee161efff22a17be5f24cc05efe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Sat, 22 Oct 2022 20:31:32 +0200 Subject: [PATCH 14/16] Add header menu item 'Topic' --- branding/constants/headerMenu.js | 4 ++++ branding/locales/de.json | 3 ++- branding/locales/en.json | 3 ++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/branding/constants/headerMenu.js b/branding/constants/headerMenu.js index eea94e14b..0f7a06f6a 100644 --- a/branding/constants/headerMenu.js +++ b/branding/constants/headerMenu.js @@ -8,6 +8,10 @@ export default { nameIdent: 'yuniteRebranding.myGroups', path: '/my-groups', }, + { + nameIdent: 'yuniteRebranding.topics', + url: 'https://yunite.org/themen/', + }, { nameIdent: 'yuniteRebranding.about', url: 'https://yunite.org', diff --git a/branding/locales/de.json b/branding/locales/de.json index 6237e4428..374b7a4d1 100644 --- a/branding/locales/de.json +++ b/branding/locales/de.json @@ -2,6 +2,7 @@ "yuniteRebranding": { "about": "Über Yunite", "myGroups": "Gruppen", - "newsFeed": "Beiträge" + "newsFeed": "Beiträge", + "topics": "Themen" } } diff --git a/branding/locales/en.json b/branding/locales/en.json index 9b78f48b5..2ac41ce62 100644 --- a/branding/locales/en.json +++ b/branding/locales/en.json @@ -2,6 +2,7 @@ "yuniteRebranding": { "about": "About Yunite", "myGroups": "Groups", - "newsFeed": "News Feed" + "newsFeed": "News Feed", + "topics": "Topics" } } From ea51f73b64995d49b6ee0cadec45b60ce2f4cf00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Sat, 22 Oct 2022 20:46:38 +0200 Subject: [PATCH 15/16] Adjust the footer --- branding/constants/headerMenu.js | 8 ++++---- branding/constants/links.js | 8 ++++---- branding/locales/de.json | 14 ++++++++++---- branding/locales/en.json | 14 ++++++++++---- 4 files changed, 28 insertions(+), 16 deletions(-) diff --git a/branding/constants/headerMenu.js b/branding/constants/headerMenu.js index 0f7a06f6a..48f9fd29f 100644 --- a/branding/constants/headerMenu.js +++ b/branding/constants/headerMenu.js @@ -1,19 +1,19 @@ export default { MENU: [ { - nameIdent: 'yuniteRebranding.newsFeed', + nameIdent: 'yuniteRebranding.header.newsFeed', path: '/', }, { - nameIdent: 'yuniteRebranding.myGroups', + nameIdent: 'yuniteRebranding.header.myGroups', path: '/my-groups', }, { - nameIdent: 'yuniteRebranding.topics', + nameIdent: 'yuniteRebranding.header.topics', url: 'https://yunite.org/themen/', }, { - nameIdent: 'yuniteRebranding.about', + nameIdent: 'yuniteRebranding.header.about', url: 'https://yunite.org', }, ], diff --git a/branding/constants/links.js b/branding/constants/links.js index ecde14ebb..aa9e3a129 100644 --- a/branding/constants/links.js +++ b/branding/constants/links.js @@ -17,7 +17,7 @@ const ORGANIZATION = defaultPageParamsPages.ORGANIZATION.overwrite({ }) const DONATE = defaultPageParamsPages.DONATE.overwrite({ // we use 'ocelot-social.herokuapp.com' at the moment, because redirections of 'ocelot.social' subpages are not working correctly - externalLink: 'https://yunite.org/brand-guidelines/', // if string is defined and not empty it's dominating + externalLink: 'https://yunite.org/spenden/', // if string is defined and not empty it's dominating internalPage: { // footerIdent: 'site.donate', // localized string identifier, if undefined default is used @@ -34,7 +34,7 @@ const IMPRINT = defaultPageParamsPages.IMPRINT.overwrite({ externalLink: 'https://yunite.org/impressum/', // if string is defined and not empty it's dominating internalPage: { - // footerIdent: 'site.imprint', // localized string identifier, if undefined default is used + footerIdent: 'yuniteRebranding.footer.imprint', // localized string identifier, if undefined default is used // headTitleIdent: 'site.imprint', // localized string identifier, if undefined default is used // headlineIdent: 'site.imprint', // localized string identifier, on null it's hidden, if undefined default is used hasContainer: true, @@ -73,7 +73,7 @@ const DATA_PRIVACY = defaultPageParamsPages.DATA_PRIVACY.overwrite({ externalLink: 'https://yunite.org/datenschutz/', // if string is defined and not empty it's dominating internalPage: { - // footerIdent: 'site.data-privacy', // localized string identifier, if undefined default is used + footerIdent: 'yuniteRebranding.footer.dataPrivacy', // localized string identifier, if undefined default is used // headTitleIdent: 'site.data-privacy', // localized string identifier, if undefined default is used // headlineIdent: 'site.data-privacy', // localized string identifier, on null it's hidden, if undefined default is used hasContainer: true, @@ -124,7 +124,7 @@ export default { SUPPORT, FOOTER_LINK_LIST: [ - ORGANIZATION, + // ORGANIZATION, // TERMS_AND_CONDITIONS, // CODE_OF_CONDUCT, DATA_PRIVACY, diff --git a/branding/locales/de.json b/branding/locales/de.json index 374b7a4d1..c27e5af24 100644 --- a/branding/locales/de.json +++ b/branding/locales/de.json @@ -1,8 +1,14 @@ { "yuniteRebranding": { - "about": "Über Yunite", - "myGroups": "Gruppen", - "newsFeed": "Beiträge", - "topics": "Themen" + "header": { + "about": "Über Yunite", + "myGroups": "Gruppen", + "newsFeed": "Beiträge", + "topics": "Themen" + }, + "footer": { + "dataPrivacy": "Datenschutz", + "imprint": "Impressum" + } } } diff --git a/branding/locales/en.json b/branding/locales/en.json index 2ac41ce62..93609ee38 100644 --- a/branding/locales/en.json +++ b/branding/locales/en.json @@ -1,8 +1,14 @@ { "yuniteRebranding": { - "about": "About Yunite", - "myGroups": "Groups", - "newsFeed": "News Feed", - "topics": "Topics" + "header": { + "about": "About Yunite", + "myGroups": "Groups", + "newsFeed": "News Feed", + "topics": "Topics" + }, + "footer": { + "dataPrivacy": "Data privacy", + "imprint": "Imprint" + } } } From 2b87fb2df509131a193e84566175846145cef051 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Sun, 23 Oct 2022 15:16:25 +0200 Subject: [PATCH 16/16] Release v2.0.0-250 --- TODO-next-update.md | 2 +- package.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/TODO-next-update.md b/TODO-next-update.md index bc1207f20..ff808fdb9 100644 --- a/TODO-next-update.md +++ b/TODO-next-update.md @@ -2,7 +2,7 @@ When you overtake this deploy and rebrand repo to your network you have to recognize the following changes and doings … -## This Latest Version >= 2.0.0 with 'ocelotDockerVersionTag' 2.0.0-XXX +## This Latest Version >= 2.0.0 with 'ocelotDockerVersionTag' 2.0.0-250 ### Main Code PR – feat: 🍰 Implement LOGO_HEADER_CLICK As Configuration #5525 diff --git a/package.json b/package.json index 61afb1f1b..af6b6dfab 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "ocelot-social-branded", - "version": "1.1.1", - "ocelotDockerVersionTag": "1.1.1-228", + "version": "2.0.0", + "ocelotDockerVersionTag": "2.0.0-250", "dockerOrganisation": "ocelotsocialnetwork", "description": "ocelot.social Branded", "author": "ocelot.social Community",