diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index 498b22795..d62bd6d5c 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -64,7 +64,7 @@

<%= t("layouts.header.open_city_title") %>

<%= t("layouts.header.open_city_slogan_html") %>

- <%= link_to t("layouts.header.see_all"), highlights_path, class: "button radius see-more warning" %> + <%= link_to t("layouts.header.see_all"), proposals_path, class: "button radius see-more warning" %> <%= link_to t("layouts.header.more_information"), "/more_information", class: "more-info" %>
diff --git a/app/views/verification/letter/edit.html.erb b/app/views/verification/letter/edit.html.erb index 1ed2cff3d..d5722f1fb 100644 --- a/app/views/verification/letter/edit.html.erb +++ b/app/views/verification/letter/edit.html.erb @@ -17,6 +17,6 @@ %> - <%= link_to t("verification.letter.edit.see_all"), highlights_path, class: "button success radius" %> + <%= link_to t("verification.letter.edit.see_all"), proposals_path, class: "button warning radius" %> diff --git a/app/views/verification/letter/new.html.erb b/app/views/verification/letter/new.html.erb index f302492a3..47bd7f0fc 100644 --- a/app/views/verification/letter/new.html.erb +++ b/app/views/verification/letter/new.html.erb @@ -38,7 +38,7 @@ - <%= link_to t("verification.letter.new.go_to_index"), root_path, class: "button radius success" %> + <%= link_to t("verification.letter.new.go_to_index"), root_path, class: "button radius warning" %>
diff --git a/config/locales/en.yml b/config/locales/en.yml index a070b7e3f..f4362960f 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -15,7 +15,7 @@ en: open_city_slogan_html: "Start listening to Madrid. For that we open this digital Puerta del Sol, where all the locals can meet to discuss and share everything we want." - see_all: See debates and proposals + see_all: "See proposals" my_account_link: My account locale: "Language:" administration: Administration @@ -37,7 +37,7 @@ en: transparency_text: Get any information on the City of Madrid. open_data_title: Open Data open_data_text: "All City Council data are yours." - contact_us: "Contact us" + contact_us: "For technical support contact us" privacy: "Privacy Policy" conditions: "Terms of use" more_info: "More information" @@ -152,7 +152,7 @@ en: select_order_long: Order proposals by orders: confidence_score: "most supported" - hot_score: most active + hot_score: "most active today" created_at: newest most_commented: most commented random: random diff --git a/config/locales/es.yml b/config/locales/es.yml index 85285e010..fdac85fa2 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -15,7 +15,7 @@ es: open_city_slogan_html: "Existen ciudades gobernadas directamente por sus habitantes, que debaten sobre temas que les preocupan, proponen ideas para mejorar sus vidas y deciden entre todas y todos las que se llevan a cabo. Madrid ya es una de ellas." - see_all: Ver debates y propuestas + see_all: "Ver propuestas" my_account_link: Mi cuenta locale: "Idioma:" administration: Administrar @@ -37,7 +37,7 @@ es: transparency_text: "Obtén cualquier información sobre el Ayuntamiento de Madrid." open_data_title: Datos Abiertos open_data_text: "Todos los datos del Ayuntamiento son tuyos." - contact_us: "Contacta con nosotros en" + contact_us: "Para asistencia técnica contáctenos en" privacy: "Política de privacidad" conditions: "Condiciones de uso" more_info: "Más información" @@ -152,7 +152,7 @@ es: select_order_long: Estás viendo las propuestas orders: confidence_score: "más apoyadas" - hot_score: "más activas" + hot_score: "más activas hoy" created_at: "más nuevas" most_commented: "más comentadas" random: "aleatorias" diff --git a/config/locales/verification.en.yml b/config/locales/verification.en.yml index 1feb43860..50e0d425b 100644 --- a/config/locales/verification.en.yml +++ b/config/locales/verification.en.yml @@ -77,7 +77,7 @@ en: offices: "Office of Citizen" offices_url: "http://www.madrid.es/portales/munimadrid/es/Inicio/El-Ayuntamiento/Atencion-al-ciudadano/Oficinas-de-Atencion-al-Ciudadano?vgnextfmt=default&vgnextchannel=5b99cde2e09a4310VgnVCM1000000b205a0aRCRD" send_letter: "Request a letter" - go_to_index: "See proposals and debates" + go_to_index: "See proposals" create: flash: success_html: "Before voting you'll receive a letter whith the instructions for verify your account.
Remember you can verify your information in any %{offices}." @@ -85,7 +85,7 @@ en: offices_url: "http://www.madrid.es/portales/munimadrid/es/Inicio/El-Ayuntamiento/Atencion-al-ciudadano/Oficinas-de-Atencion-al-Ciudadano?vgnextfmt=default&vgnextchannel=5b99cde2e09a4310VgnVCM1000000b205a0aRCRD" edit: title: "Letter requested" - see_all: "See proposals and debates" + see_all: "See proposals" update: flash: success: "Correct code. Your account is verified" diff --git a/config/locales/verification.es.yml b/config/locales/verification.es.yml index bf0102ad1..fbd7c9499 100644 --- a/config/locales/verification.es.yml +++ b/config/locales/verification.es.yml @@ -77,7 +77,7 @@ es: offices: "Oficina de Atención al Ciudadano" offices_url: "http://www.madrid.es/portales/munimadrid/es/Inicio/El-Ayuntamiento/Atencion-al-ciudadano/Oficinas-de-Atencion-al-Ciudadano?vgnextfmt=default&vgnextchannel=5b99cde2e09a4310VgnVCM1000000b205a0aRCRD" send_letter: "Solicitar una carta por correo postal" - go_to_index: "Ver propuestas y debates" + go_to_index: "Ver propuestas" create: flash: success_html: "Antes de las votaciones recibirás una carta con las instrucciones para verificar tu cuenta.
Recuerda que puedes ahorrar el envío verificándote presencialmente en cualquiera de las %{offices}." @@ -85,7 +85,7 @@ es: offices_url: "http://www.madrid.es/portales/munimadrid/es/Inicio/El-Ayuntamiento/Atencion-al-ciudadano/Oficinas-de-Atencion-al-Ciudadano?vgnextfmt=default&vgnextchannel=5b99cde2e09a4310VgnVCM1000000b205a0aRCRD" edit: title: "Carta solicitada" - see_all: "Ver debates y propuestas" + see_all: "Ver propuestas" update: flash: success: "Código correcto. Tu cuenta ya está verificada"