From ea51f73b64995d49b6ee0cadec45b60ce2f4cf00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Sat, 22 Oct 2022 20:46:38 +0200
Subject: [PATCH] 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"
+    }
   }
 }