From 7b09df848ba8c7706cd13a58e87149106151d497 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 3 Jun 2021 07:36:55 +0200
Subject: [PATCH 1/3] Extend and change links

---
 branding/constants/links.js | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/branding/constants/links.js b/branding/constants/links.js
index 070ffa1..1f551d2 100644
--- a/branding/constants/links.js
+++ b/branding/constants/links.js
@@ -1,7 +1,12 @@
 export default {
   ORGANIZATION: 'https://ocelot.social',
-  DONATE: 'https://ocelot-social.herokuapp.com/donations',
-  IMPRINT: 'https://ocelot-social.herokuapp.com/imprint',
-  DATA_PRIVACY: 'https://ocelot-social.herokuapp.com/imprint',
-  FAQ: 'https://ocelot-social.herokuapp.com/#kontakt',
+  SUPPORT: 'https://ocelot.social',
+
+  // on null or empty string internal imprint is used, see 'webapp/locales/html/'
+  DONATE: 'https://ocelot-social.herokuapp.com/donations', // we use 'ocelot-social.herokuapp.com' at the moment, because redirections of 'ocelot.social' subpages are not working correctly
+  IMPRINT: 'https://ocelot-social.herokuapp.com/imprint', // we use 'ocelot-social.herokuapp.com' at the moment, because redirections of 'ocelot.social' subpages are not working correctly
+  TERMS_AND_CONDITIONS: null,
+  CODE_OF_CONDUCT: null,
+  DATA_PRIVACY: null,
+  FAQ: 'https://ocelot.social',
 }

From bd0a70ad542350dfc8b6ce50635dccce094256c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 3 Jun 2021 17:24:02 +0200
Subject: [PATCH 2/3] Add locales to branding, especial translated html files

---
 branding/locales/html/de/code-of-conduct.html      | 3 +++
 branding/locales/html/de/data-privacy.html         | 3 +++
 branding/locales/html/de/faq.html                  | 3 +++
 branding/locales/html/de/imprint.html              | 3 +++
 branding/locales/html/de/terms-and-conditions.html | 3 +++
 branding/locales/html/en/code-of-conduct.html      | 3 +++
 branding/locales/html/en/data-privacy.html         | 3 +++
 branding/locales/html/en/faq.html                  | 3 +++
 branding/locales/html/en/imprint.html              | 3 +++
 branding/locales/html/en/terms-and-conditions.html | 3 +++
 docker/maintenance.Dockerfile                      | 1 +
 docker/webapp.Dockerfile                           | 1 +
 12 files changed, 32 insertions(+)
 create mode 100644 branding/locales/html/de/code-of-conduct.html
 create mode 100644 branding/locales/html/de/data-privacy.html
 create mode 100644 branding/locales/html/de/faq.html
 create mode 100644 branding/locales/html/de/imprint.html
 create mode 100644 branding/locales/html/de/terms-and-conditions.html
 create mode 100644 branding/locales/html/en/code-of-conduct.html
 create mode 100644 branding/locales/html/en/data-privacy.html
 create mode 100644 branding/locales/html/en/faq.html
 create mode 100644 branding/locales/html/en/imprint.html
 create mode 100644 branding/locales/html/en/terms-and-conditions.html

diff --git a/branding/locales/html/de/code-of-conduct.html b/branding/locales/html/de/code-of-conduct.html
new file mode 100644
index 0000000..dda9c27
--- /dev/null
+++ b/branding/locales/html/de/code-of-conduct.html
@@ -0,0 +1,3 @@
+<!-- this file is replaced on rebranding -->
+
+<p>Ich bin der Inhalt vom Verhaltenskodex</p>
diff --git a/branding/locales/html/de/data-privacy.html b/branding/locales/html/de/data-privacy.html
new file mode 100644
index 0000000..3e1cc4d
--- /dev/null
+++ b/branding/locales/html/de/data-privacy.html
@@ -0,0 +1,3 @@
+<!-- this file is replaced on rebranding -->
+
+<p>Das hier wäre der Inhalt der Datenschutzbestimmungen</p>
diff --git a/branding/locales/html/de/faq.html b/branding/locales/html/de/faq.html
new file mode 100644
index 0000000..6b04c72
--- /dev/null
+++ b/branding/locales/html/de/faq.html
@@ -0,0 +1,3 @@
+<!-- this file is replaced on rebranding -->
+
+<p>Hier stehen die FAQs</p>
diff --git a/branding/locales/html/de/imprint.html b/branding/locales/html/de/imprint.html
new file mode 100644
index 0000000..4cd4eaf
--- /dev/null
+++ b/branding/locales/html/de/imprint.html
@@ -0,0 +1,3 @@
+<!-- this file is replaced on rebranding -->
+
+<p>Ich bin das Impressum</p>
diff --git a/branding/locales/html/de/terms-and-conditions.html b/branding/locales/html/de/terms-and-conditions.html
new file mode 100644
index 0000000..87bdaf6
--- /dev/null
+++ b/branding/locales/html/de/terms-and-conditions.html
@@ -0,0 +1,3 @@
+<!-- this file is replaced on rebranding -->
+
+<p>Ich bin der Inhalt der Seite "Nutzungsbedingungen"</p>
diff --git a/branding/locales/html/en/code-of-conduct.html b/branding/locales/html/en/code-of-conduct.html
new file mode 100644
index 0000000..b6d8ca5
--- /dev/null
+++ b/branding/locales/html/en/code-of-conduct.html
@@ -0,0 +1,3 @@
+<!-- this file is replaced on rebranding -->
+
+<p>I am the content of the code of conduct</p>
diff --git a/branding/locales/html/en/data-privacy.html b/branding/locales/html/en/data-privacy.html
new file mode 100644
index 0000000..5a6c5d8
--- /dev/null
+++ b/branding/locales/html/en/data-privacy.html
@@ -0,0 +1,3 @@
+<!-- this file is replaced on rebranding -->
+
+<p>This would be our data privacy section</p>
diff --git a/branding/locales/html/en/faq.html b/branding/locales/html/en/faq.html
new file mode 100644
index 0000000..c8a173b
--- /dev/null
+++ b/branding/locales/html/en/faq.html
@@ -0,0 +1,3 @@
+<!-- this file is replaced on rebranding -->
+
+<p>Here are the FAQs</p>
diff --git a/branding/locales/html/en/imprint.html b/branding/locales/html/en/imprint.html
new file mode 100644
index 0000000..03fa2f1
--- /dev/null
+++ b/branding/locales/html/en/imprint.html
@@ -0,0 +1,3 @@
+<!-- this file is replaced on rebranding -->
+
+<p>I am the imprint</p>
diff --git a/branding/locales/html/en/terms-and-conditions.html b/branding/locales/html/en/terms-and-conditions.html
new file mode 100644
index 0000000..a93ad66
--- /dev/null
+++ b/branding/locales/html/en/terms-and-conditions.html
@@ -0,0 +1,3 @@
+<!-- this file is replaced on rebranding -->
+
+<p>I am the content of the page "terms and conditions"<p>
diff --git a/docker/maintenance.Dockerfile b/docker/maintenance.Dockerfile
index 1da296d..f045c95 100644
--- a/docker/maintenance.Dockerfile
+++ b/docker/maintenance.Dockerfile
@@ -7,3 +7,4 @@ FROM $APP_IMAGE as branded
 # copy public constants into the Docker image to brand it
 COPY branding/static/ static/
 COPY branding/constants/ constants/
+COPY branding/locales/ locales/
diff --git a/docker/webapp.Dockerfile b/docker/webapp.Dockerfile
index 157072b..0f10432 100644
--- a/docker/webapp.Dockerfile
+++ b/docker/webapp.Dockerfile
@@ -7,3 +7,4 @@ FROM $APP_IMAGE as branded
 # copy public constants into the Docker image to brand it
 COPY branding/static/ static/
 COPY branding/constants/ constants/
+COPY branding/locales/ locales/

From 5240bc9e6748210ad320e9a4e93e16931a53d695 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 3 Jun 2021 19:03:22 +0200
Subject: [PATCH 3/3] Add text line to the rebranded translated html files

---
 branding/locales/html/de/code-of-conduct.html      | 2 ++
 branding/locales/html/de/data-privacy.html         | 2 ++
 branding/locales/html/de/faq.html                  | 2 ++
 branding/locales/html/de/imprint.html              | 2 ++
 branding/locales/html/de/terms-and-conditions.html | 2 ++
 branding/locales/html/en/code-of-conduct.html      | 2 ++
 branding/locales/html/en/data-privacy.html         | 2 ++
 branding/locales/html/en/faq.html                  | 2 ++
 branding/locales/html/en/imprint.html              | 2 ++
 branding/locales/html/en/terms-and-conditions.html | 2 ++
 10 files changed, 20 insertions(+)

diff --git a/branding/locales/html/de/code-of-conduct.html b/branding/locales/html/de/code-of-conduct.html
index dda9c27..8212ecf 100644
--- a/branding/locales/html/de/code-of-conduct.html
+++ b/branding/locales/html/de/code-of-conduct.html
@@ -1,3 +1,5 @@
 <!-- this file is replaced on rebranding -->
 
 <p>Ich bin der Inhalt vom Verhaltenskodex</p>
+
+Neu gebrandet …
diff --git a/branding/locales/html/de/data-privacy.html b/branding/locales/html/de/data-privacy.html
index 3e1cc4d..c09c72f 100644
--- a/branding/locales/html/de/data-privacy.html
+++ b/branding/locales/html/de/data-privacy.html
@@ -1,3 +1,5 @@
 <!-- this file is replaced on rebranding -->
 
 <p>Das hier wäre der Inhalt der Datenschutzbestimmungen</p>
+
+Neu gebrandet …
diff --git a/branding/locales/html/de/faq.html b/branding/locales/html/de/faq.html
index 6b04c72..457fbac 100644
--- a/branding/locales/html/de/faq.html
+++ b/branding/locales/html/de/faq.html
@@ -1,3 +1,5 @@
 <!-- this file is replaced on rebranding -->
 
 <p>Hier stehen die FAQs</p>
+
+Neu gebrandet …
diff --git a/branding/locales/html/de/imprint.html b/branding/locales/html/de/imprint.html
index 4cd4eaf..d9d0e23 100644
--- a/branding/locales/html/de/imprint.html
+++ b/branding/locales/html/de/imprint.html
@@ -1,3 +1,5 @@
 <!-- this file is replaced on rebranding -->
 
 <p>Ich bin das Impressum</p>
+
+Neu gebrandet …
diff --git a/branding/locales/html/de/terms-and-conditions.html b/branding/locales/html/de/terms-and-conditions.html
index 87bdaf6..30e3be3 100644
--- a/branding/locales/html/de/terms-and-conditions.html
+++ b/branding/locales/html/de/terms-and-conditions.html
@@ -1,3 +1,5 @@
 <!-- this file is replaced on rebranding -->
 
 <p>Ich bin der Inhalt der Seite "Nutzungsbedingungen"</p>
+
+Neu gebrandet …
diff --git a/branding/locales/html/en/code-of-conduct.html b/branding/locales/html/en/code-of-conduct.html
index b6d8ca5..7f78e27 100644
--- a/branding/locales/html/en/code-of-conduct.html
+++ b/branding/locales/html/en/code-of-conduct.html
@@ -1,3 +1,5 @@
 <!-- this file is replaced on rebranding -->
 
 <p>I am the content of the code of conduct</p>
+
+Rebranded …
diff --git a/branding/locales/html/en/data-privacy.html b/branding/locales/html/en/data-privacy.html
index 5a6c5d8..92b8918 100644
--- a/branding/locales/html/en/data-privacy.html
+++ b/branding/locales/html/en/data-privacy.html
@@ -1,3 +1,5 @@
 <!-- this file is replaced on rebranding -->
 
 <p>This would be our data privacy section</p>
+
+Rebranded …
diff --git a/branding/locales/html/en/faq.html b/branding/locales/html/en/faq.html
index c8a173b..63eed99 100644
--- a/branding/locales/html/en/faq.html
+++ b/branding/locales/html/en/faq.html
@@ -1,3 +1,5 @@
 <!-- this file is replaced on rebranding -->
 
 <p>Here are the FAQs</p>
+
+Rebranded …
diff --git a/branding/locales/html/en/imprint.html b/branding/locales/html/en/imprint.html
index 03fa2f1..6f50585 100644
--- a/branding/locales/html/en/imprint.html
+++ b/branding/locales/html/en/imprint.html
@@ -1,3 +1,5 @@
 <!-- this file is replaced on rebranding -->
 
 <p>I am the imprint</p>
+
+Rebranded …
diff --git a/branding/locales/html/en/terms-and-conditions.html b/branding/locales/html/en/terms-and-conditions.html
index a93ad66..8a135e3 100644
--- a/branding/locales/html/en/terms-and-conditions.html
+++ b/branding/locales/html/en/terms-and-conditions.html
@@ -1,3 +1,5 @@
 <!-- this file is replaced on rebranding -->
 
 <p>I am the content of the page "terms and conditions"<p>
+
+Rebranded …