diff --git a/app/views/debates/new.html.erb b/app/views/debates/new.html.erb index cd4a92cc6..ccd11bec2 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_information", title: t('shared.target_blank_html'), target: "_blank" do %> + <%= link_to more_info_path, title: t('shared.target_blank_html'), target: "_blank" do %> <%= t("debates.new.more_info") %> <% end %>
diff --git a/app/views/pages/more_info/_menu.html.erb b/app/views/pages/more_info/_menu.html.erb index e820b7bd0..85097e6a8 100644 --- a/app/views/pages/more_info/_menu.html.erb +++ b/app/views/pages/more_info/_menu.html.erb @@ -3,19 +3,19 @@ diff --git a/app/views/pages/more_info/how_to_use/index.html.erb b/app/views/pages/more_info/how_to_use/index.html.erb index a594961a8..9c6ccfb00 100644 --- a/app/views/pages/more_info/how_to_use/index.html.erb +++ b/app/views/pages/more_info/how_to_use/index.html.erb @@ -2,8 +2,8 @@
<%= render "shared/back_link" %> -

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

+

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

- <%= markdown t('pages.more_information.how_to_use.text') %> + <%= markdown t('pages.more_info.how_to_use.text') %>
diff --git a/app/views/pages/more_info/index.html.erb b/app/views/pages/more_info/index.html.erb index 5521d8748..4c40a9fee 100644 --- a/app/views/pages/more_info/index.html.erb +++ b/app/views/pages/more_info/index.html.erb @@ -1,11 +1,11 @@ -<% provide :title do %><%= t("pages.titles.more_information", org_name: setting['org_name']) %><% end %> +<% provide :title do %><%= t("pages.titles.more_info", org_name: setting['org_name']) %><% end %>
-

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

-

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

-

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

+

<%= 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']) %>

diff --git a/app/views/shared/_subnavigation.html.erb b/app/views/shared/_subnavigation.html.erb index d44090712..148612773 100644 --- a/app/views/shared/_subnavigation.html.erb +++ b/app/views/shared/_subnavigation.html.erb @@ -37,7 +37,7 @@ <% end %>
  • - <%= link_to t("layouts.header.more_information"), + <%= link_to t("layouts.header.more_info"), more_info_path, accesskey: "5", class: ("active" if current_page?(more_info_path)) %> diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index 978ff489c..32124a950 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -4,7 +4,7 @@

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

    <%= t("layouts.header.open_city_slogan_html") %>  - <%= link_to t("layouts.header.more_information"), page_path('more_information') %> + <%= link_to t("layouts.header.more_info"), more_info_path %>

    <%= link_to t("layouts.header.see_all"), proposals_path, class: "button see-more expanded" %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 5be58033b..a2d64835d 100755 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -198,7 +198,7 @@ en: management: Management moderation: Moderation valuation: Valuation - more_information: More information + more_info: More information my_account_link: My account my_activity_link: My activity notifications: Notifications diff --git a/config/locales/es.yml b/config/locales/es.yml index 47181b03d..3160ed7c5 100755 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -198,7 +198,7 @@ es: management: Gestión moderation: Moderar valuation: Evaluación - more_information: Más información + more_info: Más información my_account_link: Mi cuenta my_activity_link: Mi actividad notifications: Notificaciones diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 0432114c4..565cd5609 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -875,7 +875,7 @@ fr: locale: 'Langue :' logo: Consul logo moderation: Modération - more_information: Plus d'information + more_info: Plus d'information my_account_link: Mon compte my_activity_link: Mon activité new_notifications: @@ -1166,7 +1166,7 @@ fr: mentionnées dans les conditions d'utilisation de ce portail." conditions: Conditions d'utilisation general_terms: Conditions d'utilisation - more_information: + more_info: description: faq: Questions fréquentes sur les problèmes techniques how_it_works: Découvrez tout ce qui est possible de faire avec ce site @@ -1231,7 +1231,7 @@ fr: titles: accessibility: Accessibilité conditions: Conditions d'utilisation - more_information: Plus d'informations + more_info: Plus d'informations opendata: Open Data privacy: Vie privée verify: @@ -1629,7 +1629,7 @@ fr: link: Voir les propositions text: Créez vos propres propositions et soutenez celles d'autres citoyens. title: Propositions citoyennes - more_information: Plus d'information sur cette page + more_info: Plus d'information sur cette page proposal: alt: Icône Proposez description: Espace ouvert aux propositions sur le type de ville que nous voulons diff --git a/config/locales/pages.en.yml b/config/locales/pages.en.yml index 36b69b9e9..f6a28e80c 100755 --- a/config/locales/pages.en.yml +++ b/config/locales/pages.en.yml @@ -4,7 +4,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_information: + more_info: title: "Discover %{org_name}" subtitle: "Learn everything you can do on this website." guide: This guide explains each of the sections of %{org_name}. You can expand the information on "Detailed information" links.' @@ -26,7 +26,7 @@ en: titles: accessibility: Accessibility conditions: Terms of use - more_information: "More information about %{org_name}" + more_info: "More information about %{org_name}" privacy: Privacy Policy verify: code: Code you received in letter diff --git a/config/locales/pages.es.yml b/config/locales/pages.es.yml index 79d01685c..2479a23e6 100644 --- a/config/locales/pages.es.yml +++ b/config/locales/pages.es.yml @@ -4,7 +4,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_information: + more_info: title: "Descubre %{org_name}" subtitle: "Aprende todo lo que puedes hacer en esta web." guide: 'Esta guía explica de cada una de las secciones de %{org_name}. Puedes ampliar la información en los enlaces de "Información detallada".' @@ -26,7 +26,7 @@ es: titles: accessibility: Accesibilidad conditions: Condiciones de uso - more_information: "Más información sobre %{org_name}" + more_info: "Más información sobre %{org_name}" privacy: Política de Privacidad verify: code: Código que has recibido en tu carta diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index d8a6a4031..298d536ab 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -861,7 +861,7 @@ pt-BR: locale: 'Idioma:' logo: Consul logotipo moderation: Moderação - more_information: Mais informações + more_info: Mais informações my_account_link: Minha conta my_activity_link: Minha atividade new_notifications: @@ -1148,7 +1148,7 @@ pt-BR: mencionado previamente nos termos e condições de uso deste Portal. conditions: Termos e condições de uso general_terms: Termos e condições - more_information: + more_info: description: faq: Perguntas frequentes feitas sobre problemas técnicos how_it_works: Descubra tudo que você pode fazer com este website. @@ -1247,7 +1247,7 @@ pt-BR: titles: accessibility: Acessibilidade conditions: Termos de uso - more_information: Mais informações + more_info: Mais informações opendata: Dados abertos privacy: Política de privacidade verify: @@ -1640,7 +1640,7 @@ pt-BR: link: Mostrar propostas text: Criar suas próprias propostas e apoiar aquelas de outros cidadãos title: Propostas cidadãs - more_information: Mais informações sobre esta página + more_info: Mais informações sobre esta página proposal: alt: "Ícone proposta" description: Espaço aberto para propostas cidadãs sobre o tipo de cidade dentro da qual nós queremos viver. diff --git a/config/routes.rb b/config/routes.rb index 685ea6b76..b66410e22 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -311,7 +311,7 @@ Rails.application.routes.draw do mount Tolk::Engine => '/translate', :as => 'tolk' - # more information pages + # 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' diff --git a/spec/controllers/pages_controller_spec.rb b/spec/controllers/pages_controller_spec.rb index 61eef949a..b72bf032e 100644 --- a/spec/controllers/pages_controller_spec.rb +++ b/spec/controllers/pages_controller_spec.rb @@ -31,7 +31,7 @@ describe PagesController do describe 'More info pages' do - it 'should include a more_information page' do + it 'should include a more info page' do get :show, id: 'more_info/index' expect(response).to be_ok end