From 502c59049b219cc2b12655198b4a0383ca725bbf Mon Sep 17 00:00:00 2001
From: vjrj <vjrj@ourproject.org>
Date: Tue, 23 Jan 2018 00:14:11 +0100
Subject: [PATCH] Improvements in footer

---
 imports/ui/components/Footer/Footer.js   | 15 +++++++++++++--
 imports/ui/components/Footer/Footer.scss |  4 +++-
 public/locales/en/common.json            |  8 ++------
 public/locales/es/common.json            |  4 +---
 4 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/imports/ui/components/Footer/Footer.js b/imports/ui/components/Footer/Footer.js
index cf20267..2b9d0d2 100644
--- a/imports/ui/components/Footer/Footer.js
+++ b/imports/ui/components/Footer/Footer.js
@@ -8,6 +8,7 @@ import './Footer.scss';
 
 const copyrightYear = () => {
   const currentYear = year();
+  // moment(new Date()).format('YY');
   return currentYear === '2017' ? '2017' : `2017-${currentYear}`;
 };
 
@@ -19,8 +20,18 @@ const Footer = (props) => {
         <p className="pull-left"><span className="reverse">&copy;</span><span className="d-none d-md-inline"> Copyleft</span> {copyrightYear()} <a href="https://comunes.org/"><span className="d-none d-md-inline">{t('OrgName')}</span><span className="d-inline d-md-none">{t('OrgName')}</span></a></p>
 
         <ul className="pull-right">
-          <li><Link to="/terms"> {t('Términos')}<span className="d-none d-md-inline"> {t('de Servicio')}</span></Link></li>
-          <li><Link to="/privacy"><span className="d-none d-md-inline">{t('Política de')} </span>{t('Privacidad')}</Link></li>
+          <li>
+            <Link to="/terms">
+              <span className="d-none d-md-inline">{t('Términos de Servicio')}</span>
+              <span className="d-md-none">{t('Términos')}</span>
+            </Link>
+          </li>
+          <li>
+            <Link to="/privacy">
+              <span className="d-none d-md-inline">{t('Política de Privacidad')}</span>
+              <span className="d-md-none">{t('Privacidad')}</span>
+            </Link>
+          </li>
           <li><span className="d-none d-md-inline"><Link to="/license">{t('Licencia')}</Link></span></li>
           <li><span className="d-none d-md-inline"><Link to="/credits">{t('Créditos')}</Link></span></li>
         </ul>
diff --git a/imports/ui/components/Footer/Footer.scss b/imports/ui/components/Footer/Footer.scss
index 2b2f234..730cacd 100644
--- a/imports/ui/components/Footer/Footer.scss
+++ b/imports/ui/components/Footer/Footer.scss
@@ -21,6 +21,8 @@ body {
 
   p {
     color: $gray-light;
+    font-size: 16px !important;
+    line-height: 1.3em;
 
     a {
       color: $gray-light;
@@ -62,7 +64,7 @@ body {
 
 @include breakpoint(tablet) {
   .Footer ul li:first-child, .Footer ul li:nth-child(2) {
-    margin-right: 30px;
+    margin-right: 15px;
   }
 }
 
diff --git a/public/locales/en/common.json b/public/locales/en/common.json
index d17ba71..4b3c391 100644
--- a/public/locales/en/common.json
+++ b/public/locales/en/common.json
@@ -3,11 +3,9 @@
   "AppNameFull": "All Against Fire!",
   "OrgName": "Comunes",
   "OrgNameFull": "Comunes Association",
-  "Privacidad": "Privacy",
   "Términos": "Terms",
-  "de Servicio": "of Service",
-  "Política": "Privacy",
-  "de Privacidad": "Policy",
+  "Términos de Servicio": "Terms of Service",
+  "Privacidad": "Privacy",
   "Inicio": "Home",
   "Licencia": "License",
   "Cerrar sesión": "Logout",
@@ -64,7 +62,6 @@
   "Suscripción actualizada": "Subscription updated",
   "Última actualización, {{when}}": "Last updated, {{when}}",
   "Has iniciado sesión con {{service}} usando la dirección de correo {{email}}.": "You're logged in with {{service}} using the email address {{email}}.",
-  "Política de": "Privacy",
   "Uso de Cookies": "Use of Cookies",
   "Utilizamos cookies para asegurar un mejor uso de nuestra web. Si continúas navegando, consideramos que aceptas su uso": "We use cookies to ensure a better use of our website. If you continue browsing, we consider that you accept their use",
   "Participa": "Get Involved",
@@ -117,7 +114,6 @@
   "Sí": "Yes",
   "No": "No",
   "Sobre los datos y imágenes usados": "About the data and images used",
-  "Términos de Servicio": "Terms of Service",
   "Política de Privacidad": "Privacy Policy",
   "No estás suscrito a fuegos en ninguna zona": "You are not subscribed to fires in any area",
   "Iniciar sesión con Telegram": "Login with Telegram",
diff --git a/public/locales/es/common.json b/public/locales/es/common.json
index b6880c2..85a85fe 100644
--- a/public/locales/es/common.json
+++ b/public/locales/es/common.json
@@ -5,9 +5,7 @@
   "OrgNameFull": "Asociación Comunes",
   "Privacidad": "Privacidad",
   "Términos": "Términos",
-  "de Servicio": "de Servicio",
-  "Política de": "Política de",
-  "Privacidad": "Privacidad",
+  "Términos de Servicio": "Términos de Servicio",
   "Inicio": "Inicio",
   "Licencia": "Licencia",
   "Cerrar sesión": "Cerrar sesión",