Merge branch 'dev'

naturalsolutions · Oct 11, 2021 · e4d38ff · e4d38ff
2 parents 124c4a7 + 53b77ef
commit e4d38ff
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/.env.example b/.env.example
@@ -48,6 +48,7 @@ NS_ECOTEKA_FRONTEND_TOKEN_STORAGE={{ ns_ecoteka_frontend_token_storage | default
 NS_ECOTEKA_FRONTEND_REFRESH_TOKEN_STORAGE={{ ns_ecoteka_frontend_refresh_token_storage | default('ecoteka_refresh_token') }}
 NS_ECOTEKA_FRONTEND_MAPILLARY_API_CLIENT={{ ns_ecoteka_frontend_mapillary_api_client | default('dDloQllJZFNKNkQ1b1FMZ0ZFNjE3WjozYzk0OTRjM2ZhZjk5ZmUx') }}
 NS_ECOTEKA_FRONTEND_GOOGLE_ANALYTICS={{ ns_ecoteka_frontend_google_analytics | default('G-Z0FYXJ7LPW') }}
+NS_ECOTEKA_FRONTEND_COOKIE_CONSENT={{ ns_ecoteka_frontend_cookie_consent | default('etk_cookie_consent') }}
 
 # BACKEND
 NS_ECOTEKA_BACKEND_BASE_PATH={{ ns_ecoteka_backend_base_path | default('/api/v1') }}

diff --git a/frontend/public/locales/en/components.json b/frontend/public/locales/en/components.json
@@ -795,12 +795,12 @@
   },
   "LayoutFooter": {
     "caption": "get into this?",
+    "newsletterButton": "Subscribe to the newsletter",
     "contact": "Contact us!",
     "titleColumn": {
       "ns": "Learn more about Natural Solutions",
       "ecoteka": "Learn more about ecoTeka",
       "newsletter": "Follow the news on the urban ecosystems",
-      "newsletterButton": "Subscribe to the newsletter"
     },
     "links": {
       "community": {
@@ -880,4 +880,4 @@
     "declineButtonText": "I decline",
     "modalText": "This website uses cookies to provide a better service."
   }
-}
+}
diff --git a/frontend/public/locales/es/components.json b/frontend/public/locales/es/components.json
@@ -789,12 +789,12 @@
   },
   "LayoutFooter": {
     "caption": "¿Estás en esto?",
+    "newsletterButton": "Recibe nuestra newsletter",
     "contact": "Contáctanos",
     "titleColumn": {
       "ns": "Saber más sobre Natural Solutions",
       "ecoteka": "Saber más sobre ecoTeka",
       "newsletter": "Seguir la actualidad sobre los ecosistemas urbano",
-      "newsletterButton": "Recibe nuestro newsletter"
     },
     "links": {
       "community": {
@@ -871,4 +871,4 @@
     "declineButtonText": "No acepto",
     "modalText": "Este sitio web utiliza cookies para brindar un mejor experiencia de usuario."
   }
-}
+}
diff --git a/frontend/public/locales/fr/components.json b/frontend/public/locales/fr/components.json
@@ -788,12 +788,12 @@
   },
   "LayoutFooter": {
     "caption": "On en parle",
+    "newsletterButton": "S'inscrire à la newsletter",
     "contact": "Contactez nous !",
     "titleColumn": {
       "ns": "En savoir plus sur Natural Solutions",
       "ecoteka": "En savoir plus sur ecoTeka",
       "newsletter": "Suivre l'actualité sur les écosystèmes urbains",
-      "newsletterButton": "S'inscrire à la newsletter"
     },
     "links": {
       "community": {
@@ -870,4 +870,4 @@
     "declineButtonText": "Je refuse",
     "modalText": "Ce site utilise des cookies pour fournir un meilleur service."
   }
-}
+}