From 213152349bc11d7b087ba6181e317ce9fa91a0cd Mon Sep 17 00:00:00 2001 From: decabeza Date: Tue, 30 Jan 2018 18:10:42 +0100 Subject: [PATCH 01/10] Changes more info link to help --- app/views/shared/_subnavigation.html.erb | 4 ++-- app/views/welcome/index.html.erb | 2 +- config/locales/en/activerecord.yml | 2 +- config/locales/en/general.yml | 3 ++- config/locales/es/activerecord.yml | 2 +- config/locales/es/general.yml | 3 ++- 6 files changed, 9 insertions(+), 7 deletions(-) diff --git a/app/views/shared/_subnavigation.html.erb b/app/views/shared/_subnavigation.html.erb index ffa188709..aebbe1d13 100644 --- a/app/views/shared/_subnavigation.html.erb +++ b/app/views/shared/_subnavigation.html.erb @@ -53,11 +53,11 @@ <% end %>
  • - <%= link_to t("layouts.header.more_info"), + <%= link_to t("layouts.header.help"), more_info_path, accesskey: "5", class: ("active" if current_page?(more_info_path)), - title: t("shared.go_to_page") + t("layouts.header.more_info") %> + title: t("shared.go_to_page") + t("layouts.header.help") %>
    • diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index de64d9cd8..70919b235 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -17,7 +17,7 @@ <%= t("layouts.header.open_city_slogan_html") %>

    - <%= link_to t("layouts.header.more_info"), more_info_path, class: "button expanded large" %> + <%= link_to t("shared.more_info"), more_info_path, class: "button expanded large" %>
    diff --git a/config/locales/en/activerecord.yml b/config/locales/en/activerecord.yml index 81b25dcad..d231eb2d0 100644 --- a/config/locales/en/activerecord.yml +++ b/config/locales/en/activerecord.yml @@ -187,7 +187,7 @@ en: status: Status title: Title updated_at: Updated at - more_info_flag: Show in more information page + more_info_flag: Show in help page print_content_flag: Print content button locale: Language site_customization/image: diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml index 205db683c..c3960a3df 100644 --- a/config/locales/en/general.yml +++ b/config/locales/en/general.yml @@ -231,7 +231,7 @@ en: moderation: Moderation valuation: Valuation officing: Polling officers - more_info: More information + help: Help my_account_link: My account my_activity_link: My activity notifications: Notifications @@ -623,6 +623,7 @@ en: previous_slide: Previous Slide next_slide: Next Slide documentation: Additional documentation + more_info: More information social: blog: "%{org} Blog" facebook: "%{org} Facebook" diff --git a/config/locales/es/activerecord.yml b/config/locales/es/activerecord.yml index b604224cf..f891ed3fc 100644 --- a/config/locales/es/activerecord.yml +++ b/config/locales/es/activerecord.yml @@ -183,7 +183,7 @@ es: status: Estado title: Título updated_at: última actualización - more_info_flag: Mostrar en la página de más información + more_info_flag: Mostrar en la página de ayuda print_content_flag: Botón de imprimir contenido locale: Idioma site_customization/image: diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml index 7ac16c170..3200f4be0 100644 --- a/config/locales/es/general.yml +++ b/config/locales/es/general.yml @@ -231,7 +231,7 @@ es: moderation: Moderar valuation: Evaluación officing: Presidentes de mesa - more_info: Más información + help: Ayuda my_account_link: Mi cuenta my_activity_link: Mi actividad notifications: Notificaciones @@ -622,6 +622,7 @@ es: previous_slide: Imagen anterior next_slide: Siguiente imagen documentation: Documentación adicional + more_info: Más información social: blog: "Blog de %{org}" facebook: "Facebook de %{org}" From 735630cff06ac7553d4cddeea89c49ee2cdfd255 Mon Sep 17 00:00:00 2001 From: decabeza Date: Tue, 30 Jan 2018 18:11:13 +0100 Subject: [PATCH 02/10] Updates text of intro section of more info page --- app/views/pages/more_info/index.html.erb | 10 +++++----- config/locales/en/pages.yml | 8 ++++---- config/locales/es/pages.yml | 8 ++++---- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/app/views/pages/more_info/index.html.erb b/app/views/pages/more_info/index.html.erb index 79cbd77b5..7bb05d1f6 100644 --- a/app/views/pages/more_info/index.html.erb +++ b/app/views/pages/more_info/index.html.erb @@ -1,14 +1,14 @@ -<% provide :title do %><%= t("pages.titles.more_info", org_name: setting['org_name']) %><% end %> +<% provide :title do %><%= t("pages.titles.more_info", org: setting['org_name']) %><% end %> <% content_for :canonical do %> <%= render "shared/canonical", href: more_info_url %> <% end %>
    -
    -

    <%= t("pages.more_info.title", org_name: setting['org_name']) %>

    -

    <%= t("pages.more_info.subtitle") %>

    -

    <%= t("pages.more_info.guide", org_name: setting['org_name']) %>

    +
    +

    <%= t("pages.more_info.title", org: setting['org_name']) %>

    +

    <%= t("pages.more_info.subtitle", org: setting['org_name']) %>

    +

    <%= t("pages.more_info.guide", org: setting['org_name']) %>

    diff --git a/config/locales/en/pages.yml b/config/locales/en/pages.yml index c0b8f3a0b..80230e248 100644 --- a/config/locales/en/pages.yml +++ b/config/locales/en/pages.yml @@ -4,9 +4,9 @@ en: conditions: Terms and conditions of use general_terms: Terms and Conditions more_info: - title: "Discover %{org_name}" - subtitle: "Learn everything you can do on this website." - guide: 'This guide explains each section of %{org_name}. You can expand the information on "Detailed information" links.' + title: "%{org} is a platform for citizen participation" + subtitle: "In %{org} you can make proposals, vote in citizen consultations, propose participatory budget projects, decide on municipal regulations and open debates to exchange opinions with others." + guide: "This guide explains what each of the %{org} sections are for and how they work." menu: debates: "Debates" proposals: "Proposals" @@ -71,7 +71,7 @@ en: titles: accessibility: Accessibility conditions: Terms of use - more_info: "More information about %{org_name}" + more_info: "What is %{org}? - Citizen participation" privacy: Privacy Policy verify: code: Code you received in letter diff --git a/config/locales/es/pages.yml b/config/locales/es/pages.yml index 0f0fe12d4..b53d113cd 100644 --- a/config/locales/es/pages.yml +++ b/config/locales/es/pages.yml @@ -4,9 +4,9 @@ es: conditions: Condiciones de uso general_terms: Términos y Condiciones more_info: - title: "Descubre %{org_name}" - subtitle: "Aprende todo lo que puedes hacer en esta web." - guide: 'Esta guía explica cada una de las secciones de %{org_name}. Puedes ampliar la información en los enlaces de "Información detallada".' + title: "%{org} es una plataforma de participación ciudadana" + subtitle: "En %{org} se pueden hacer propuestas, votar en consultas ciudadanas, plantear proyectos de presupuestos participativos, decidir la normativa municipal y abrir debates para intercambiar opiniones con otras personas." + guide: 'Esta guía explica para qué sirven y cómo funcionan cada una de las secciones de %{org}.' menu: debates: "Debates" proposals: "Propuestas" @@ -71,7 +71,7 @@ es: titles: accessibility: Accesibilidad conditions: Condiciones de uso - more_info: "Más información sobre %{org_name}" + more_info: "¿Qué es %{org}? - Participación ciudadana" privacy: Política de Privacidad verify: code: Código que has recibido en tu carta From 59a02301c24ab4742b9d9f3f2424751c86e6c7d7 Mon Sep 17 00:00:00 2001 From: decabeza Date: Tue, 30 Jan 2018 18:11:50 +0100 Subject: [PATCH 03/10] Updates text of debates section of more info page --- app/views/pages/more_info/_debates.html.erb | 12 ++++++++---- config/locales/en/pages.yml | 8 ++++---- config/locales/es/pages.yml | 8 ++++---- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/app/views/pages/more_info/_debates.html.erb b/app/views/pages/more_info/_debates.html.erb index a8e76ba91..d8f3fdedd 100644 --- a/app/views/pages/more_info/_debates.html.erb +++ b/app/views/pages/more_info/_debates.html.erb @@ -3,14 +3,18 @@

    <%= t("pages.more_info.debates.title") %>

    -

    <%= t("pages.more_info.debates.description") %>

    +

    + <%= t("pages.more_info.debates.description", + org: setting['org_name'], + link: link_to(t("pages.more_info.debates.link"), + debates_path)).html_safe %> +

    • - <%= t("pages.more_info.debates.feature_1", - link: link_to(t("pages.more_info.debates.feature_1_link", org_name: setting['org_name']), + <%= t("pages.more_info.debates.feature_html", + link: link_to(t("pages.more_info.debates.feature_link", org: setting['org_name']), new_user_registration_path)).html_safe %>
      • -
    • <%= t("pages.more_info.debates.feature_2_html") %>
    diff --git a/config/locales/en/pages.yml b/config/locales/en/pages.yml index 80230e248..fb02b1a43 100644 --- a/config/locales/en/pages.yml +++ b/config/locales/en/pages.yml @@ -14,10 +14,10 @@ en: other: "Other information of interest" debates: title: "Debates" - description: "Create a thread where you can discuss any topic you want to share with other people in your city." - feature_1: "To create a debate you have to %{link}" - feature_1_link: "sign up on %{org_name}" - feature_2_html: "Debates can be rated using the I agree or I disagree buttons you'll find on each of them." + description: "In the %{link} section you can present and share your opinion with other people on issues of concern to you related to the city. It is also a place to generate ideas that through the other sections of %{org} lead to concrete actions by the City Council." + link: "citizen debates" + feature_html: "You can open debates, comment and evaluate them with the I agree or I don't agree. For that you have to %{link}." + feature_link: "register in %{org}" image_alt: "Buttons to rate the debates" figcaption: '"I agree" and "I disagree" buttons to rate the debates.' proposals: diff --git a/config/locales/es/pages.yml b/config/locales/es/pages.yml index b53d113cd..bff35522b 100644 --- a/config/locales/es/pages.yml +++ b/config/locales/es/pages.yml @@ -14,10 +14,10 @@ es: other: "Otra información de interés" debates: title: "Debates" - description: "Crea un hilo en el que debatir sobre cualquier tema que quieras compartir con el resto de gente de tu ciudad." - feature_1: "Para crear un debate tienes que %{link}" - feature_1_link: "registrarte en %{org_name}" - feature_2_html: "Los debates pueden ser valorados utilizando los botones de Estoy de acuerdo o No estoy de acuerdo que encontrarás en cada uno de ellos." + description: "En la sección de %{link} puedes exponer y compartir tu opinión con otras personas sobre temas que te preocupan relacionados con la ciudad. También es un espacio donde generar ideas que a través de las otras secciones de %{org} lleven a actuaciones concretas por parte del Ayuntamiento." + link: "debates ciudadanos" + feature_html: "Puedes abrir debates, comentarlos y valorarlos con los botones de Estoy de acuerdo o No estoy de acuerdo. Para ello tienes que %{link}." + feature_link: "registrarte en %{org}" image_alt: "Botones para valorar los debates" figcaption: 'Botones "Estoy de acuerdo" y "No estoy de acuerdo" para valorar los debates.' proposals: From fffc769c90eac1fd5f8add048940f2103cbb4a23 Mon Sep 17 00:00:00 2001 From: decabeza Date: Tue, 30 Jan 2018 18:12:21 +0100 Subject: [PATCH 04/10] Updates text of proposals section of more info page --- app/views/pages/more_info/_proposals.html.erb | 13 +++++++------ config/locales/en/pages.yml | 8 +++----- config/locales/es/pages.yml | 8 +++----- 3 files changed, 13 insertions(+), 16 deletions(-) diff --git a/app/views/pages/more_info/_proposals.html.erb b/app/views/pages/more_info/_proposals.html.erb index cf1822142..c9f10f92e 100644 --- a/app/views/pages/more_info/_proposals.html.erb +++ b/app/views/pages/more_info/_proposals.html.erb @@ -3,15 +3,16 @@

    <%= t("pages.more_info.proposals.title") %>

    -

    <%= t("pages.more_info.proposals.description") %>

    +

    + <%= t("pages.more_info.proposals.description", + link: link_to(t("pages.more_info.proposals.link"), proposals_path)).html_safe %> +

    • - <%= t("pages.more_info.proposals.feature_1", - link: link_to(t("pages.more_info.proposals.feature_1_link", org_name: setting['org_name']), - new_user_registration_path)).html_safe %> + <%= t("pages.more_info.proposals.feature_html", + org: setting['org_name'], + supports: setting['votes_for_proposal_success']).html_safe %>
      • -
    • <%= t("pages.more_info.proposals.feature_2_html") %>
      • -
    • <%= t("pages.more_info.proposals.feature_3_html") %>
    diff --git a/config/locales/en/pages.yml b/config/locales/en/pages.yml index fb02b1a43..eb2636e99 100644 --- a/config/locales/en/pages.yml +++ b/config/locales/en/pages.yml @@ -22,11 +22,9 @@ en: figcaption: '"I agree" and "I disagree" buttons to rate the debates.' proposals: title: "Proposals" - description: "Propose what you want the City Council to do and support proposals from other people." - feature_1: "To create a proposal you have to %{link}, in addition to support you must verify your account." - feature_1_link: "sign up on %{org_name}" - feature_2_html: "Proposals that get support from 1% of people will be voted on." - feature_3_html: "If there are more people in favor than against, the City Council will publish their plan to accomplish the proposal and you can track its progress." + description: "In the %{link} section you can make proposals for the City Council to carry them out. The proposals require support, and if they reach sufficient support, they are put to a public vote. The proposals approved in these citizens' votes are accepted by the City Council and carried out." + link: "citizen proposals" + feature_html: "To create a proposal you must register in %{org}. The proposals that get the support on the website of 1% of people with the right to vote (%{supports} supports of people over 16 years old registered) go to vote. To support proposals it is necessary to verify your account." image_alt: "Button to support a proposal" figcaption_html: 'Button to "Support" a proposal.
    When it reaches the number of supports will go to vote.' budgets: diff --git a/config/locales/es/pages.yml b/config/locales/es/pages.yml index bff35522b..2751652dc 100644 --- a/config/locales/es/pages.yml +++ b/config/locales/es/pages.yml @@ -22,11 +22,9 @@ es: figcaption: 'Botones "Estoy de acuerdo" y "No estoy de acuerdo" para valorar los debates.' proposals: title: "Propuestas" - description: "Propón lo que quieres que el Ayuntamiento lleve a cabo y apoya propuestas de otras personas." - feature_1: "Para crear una propuesta tienes que %{link}, además para apoyarlas debes verificar tu cuenta." - feature_1_link: "registrarte en %{org_name}" - feature_2_html: "Las propuestas que consigan el apoyo del 1% de la gente (mayor de 16 años empadronada; %{supports} apoyos) pasan a votación." - feature_3_html: "Si hay más gente a favor que en contra en la votación, el Ayuntamiento asume la propuesta y se hace." + description: "En la sección de %{link} puedes plantear propuestas para que el Ayuntamiento las lleve a cabo. Las propuestas recaban apoyos, y si alcanzan los apoyos suficientes se someten a votación ciudadana. Las propuestas aprobadas en estas votaciones ciudadanas son asumidas por el Ayuntamiento y se llevan a cabo." + link: "propuestas ciudadanas" + feature_html: "Para crear una propuesta hay que registrarse en %{org}. Las propuestas que consiguen el apoyo en la web del 1% de la gente con derecho a voto (%{supports} apoyos de personas mayores de 16 años empadronadas) pasan a votación. Para apoyar propuestas es necesario verificar tu cuenta." image_alt: "Botón para apoyar una propuesta" figcaption_html: 'Botón para "Apoyar" una propuesta.
    Cuando alcance el número de apoyos pasará a votación.' budgets: From 037a3af5a618384eec2c8b53132018e791cb3d4b Mon Sep 17 00:00:00 2001 From: decabeza Date: Tue, 30 Jan 2018 18:12:48 +0100 Subject: [PATCH 05/10] Updates text of budgets section of more info page --- app/views/pages/more_info/_budgets.html.erb | 19 ++++++++++++------- config/locales/en/pages.yml | 14 ++++++++------ config/locales/es/pages.yml | 14 ++++++++------ 3 files changed, 28 insertions(+), 19 deletions(-) diff --git a/app/views/pages/more_info/_budgets.html.erb b/app/views/pages/more_info/_budgets.html.erb index 6450bdffe..781463521 100644 --- a/app/views/pages/more_info/_budgets.html.erb +++ b/app/views/pages/more_info/_budgets.html.erb @@ -3,18 +3,23 @@

    <%= t("pages.more_info.budgets.title") %>

    -

    <%= t("pages.more_info.budgets.description") %>

    +

    + <%= t("pages.more_info.budgets.description", + link: link_to(t("pages.more_info.budgets.link"), budgets_path)).html_safe %> +

    • - <%= t("pages.more_info.budgets.feature_1", - link: link_to(t("pages.more_info.budgets.feature_1_link", org_name: setting['org_name']), - new_user_registration_path)).html_safe %> + <%= t("pages.more_info.budgets.feature") %>
      • -
    • <%= t("pages.more_info.budgets.feature_2_html") %>
      • -
    • <%= t("pages.more_info.budgets.feature_3_html") %>
      • -
    • <%= t("pages.more_info.budgets.feature_4_html") %>
      • +
    • <%= t("pages.more_info.budgets.phase_1_html", + org: setting['org_name']).html_safe %>
      • +
    • <%= t("pages.more_info.budgets.phase_2_html") %>
      • +
    • <%= t("pages.more_info.budgets.phase_3_html") %>
      • +
    • <%= t("pages.more_info.budgets.phase_4_html") %>
    +

    <%= t("pages.more_info.budgets.phase_5_html") %>

    +
    <%= image_tag "more_info/budgets_#{I18n.locale}.png", alt: t("pages.more_info.budgets.image_alt") %>
    <%= t("pages.more_info.budgets.figcaption_html") %>
    diff --git a/config/locales/en/pages.yml b/config/locales/en/pages.yml index eb2636e99..63905412f 100644 --- a/config/locales/en/pages.yml +++ b/config/locales/en/pages.yml @@ -29,12 +29,14 @@ en: figcaption_html: 'Button to "Support" a proposal.
    When it reaches the number of supports will go to vote.' budgets: title: "Participatory Budgeting" - description: "The first six months of each year you can decide how to spend part of the budget." - feature_1: "To submit an investment project you have to %{link} and verify your account." - feature_1_link: "sign up on %{org_name}" - feature_2_html: "The first is the submit phase of investment projects." - feature_3_html: "Then there is a support phase to prioritize the most interesting, the most supported are evaluated by the City to see if they are viable and how much they are worth." - feature_4_html: "At the end there is a vote phase and you decide which of the approved projects to spend the budget on." + description: "The %{link} section helps people make a direct decision on what part of the municipal budget is spent on." + link: "participative budgets" + feature: "In this process, every year people raise, support and vote on projects. The most voted votes are financed by the municipal budget." + phase_1_html: "Between January and early March, people registered in %{org} can present." + phase_2_html: "In March, proposers have to gather support, in the form of preselection." + phase_3_html: "Between April and the beginning of May, the experts from the City Council rate projects on an order of more or less supported and check that they are viable." + phase_4_html: "Finally, between May and June, all citizens can vote projects that interest them the most." + phase_5_html: "From the approval of the budgets the following year the City Council begins to carry out the winning projects." image_alt: "Different phases of a participatory budget" figcaption_html: '"Support" and "Voting" phases of participatory budgets.' polls: diff --git a/config/locales/es/pages.yml b/config/locales/es/pages.yml index 2751652dc..3510cfe1a 100644 --- a/config/locales/es/pages.yml +++ b/config/locales/es/pages.yml @@ -29,12 +29,14 @@ es: figcaption_html: 'Botón para "Apoyar" una propuesta.
    Cuando alcance el número de apoyos pasará a votación.' budgets: title: "Presupuestos participativos" - description: "Los primeros seis meses de cada año puedes decidir cómo gastar parte del presupuesto." - feature_1: "Para crear un proyecto de gasto tienes que %{link} y verificar tu cuenta." - feature_1_link: "registrarte en %{org_name}" - feature_2_html: "En primer lugar empieza la fase de aceptación de proyectos de gasto." - feature_3_html: "Después hay una fase de apoyos para priorizar lo más interesante, las más apoyadas son evaluadas por el Ayuntamiento para ver si son viables y cuánto valen." - feature_4_html: "Al final hay una fase de votación donde se decide en cuáles se gasta esa parte del presupuesto." + description: "La sección de %{link} sirve para que la gente decida de manera directa a qué se destina una parte del presupuesto municipal." + link: "presupuestos participativos" + feature: "En este proceso cada año la gente plantea, apoya y vota proyectos. Los más votados pasan a financiarse con el presupuesto municipal." + phase_1_html: "Entre enero y principios de marzo, las personas registradas en %{org} pueden presentar proyectos." + phase_2_html: "En marzo, los proponentes tienen que recabar apoyos, a modo de fase de preselección." + phase_3_html: "Entre abril y comienzos de mayo los técnicos del Ayuntamiento tasan los proyectos por orden de más a menos apoyados y comprueban que son viables." + phase_4_html: "Finalmente, entre mayo y junio, toda la ciudadanía puede votar los proyectos que más le interesan." + phase_5_html: "A partir de la aprobación de los presupuestos al año siguiente el Ayuntamiento empieza a llevar a cabo los proyectos ganadores." image_alt: "Diferentes fases de un presupuesto participativo" figcaption_html: 'Fase de "Apoyos" y fase de "Votación" de los presupuestos participativos.' polls: From a958a75bb184a96d382cee60c5e4c18f5634ea59 Mon Sep 17 00:00:00 2001 From: decabeza Date: Tue, 30 Jan 2018 18:13:24 +0100 Subject: [PATCH 06/10] Updates text of polls section of more info page --- app/views/pages/more_info/_polls.html.erb | 5 ++++- config/locales/en/pages.yml | 11 ++++++----- config/locales/es/pages.yml | 7 ++++--- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/app/views/pages/more_info/_polls.html.erb b/app/views/pages/more_info/_polls.html.erb index 360558d99..16a5c08bd 100644 --- a/app/views/pages/more_info/_polls.html.erb +++ b/app/views/pages/more_info/_polls.html.erb @@ -1,7 +1,10 @@

    <%= t("pages.more_info.polls.title") %>

    -

    <%= t("pages.more_info.polls.description") %>

    +

    + <%= t("pages.more_info.polls.description", + link: link_to(t("pages.more_info.polls.link"), polls_path)).html_safe %> +

    • <%= t("pages.more_info.polls.feature_1", diff --git a/config/locales/en/pages.yml b/config/locales/en/pages.yml index 63905412f..38f6ed25d 100644 --- a/config/locales/en/pages.yml +++ b/config/locales/en/pages.yml @@ -41,11 +41,12 @@ en: figcaption_html: '"Support" and "Voting" phases of participatory budgets.' polls: title: "Polls" - description: "Citizen proposals that reach 1% of support will be put to a vote." - feature_1: "To participate in the next poll you have to %{link} and verify your account." - feature_1_link: "sign up on %{org_name}" - feature_2: "All verified users over 16 years old can vote." - feature_3: "The results of all votes shall be binding on the government." + description: "The %{link} section is activated each time a proposal reaches 1% support and goes to the vote or when the City Council proposes an issue for people to decide on." + link: "polls" + feature_1: "To participate in the voting you have to %{link} and verify your account." + feature_1_link: "register in %{org_name}" + feature_2: "All registered voters over the age of 16 can vote." + feature_3: "The results of all votes are binding on the municipal government." faq: title: "Technical problems?" description: "Read the FAQs and solve your questions." diff --git a/config/locales/es/pages.yml b/config/locales/es/pages.yml index 3510cfe1a..4ea5a44a9 100644 --- a/config/locales/es/pages.yml +++ b/config/locales/es/pages.yml @@ -41,11 +41,12 @@ es: figcaption_html: 'Fase de "Apoyos" y fase de "Votación" de los presupuestos participativos.' polls: title: "Votaciones" - description: "Las propuestas ciudadanas que alcancen el 1% de apoyos pasarán a votación." - feature_1: "Para participar en la próxima votación tienes que %{link} y verificar tu cuenta." + description: "La sección de %{link} se activa cada vez que una propuesta alcanza el 1% de apoyos y pasa a votación o cuando el Ayuntamiento propone un tema para que la gente decida sobre él." + link: "votaciones ciudadanas" + feature_1: "Para participar en las votaciones tienes que %{link} y verificar tu cuenta." feature_1_link: "registrarte en %{org_name}" feature_2: "Pueden votar todas las personas empadronadas en la ciudad mayores de 16 años." - feature_3: "Los resultados de todas las votaciones serán vinculantes para el gobierno." + feature_3: "Los resultados de todas las votaciones son vinculantes para el gobierno municipal." faq: title: "¿Problemas técnicos?" description: "Lee las preguntas frecuentes y resuelve tus dudas." From 286371c9d911f0859f3203a2a3a7245381a0c019 Mon Sep 17 00:00:00 2001 From: decabeza Date: Tue, 30 Jan 2018 18:26:30 +0100 Subject: [PATCH 07/10] Changes more_info folder and path to help --- app/views/debates/new.html.erb | 2 +- app/views/legislation/proposals/new.html.erb | 2 +- app/views/pages/{more_info => help}/_budgets.html.erb | 0 app/views/pages/{more_info => help}/_debates.html.erb | 0 app/views/pages/{more_info => help}/_menu.html.erb | 0 app/views/pages/{more_info => help}/_other.html.erb | 0 app/views/pages/{more_info => help}/_polls.html.erb | 0 app/views/pages/{more_info => help}/_proposals.html.erb | 0 app/views/pages/{more_info => help}/_sidebar.html.erb | 0 app/views/pages/{more_info => help}/faq/index.html.erb | 0 .../pages/{more_info => help}/how_to_use/index.html.erb | 0 app/views/pages/{more_info => help}/index.html.erb | 0 app/views/proposals/new.html.erb | 2 +- app/views/shared/_subnavigation.html.erb | 4 ++-- app/views/welcome/index.html.erb | 2 +- config/routes.rb | 6 +++--- config/sitemap.rb | 2 +- spec/features/site_customization/custom_pages_spec.rb | 6 +++--- spec/lib/tasks/sitemap_spec.rb | 2 +- 19 files changed, 14 insertions(+), 14 deletions(-) rename app/views/pages/{more_info => help}/_budgets.html.erb (100%) rename app/views/pages/{more_info => help}/_debates.html.erb (100%) rename app/views/pages/{more_info => help}/_menu.html.erb (100%) rename app/views/pages/{more_info => help}/_other.html.erb (100%) rename app/views/pages/{more_info => help}/_polls.html.erb (100%) rename app/views/pages/{more_info => help}/_proposals.html.erb (100%) rename app/views/pages/{more_info => help}/_sidebar.html.erb (100%) rename app/views/pages/{more_info => help}/faq/index.html.erb (100%) rename app/views/pages/{more_info => help}/how_to_use/index.html.erb (100%) rename app/views/pages/{more_info => help}/index.html.erb (100%) diff --git a/app/views/debates/new.html.erb b/app/views/debates/new.html.erb index 5085ca17a..97990048d 100644 --- a/app/views/debates/new.html.erb +++ b/app/views/debates/new.html.erb @@ -7,7 +7,7 @@
      <%= t("debates.new.info", info_link: link_to(t("debates.new.info_link"), new_proposal_path )).html_safe %> - <%= link_to more_info_path, title: t('shared.target_blank_html'), target: "_blank" do %> + <%= link_to help_path, title: t('shared.target_blank_html'), target: "_blank" do %> <%= t("debates.new.more_info") %> <% end %>
      diff --git a/app/views/legislation/proposals/new.html.erb b/app/views/legislation/proposals/new.html.erb index f6f31bff5..72051825e 100644 --- a/app/views/legislation/proposals/new.html.erb +++ b/app/views/legislation/proposals/new.html.erb @@ -5,7 +5,7 @@

      <%= t("proposals.new.start_new") %>

      - <%= link_to more_info_path(anchor: "proposals") ,title: t('shared.target_blank_html'), target: "_blank" do %> + <%= link_to help_path(anchor: "proposals") ,title: t('shared.target_blank_html'), target: "_blank" do %> <%= t("proposals.new.more_info")%> <% end %>
      diff --git a/app/views/pages/more_info/_budgets.html.erb b/app/views/pages/help/_budgets.html.erb similarity index 100% rename from app/views/pages/more_info/_budgets.html.erb rename to app/views/pages/help/_budgets.html.erb diff --git a/app/views/pages/more_info/_debates.html.erb b/app/views/pages/help/_debates.html.erb similarity index 100% rename from app/views/pages/more_info/_debates.html.erb rename to app/views/pages/help/_debates.html.erb diff --git a/app/views/pages/more_info/_menu.html.erb b/app/views/pages/help/_menu.html.erb similarity index 100% rename from app/views/pages/more_info/_menu.html.erb rename to app/views/pages/help/_menu.html.erb diff --git a/app/views/pages/more_info/_other.html.erb b/app/views/pages/help/_other.html.erb similarity index 100% rename from app/views/pages/more_info/_other.html.erb rename to app/views/pages/help/_other.html.erb diff --git a/app/views/pages/more_info/_polls.html.erb b/app/views/pages/help/_polls.html.erb similarity index 100% rename from app/views/pages/more_info/_polls.html.erb rename to app/views/pages/help/_polls.html.erb diff --git a/app/views/pages/more_info/_proposals.html.erb b/app/views/pages/help/_proposals.html.erb similarity index 100% rename from app/views/pages/more_info/_proposals.html.erb rename to app/views/pages/help/_proposals.html.erb diff --git a/app/views/pages/more_info/_sidebar.html.erb b/app/views/pages/help/_sidebar.html.erb similarity index 100% rename from app/views/pages/more_info/_sidebar.html.erb rename to app/views/pages/help/_sidebar.html.erb diff --git a/app/views/pages/more_info/faq/index.html.erb b/app/views/pages/help/faq/index.html.erb similarity index 100% rename from app/views/pages/more_info/faq/index.html.erb rename to app/views/pages/help/faq/index.html.erb diff --git a/app/views/pages/more_info/how_to_use/index.html.erb b/app/views/pages/help/how_to_use/index.html.erb similarity index 100% rename from app/views/pages/more_info/how_to_use/index.html.erb rename to app/views/pages/help/how_to_use/index.html.erb diff --git a/app/views/pages/more_info/index.html.erb b/app/views/pages/help/index.html.erb similarity index 100% rename from app/views/pages/more_info/index.html.erb rename to app/views/pages/help/index.html.erb diff --git a/app/views/proposals/new.html.erb b/app/views/proposals/new.html.erb index 95249e36e..df48c7754 100644 --- a/app/views/proposals/new.html.erb +++ b/app/views/proposals/new.html.erb @@ -5,7 +5,7 @@

      <%= t("proposals.new.start_new") %>

      - <%= link_to more_info_path(anchor: "proposals") ,title: t('shared.target_blank_html'), target: "_blank" do %> + <%= link_to help_path(anchor: "proposals") ,title: t('shared.target_blank_html'), target: "_blank" do %> <%= t("proposals.new.more_info")%> <% end %>
      diff --git a/app/views/shared/_subnavigation.html.erb b/app/views/shared/_subnavigation.html.erb index aebbe1d13..4c9b79580 100644 --- a/app/views/shared/_subnavigation.html.erb +++ b/app/views/shared/_subnavigation.html.erb @@ -54,9 +54,9 @@ <% end %>
    • <%= link_to t("layouts.header.help"), - more_info_path, + help_path, accesskey: "5", - class: ("active" if current_page?(more_info_path)), + class: ("active" if current_page?(help_path)), title: t("shared.go_to_page") + t("layouts.header.help") %>
    diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index 70919b235..7a55aa263 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -17,7 +17,7 @@ <%= t("layouts.header.open_city_slogan_html") %>

    - <%= link_to t("shared.more_info"), more_info_path, class: "button expanded large" %> + <%= link_to t("shared.more_info"), help_path, class: "button expanded large" %>
    diff --git a/config/routes.rb b/config/routes.rb index 73d1443d2..f3739c922 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -42,9 +42,9 @@ Rails.application.routes.draw do resources :follows, only: [:create, :destroy] # More info pages - get 'more-information', to: 'pages#show', id: 'more_info/index', as: 'more_info' - get 'more-information/how-to-use', to: 'pages#show', id: 'more_info/how_to_use/index', as: 'how_to_use' - get 'more-information/faq', to: 'pages#show', id: 'more_info/faq/index', as: 'faq' + get 'help', to: 'pages#show', id: 'help/index', as: 'help' + get 'help/how-to-use', to: 'pages#show', id: 'help/how_to_use/index', as: 'how_to_use' + get 'help/faq', to: 'pages#show', id: 'help/faq/index', as: 'faq' # Static pages get '/blog' => redirect("http://blog.consul/") diff --git a/config/sitemap.rb b/config/sitemap.rb index e60cee617..0846ecc91 100644 --- a/config/sitemap.rb +++ b/config/sitemap.rb @@ -14,7 +14,7 @@ SitemapGenerator::Sitemap.create do add page_path(id: page) end - add more_info_path + add help_path add how_to_use_path add faq_path diff --git a/spec/features/site_customization/custom_pages_spec.rb b/spec/features/site_customization/custom_pages_spec.rb index 38c2536e1..09ad797dc 100644 --- a/spec/features/site_customization/custom_pages_spec.rb +++ b/spec/features/site_customization/custom_pages_spec.rb @@ -80,7 +80,7 @@ feature "Custom Pages" do locale: "en" ) - visit more_info_path + visit help_path expect(page).to have_content("Another custom page") end @@ -93,7 +93,7 @@ feature "Custom Pages" do locale: "en" ) - visit more_info_path + visit help_path expect(page).not_to have_content("Another custom page") @@ -112,7 +112,7 @@ feature "Custom Pages" do locale: "fr" ) - visit more_info_path + visit help_path expect(page).not_to have_content("Ce texte est en français") diff --git a/spec/lib/tasks/sitemap_spec.rb b/spec/lib/tasks/sitemap_spec.rb index b68413ad6..01dd3f430 100644 --- a/spec/lib/tasks/sitemap_spec.rb +++ b/spec/lib/tasks/sitemap_spec.rb @@ -30,7 +30,7 @@ feature 'rake sitemap:create' do # Static pages expect(sitemap).to include(faq_path) - expect(sitemap).to include(more_info_path) + expect(sitemap).to include(help_path) expect(sitemap).to include(how_to_use_path) expect(sitemap).to include(page_path(id: 'general_terms')) From f92664331dd4d24c8f048158d306fa5c6c389b5c Mon Sep 17 00:00:00 2001 From: decabeza Date: Tue, 30 Jan 2018 18:27:43 +0100 Subject: [PATCH 08/10] Changes .more-information class to .help --- app/assets/stylesheets/layout.scss | 2 +- app/views/sandbox/admin_test_sandbox.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index 09902f649..cebd8c8eb 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -1641,7 +1641,7 @@ table { // 13. Pages // --------- -.more-information { +.help { li { border-bottom: 1px solid $border; diff --git a/app/views/sandbox/admin_test_sandbox.html.erb b/app/views/sandbox/admin_test_sandbox.html.erb index 5d61aab9d..69b7b521e 100644 --- a/app/views/sandbox/admin_test_sandbox.html.erb +++ b/app/views/sandbox/admin_test_sandbox.html.erb @@ -1,5 +1,5 @@
    -
    +

    Más información

    • From fc89c899cccdec7d444b68a9bdc539a760aba8be Mon Sep 17 00:00:00 2001 From: decabeza Date: Tue, 30 Jan 2018 18:28:05 +0100 Subject: [PATCH 09/10] Updates help url example on seeds --- db/seeds.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/seeds.rb b/db/seeds.rb index 008c81bdd..844a24d81 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -112,7 +112,7 @@ Setting['mailer_from_address'] = 'noreply@consul.dev' Setting['verification_offices_url'] = 'http://oficinas-atencion-ciudadano.url/' Setting['min_age_to_participate'] = 16 -# Proposal improvement url path ('/more-information/proposal-improvement') +# Proposal improvement url path ('/help/proposal-improvement') Setting['proposal_improvement_path'] = nil # City map feature default configuration (Greenwich) From 42d0f471ee8436d78a5d586c8eae7896f9e38be1 Mon Sep 17 00:00:00 2001 From: decabeza Date: Tue, 30 Jan 2018 19:10:48 +0100 Subject: [PATCH 10/10] Updates i18n keys and images folder --- .../images/{more_info => help}/budgets_en.png | Bin .../images/{more_info => help}/budgets_es.png | Bin .../images/{more_info => help}/budgets_fr.png | Bin .../images/{more_info => help}/budgets_nl.png | Bin .../{more_info => help}/budgets_pt-BR.png | Bin .../images/{more_info => help}/debates.png | Bin .../{more_info => help}/proposals_en.png | Bin .../{more_info => help}/proposals_es.png | Bin .../{more_info => help}/proposals_fr.png | Bin .../{more_info => help}/proposals_nl.png | Bin .../{more_info => help}/proposals_pt-BR.png | Bin app/views/pages/help/_budgets.html.erb | 22 ++++++++-------- app/views/pages/help/_debates.html.erb | 14 +++++----- app/views/pages/help/_menu.html.erb | 8 +++--- app/views/pages/help/_other.html.erb | 4 +-- app/views/pages/help/_polls.html.erb | 14 +++++----- app/views/pages/help/_proposals.html.erb | 12 ++++----- app/views/pages/help/_sidebar.html.erb | 6 ++--- app/views/pages/help/faq/index.html.erb | 10 ++++---- .../pages/help/how_to_use/index.html.erb | 4 +-- app/views/pages/help/index.html.erb | 24 +++++++++--------- config/locales/en/pages.yml | 4 +-- config/locales/es/pages.yml | 4 +-- spec/controllers/pages_controller_spec.rb | 6 ++--- 24 files changed, 66 insertions(+), 66 deletions(-) rename app/assets/images/{more_info => help}/budgets_en.png (100%) rename app/assets/images/{more_info => help}/budgets_es.png (100%) rename app/assets/images/{more_info => help}/budgets_fr.png (100%) rename app/assets/images/{more_info => help}/budgets_nl.png (100%) rename app/assets/images/{more_info => help}/budgets_pt-BR.png (100%) rename app/assets/images/{more_info => help}/debates.png (100%) rename app/assets/images/{more_info => help}/proposals_en.png (100%) rename app/assets/images/{more_info => help}/proposals_es.png (100%) rename app/assets/images/{more_info => help}/proposals_fr.png (100%) rename app/assets/images/{more_info => help}/proposals_nl.png (100%) rename app/assets/images/{more_info => help}/proposals_pt-BR.png (100%) diff --git a/app/assets/images/more_info/budgets_en.png b/app/assets/images/help/budgets_en.png similarity index 100% rename from app/assets/images/more_info/budgets_en.png rename to app/assets/images/help/budgets_en.png diff --git a/app/assets/images/more_info/budgets_es.png b/app/assets/images/help/budgets_es.png similarity index 100% rename from app/assets/images/more_info/budgets_es.png rename to app/assets/images/help/budgets_es.png diff --git a/app/assets/images/more_info/budgets_fr.png b/app/assets/images/help/budgets_fr.png similarity index 100% rename from app/assets/images/more_info/budgets_fr.png rename to app/assets/images/help/budgets_fr.png diff --git a/app/assets/images/more_info/budgets_nl.png b/app/assets/images/help/budgets_nl.png similarity index 100% rename from app/assets/images/more_info/budgets_nl.png rename to app/assets/images/help/budgets_nl.png diff --git a/app/assets/images/more_info/budgets_pt-BR.png b/app/assets/images/help/budgets_pt-BR.png similarity index 100% rename from app/assets/images/more_info/budgets_pt-BR.png rename to app/assets/images/help/budgets_pt-BR.png diff --git a/app/assets/images/more_info/debates.png b/app/assets/images/help/debates.png similarity index 100% rename from app/assets/images/more_info/debates.png rename to app/assets/images/help/debates.png diff --git a/app/assets/images/more_info/proposals_en.png b/app/assets/images/help/proposals_en.png similarity index 100% rename from app/assets/images/more_info/proposals_en.png rename to app/assets/images/help/proposals_en.png diff --git a/app/assets/images/more_info/proposals_es.png b/app/assets/images/help/proposals_es.png similarity index 100% rename from app/assets/images/more_info/proposals_es.png rename to app/assets/images/help/proposals_es.png diff --git a/app/assets/images/more_info/proposals_fr.png b/app/assets/images/help/proposals_fr.png similarity index 100% rename from app/assets/images/more_info/proposals_fr.png rename to app/assets/images/help/proposals_fr.png diff --git a/app/assets/images/more_info/proposals_nl.png b/app/assets/images/help/proposals_nl.png similarity index 100% rename from app/assets/images/more_info/proposals_nl.png rename to app/assets/images/help/proposals_nl.png diff --git a/app/assets/images/more_info/proposals_pt-BR.png b/app/assets/images/help/proposals_pt-BR.png similarity index 100% rename from app/assets/images/more_info/proposals_pt-BR.png rename to app/assets/images/help/proposals_pt-BR.png diff --git a/app/views/pages/help/_budgets.html.erb b/app/views/pages/help/_budgets.html.erb index 781463521..1e6cd251d 100644 --- a/app/views/pages/help/_budgets.html.erb +++ b/app/views/pages/help/_budgets.html.erb @@ -1,28 +1,28 @@

      - <%= t("pages.more_info.budgets.title") %> + <%= t("pages.help.budgets.title") %>

      - <%= t("pages.more_info.budgets.description", - link: link_to(t("pages.more_info.budgets.link"), budgets_path)).html_safe %> + <%= t("pages.help.budgets.description", + link: link_to(t("pages.help.budgets.link"), budgets_path)).html_safe %>

      • - <%= t("pages.more_info.budgets.feature") %> + <%= t("pages.help.budgets.feature") %>
        • -
      • <%= t("pages.more_info.budgets.phase_1_html", +
      • <%= t("pages.help.budgets.phase_1_html", org: setting['org_name']).html_safe %>
        • -
      • <%= t("pages.more_info.budgets.phase_2_html") %>
        • -
      • <%= t("pages.more_info.budgets.phase_3_html") %>
        • -
      • <%= t("pages.more_info.budgets.phase_4_html") %>
        • +
      • <%= t("pages.help.budgets.phase_2_html") %>
        • +
      • <%= t("pages.help.budgets.phase_3_html") %>
        • +
      • <%= t("pages.help.budgets.phase_4_html") %>
      -

      <%= t("pages.more_info.budgets.phase_5_html") %>

      +

      <%= t("pages.help.budgets.phase_5_html") %>

      - <%= image_tag "more_info/budgets_#{I18n.locale}.png", alt: t("pages.more_info.budgets.image_alt") %> -
      <%= t("pages.more_info.budgets.figcaption_html") %>
      + <%= image_tag "help/budgets_#{I18n.locale}.png", alt: t("pages.help.budgets.image_alt") %> +
      <%= t("pages.help.budgets.figcaption_html") %>
      diff --git a/app/views/pages/help/_debates.html.erb b/app/views/pages/help/_debates.html.erb index d8f3fdedd..a70d8b05b 100644 --- a/app/views/pages/help/_debates.html.erb +++ b/app/views/pages/help/_debates.html.erb @@ -1,25 +1,25 @@

      - <%= t("pages.more_info.debates.title") %> + <%= t("pages.help.debates.title") %>

      - <%= t("pages.more_info.debates.description", + <%= t("pages.help.debates.description", org: setting['org_name'], - link: link_to(t("pages.more_info.debates.link"), + link: link_to(t("pages.help.debates.link"), debates_path)).html_safe %>

      • - <%= t("pages.more_info.debates.feature_html", - link: link_to(t("pages.more_info.debates.feature_link", org: setting['org_name']), + <%= t("pages.help.debates.feature_html", + link: link_to(t("pages.help.debates.feature_link", org: setting['org_name']), new_user_registration_path)).html_safe %>
      - <%= image_tag "more_info/debates.png", alt: t("pages.more_info.debates.image_alt") %> -
      <%= t("pages.more_info.debates.figcaption") %>
      + <%= image_tag "help/debates.png", alt: t("pages.help.debates.image_alt") %> +
      <%= t("pages.help.debates.figcaption") %>
      diff --git a/app/views/pages/help/_menu.html.erb b/app/views/pages/help/_menu.html.erb index e48d47b5b..0a1b7ff85 100644 --- a/app/views/pages/help/_menu.html.erb +++ b/app/views/pages/help/_menu.html.erb @@ -3,21 +3,21 @@
        <% if feature?(:debates) %>
      • - <%= link_to t("pages.more_info.menu.debates"), "#debates", class: "button hollow expanded" %> + <%= link_to t("pages.help.menu.debates"), "#debates", class: "button hollow expanded" %>
        • <% end %> <% if feature?(:proposals) %>
      • - <%= link_to t("pages.more_info.menu.proposals"), "#proposals", class: "button hollow expanded" %> + <%= link_to t("pages.help.menu.proposals"), "#proposals", class: "button hollow expanded" %>
        • <% end %> <% if feature?(:budgets) %>
      • - <%= link_to t("pages.more_info.menu.budgets"), "#budgets", class: "button hollow expanded" %> + <%= link_to t("pages.help.menu.budgets"), "#budgets", class: "button hollow expanded" %>
        • <% end %>
      • - <%= link_to t("pages.more_info.menu.other"), "#other", class: "button hollow expanded" %> + <%= link_to t("pages.help.menu.other"), "#other", class: "button hollow expanded" %>
    diff --git a/app/views/pages/help/_other.html.erb b/app/views/pages/help/_other.html.erb index 5ed1b9f4e..bdae779d8 100644 --- a/app/views/pages/help/_other.html.erb +++ b/app/views/pages/help/_other.html.erb @@ -1,7 +1,7 @@ -

    <%= t("pages.more_info.other.title") %>

    +

    <%= t("pages.help.other.title") %>

      -
    • <%= link_to t("pages.more_info.other.how_to_use", org_name: setting['org_name']), how_to_use_path %>
      • +
    • <%= link_to t("pages.help.other.how_to_use", org_name: setting['org_name']), how_to_use_path %>
      • <% SiteCustomization::Page.with_more_info_flag.with_same_locale.each do |custom_page| %>
    • <%= link_to custom_page.title, page_path(custom_page.slug) %>
      • diff --git a/app/views/pages/help/_polls.html.erb b/app/views/pages/help/_polls.html.erb index 16a5c08bd..64a7d23f2 100644 --- a/app/views/pages/help/_polls.html.erb +++ b/app/views/pages/help/_polls.html.erb @@ -1,18 +1,18 @@
      -

      <%= t("pages.more_info.polls.title") %>

      +

      <%= t("pages.help.polls.title") %>

      - <%= t("pages.more_info.polls.description", - link: link_to(t("pages.more_info.polls.link"), polls_path)).html_safe %> + <%= t("pages.help.polls.description", + link: link_to(t("pages.help.polls.link"), polls_path)).html_safe %>

      • - <%= t("pages.more_info.polls.feature_1", - link: link_to(t("pages.more_info.polls.feature_1_link", org_name: setting['org_name']), + <%= t("pages.help.polls.feature_1", + link: link_to(t("pages.help.polls.feature_1_link", org_name: setting['org_name']), new_user_registration_path)).html_safe %>
        • -
      • <%= t("pages.more_info.polls.feature_2") %>
        • -
      • <%= t("pages.more_info.polls.feature_3") %>
        • +
      • <%= t("pages.help.polls.feature_2") %>
        • +
      • <%= t("pages.help.polls.feature_3") %>
      diff --git a/app/views/pages/help/_proposals.html.erb b/app/views/pages/help/_proposals.html.erb index c9f10f92e..c8333b5fd 100644 --- a/app/views/pages/help/_proposals.html.erb +++ b/app/views/pages/help/_proposals.html.erb @@ -1,23 +1,23 @@

      - <%= t("pages.more_info.proposals.title") %> + <%= t("pages.help.proposals.title") %>

      - <%= t("pages.more_info.proposals.description", - link: link_to(t("pages.more_info.proposals.link"), proposals_path)).html_safe %> + <%= t("pages.help.proposals.description", + link: link_to(t("pages.help.proposals.link"), proposals_path)).html_safe %>

      • - <%= t("pages.more_info.proposals.feature_html", + <%= t("pages.help.proposals.feature_html", org: setting['org_name'], supports: setting['votes_for_proposal_success']).html_safe %>
      - <%= image_tag "more_info/proposals_#{I18n.locale}.png", alt: t("pages.more_info.proposals.image_alt") %> -
      <%= t("pages.more_info.proposals.figcaption_html") %>
      + <%= image_tag "help/proposals_#{I18n.locale}.png", alt: t("pages.help.proposals.image_alt") %> +
      <%= t("pages.help.proposals.figcaption_html") %>
      diff --git a/app/views/pages/help/_sidebar.html.erb b/app/views/pages/help/_sidebar.html.erb index 09131685b..428aadf04 100644 --- a/app/views/pages/help/_sidebar.html.erb +++ b/app/views/pages/help/_sidebar.html.erb @@ -1,5 +1,5 @@
      -

      <%= t("pages.more_info.faq.title") %>

      -

      <%= t("pages.more_info.faq.description") %>

      - <%= link_to t("pages.more_info.faq.button"), faq_path, class: "button expanded" %> +

      <%= t("pages.help.faq.title") %>

      +

      <%= t("pages.help.faq.description") %>

      + <%= link_to t("pages.help.faq.button"), faq_path, class: "button expanded" %>
      diff --git a/app/views/pages/help/faq/index.html.erb b/app/views/pages/help/faq/index.html.erb index db8bfaf6e..36c7d98b8 100644 --- a/app/views/pages/help/faq/index.html.erb +++ b/app/views/pages/help/faq/index.html.erb @@ -7,15 +7,15 @@ <%= back_link_to %>
    -

    <%= t("pages.more_info.faq.page.title") %>

    -

    <%= t("pages.more_info.faq.page.description") %>

    +

    <%= t("pages.help.faq.page.title") %>

    +

    <%= t("pages.help.faq.page.description") %>

    -

    <%= t("pages.more_info.faq.page.faq_1_title") %>

    -

    <%= t("pages.more_info.faq.page.faq_1_description") %>

    +

    <%= t("pages.help.faq.page.faq_1_title") %>

    +

    <%= t("pages.help.faq.page.faq_1_description") %>

    diff --git a/app/views/pages/help/how_to_use/index.html.erb b/app/views/pages/help/how_to_use/index.html.erb index f396b69a1..8da48d35d 100644 --- a/app/views/pages/help/how_to_use/index.html.erb +++ b/app/views/pages/help/how_to_use/index.html.erb @@ -6,8 +6,8 @@
    <%= back_link_to %> -

    <%= t('pages.more_info.titles.how_to_use') %>

    +

    <%= t('pages.help.titles.how_to_use') %>

    - <%= markdown t('pages.more_info.how_to_use.text') %> + <%= markdown t('pages.help.how_to_use.text') %>
    diff --git a/app/views/pages/help/index.html.erb b/app/views/pages/help/index.html.erb index 7bb05d1f6..3ab4ae595 100644 --- a/app/views/pages/help/index.html.erb +++ b/app/views/pages/help/index.html.erb @@ -1,48 +1,48 @@ -<% provide :title do %><%= t("pages.titles.more_info", org: setting['org_name']) %><% end %> +<% provide :title do %><%= t("pages.titles.help", org: setting['org_name']) %><% end %> <% content_for :canonical do %> - <%= render "shared/canonical", href: more_info_url %> + <%= render "shared/canonical", href: help_url %> <% end %>
    -

    <%= t("pages.more_info.title", org: setting['org_name']) %>

    -

    <%= t("pages.more_info.subtitle", org: setting['org_name']) %>

    -

    <%= t("pages.more_info.guide", org: setting['org_name']) %>

    +

    <%= t("pages.help.title", org: setting['org_name']) %>

    +

    <%= t("pages.help.subtitle", org: setting['org_name']) %>

    +

    <%= t("pages.help.guide", org: setting['org_name']) %>

    - <%= render "pages/more_info/menu" %> + <%= render "pages/help/menu" %>
    <% if feature?(:debates) %> - <%= render "pages/more_info/debates" %> + <%= render "pages/help/debates" %> <% end %> <% if feature?(:proposals) %> - <%= render "pages/more_info/proposals" %> + <%= render "pages/help/proposals" %> <% end %> <% if feature?(:budgets) %> - <%= render "pages/more_info/budgets" %> + <%= render "pages/help/budgets" %> <% end %> <% if feature?(:polls) %> - <%= render "pages/more_info/polls" %> + <%= render "pages/help/polls" %> <% end %>
    - <%= render "pages/more_info/sidebar" %> + <%= render "pages/help/sidebar" %>
    - <%= render "pages/more_info/other" %> + <%= render "pages/help/other" %>
    diff --git a/config/locales/en/pages.yml b/config/locales/en/pages.yml index 38f6ed25d..3692052d1 100644 --- a/config/locales/en/pages.yml +++ b/config/locales/en/pages.yml @@ -3,7 +3,7 @@ en: census_terms: To confirm the account, you must be 16 or older and be registered, having provided the information requested previously, will verify. By accepting the verification process, you also consent to the verification of this information, as well as the contact methods featuring in said files. The data provided will be acquired and processed in a file mentioned previously in the terms and conditions of use for the Portal. conditions: Terms and conditions of use general_terms: Terms and Conditions - more_info: + help: title: "%{org} is a platform for citizen participation" subtitle: "In %{org} you can make proposals, vote in citizen consultations, propose participatory budget projects, decide on municipal regulations and open debates to exchange opinions with others." guide: "This guide explains what each of the %{org} sections are for and how they work." @@ -72,7 +72,7 @@ en: titles: accessibility: Accessibility conditions: Terms of use - more_info: "What is %{org}? - Citizen participation" + help: "What is %{org}? - Citizen participation" privacy: Privacy Policy verify: code: Code you received in letter diff --git a/config/locales/es/pages.yml b/config/locales/es/pages.yml index 4ea5a44a9..0667bdfd8 100644 --- a/config/locales/es/pages.yml +++ b/config/locales/es/pages.yml @@ -3,7 +3,7 @@ es: census_terms: Para verificar la cuenta hay que tener 16 años o más y estar empadronado aportando los datos indicados anteriormente, los cuales serán contrastados. Aceptando el proceso de verificación acepta dar su consentimiento para contrastar dicha información, así como medios de contacto que figuren en dichos ficheros. Los datos aportados serán incorporados y tratados en un fichero indicado anteriormente en las condiciones de uso del portal. conditions: Condiciones de uso general_terms: Términos y Condiciones - more_info: + help: title: "%{org} es una plataforma de participación ciudadana" subtitle: "En %{org} se pueden hacer propuestas, votar en consultas ciudadanas, plantear proyectos de presupuestos participativos, decidir la normativa municipal y abrir debates para intercambiar opiniones con otras personas." guide: 'Esta guía explica para qué sirven y cómo funcionan cada una de las secciones de %{org}.' @@ -72,7 +72,7 @@ es: titles: accessibility: Accesibilidad conditions: Condiciones de uso - more_info: "¿Qué es %{org}? - Participación ciudadana" + help: "¿Qué es %{org}? - Participación ciudadana" privacy: Política de Privacidad verify: code: Código que has recibido en tu carta diff --git a/spec/controllers/pages_controller_spec.rb b/spec/controllers/pages_controller_spec.rb index 17a17dc3c..e5c3cfd0a 100644 --- a/spec/controllers/pages_controller_spec.rb +++ b/spec/controllers/pages_controller_spec.rb @@ -32,17 +32,17 @@ describe PagesController do describe 'More info pages' do it 'includes a more info page' do - get :show, id: 'more_info/index' + get :show, id: 'help/index' expect(response).to be_ok end it 'includes a how_to_use page' do - get :show, id: 'more_info/how_to_use/index' + get :show, id: 'help/how_to_use/index' expect(response).to be_ok end it 'includes a faq page' do - get :show, id: 'more_info/faq/index' + get :show, id: 'help/faq/index' expect(response).to be_ok end end