From b862e526f96429b78f4af631eb72560479dba91d Mon Sep 17 00:00:00 2001
From: Manuel Cillero <manuel@cillero.es>
Date: Fri, 1 Mar 2019 06:33:21 +0100
Subject: [PATCH] =?UTF-8?q?Se=20integran=20los=20t=C3=A9rminos=20de=20uso?=
 =?UTF-8?q?=20en=20el=20aviso=20legal=20como=20en=20manuel.cillero.es?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base.html.erb | 3 +--
 config/locales/en.yml           | 3 +--
 config/locales/es.yml           | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/app/views/layouts/base.html.erb b/app/views/layouts/base.html.erb
index 84eabe1..b759614 100644
--- a/app/views/layouts/base.html.erb
+++ b/app/views/layouts/base.html.erb
@@ -148,10 +148,9 @@
     </ul>
     <div class="bgl"><div class="bgr">
         <div id="legal">
-        <span class="legal-notice"><a href="/projects/suitepro/wiki/Legal"><%= l(:label_legal) %></a></span>
+        <span class="legal-terms"><a href="/projects/suitepro/wiki/Legal"><%= l(:label_legal) %></a></span>
         <span class="legal-privacy"> &nbsp;|&nbsp; <a href="/projects/suitepro/wiki/Política_de_privacidad"><%= l(:label_legal_privacy) %></a></span>
         <span class="legal-cookies"> &nbsp;|&nbsp; <a href="/projects/suitepro/wiki/Política_de_cookies"><%= l(:label_legal_cookies) %></a></span>
-        <span class="legal-terms"> &nbsp;|&nbsp; <a href="/projects/suitepro/wiki/Términos_de_uso"><%= l(:label_legal_conditions) %></a></span>
         </div>
         <%= Time.current.year %> &copy; SuitePro (powered by <%= link_to Redmine::Info.app_name, Redmine::Info.url %>)
     </div></div>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index b8f148c..9aca206 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1242,7 +1242,6 @@ en:
 
   link_my_blog: My Blog
 
-  label_legal: Legal notice
+  label_legal: Legal notice and terms of use
   label_legal_privacy: Privacy policy
   label_legal_cookies: Cookies policy
-  label_legal_conditions: Terms of use
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 5438180..09c56a2 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -1290,7 +1290,6 @@ es:
 
   link_my_blog: Mi blog personal
 
-  label_legal: Aviso legal
+  label_legal: Aviso legal y términos de uso
   label_legal_privacy: Política de privacidad
   label_legal_cookies: Uso de cookies
-  label_legal_conditions: Términos de uso