diff --git a/app/helpers/documents_helper.rb b/app/helpers/documents_helper.rb index da1588398..a096f7346 100644 --- a/app/helpers/documents_helper.rb +++ b/app/helpers/documents_helper.rb @@ -54,6 +54,6 @@ module DocumentsHelper #{number_to_human_size(document.attachment_file_size)})".html_safe, document.attachment.url, target: "_blank", - title: t("shared.target_blank_html") + title: t("shared.target_blank") end end diff --git a/app/views/budgets/ballot/_ballot.html.erb b/app/views/budgets/ballot/_ballot.html.erb index e99de7510..fc5d9a128 100644 --- a/app/views/budgets/ballot/_ballot.html.erb +++ b/app/views/budgets/ballot/_ballot.html.erb @@ -10,7 +10,7 @@ count: @ballot.investments.count) %>

- <%= t("budgets.ballots.show.voted_info_html") %> + <%= t("budgets.ballots.show.voted_info") %>

<%= t("budgets.ballots.show.voted_info_2") %>

diff --git a/app/views/debates/new.html.erb b/app/views/debates/new.html.erb index cf3cbc7b9..4e9368c2d 100644 --- a/app/views/debates/new.html.erb +++ b/app/views/debates/new.html.erb @@ -9,7 +9,7 @@ info_link: link_to(t("debates.new.info_link"), new_proposal_path)).html_safe %> <% if feature?(:help_page) %> - <%= link_to help_path, title: t("shared.target_blank_html"), target: "_blank" do %> + <%= link_to help_path, title: t("shared.target_blank"), target: "_blank" do %> <%= t("debates.new.more_info") %> <% end %> <% end %> diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb index ebd7dc990..160134d8e 100644 --- a/app/views/layouts/_footer.html.erb +++ b/app/views/layouts/_footer.html.erb @@ -38,7 +38,7 @@ <% if setting["twitter_handle"] %>
  • <%= link_to "https://twitter.com/#{setting["twitter_handle"]}", target: "_blank", - title: t("shared.go_to_page") + t("social.twitter", org: setting["org_name"]) + t("shared.target_blank_html") do %> + title: t("shared.go_to_page") + t("social.twitter", org: setting["org_name"]) + t("shared.target_blank") do %> <%= t("social.twitter", org: setting["org_name"]) %> <% end %> @@ -47,7 +47,7 @@ <% if setting["facebook_handle"] %>
  • <%= link_to "https://www.facebook.com/#{setting["facebook_handle"]}/", target: "_blank", - title: t("shared.go_to_page") + t("social.facebook", org: setting["org_name"]) + t("shared.target_blank_html") do %> + title: t("shared.go_to_page") + t("social.facebook", org: setting["org_name"]) + t("shared.target_blank") do %> <%= t("social.facebook", org: setting["org_name"]) %> <% end %> @@ -56,7 +56,7 @@ <% if setting["youtube_handle"] %>
  • <%= link_to "https://www.youtube.com/#{setting["youtube_handle"]}", target: "_blank", - title: t("shared.go_to_page") + t("social.youtube", org: setting["org_name"]) + t("shared.target_blank_html") do %> + title: t("shared.go_to_page") + t("social.youtube", org: setting["org_name"]) + t("shared.target_blank") do %> <%= t("social.youtube", org: setting["org_name"]) %> <% end %> @@ -65,7 +65,7 @@ <% if setting["telegram_handle"] %>
  • <%= link_to "https://www.telegram.me/#{setting["telegram_handle"]}", target: "_blank", - title: t("shared.go_to_page") + t("social.telegram", org: setting["org_name"]) + t("shared.target_blank_html") do %> + title: t("shared.go_to_page") + t("social.telegram", org: setting["org_name"]) + t("shared.target_blank") do %> <%= t("social.telegram", org: setting["org_name"]) %> <% end %> @@ -74,7 +74,7 @@ <% if setting["instagram_handle"] %>
  • <%= link_to "https://www.instagram.com/#{setting["instagram_handle"]}", target: "_blank", - title: t("shared.go_to_page") + t("social.instagram", org: setting["org_name"]) + t("shared.target_blank_html") do %> + title: t("shared.go_to_page") + t("social.instagram", org: setting["org_name"]) + t("shared.target_blank") do %> <%= t("social.instagram", org: setting["org_name"]) %> <% end %> diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index e7a5480ec..e9662d726 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -32,9 +32,9 @@

    <%= t("layouts.application.ie", chrome: link_to( - t("layouts.application.chrome"), "https://www.google.com/chrome/browser/desktop/", title: t("shared.target_blank_html"), target: "_blank"), + t("layouts.application.chrome"), "https://www.google.com/chrome/browser/desktop/", title: t("shared.target_blank"), target: "_blank"), firefox: link_to( - t("layouts.application.firefox"), "https://www.mozilla.org/firefox", title: t("shared.target_blank_html"), target: "_blank") + t("layouts.application.firefox"), "https://www.mozilla.org/firefox", title: t("shared.target_blank"), target: "_blank") ).html_safe %>

    diff --git a/app/views/organizations/registrations/new.html.erb b/app/views/organizations/registrations/new.html.erb index 705f27fde..f9100fec6 100644 --- a/app/views/organizations/registrations/new.html.erb +++ b/app/views/organizations/registrations/new.html.erb @@ -32,7 +32,7 @@ label: t("devise_views.users.registrations.new.terms", terms: link_to(t("devise_views.users.registrations.new.terms_link"), "/conditions", - title: t("shared.target_blank_html"), + title: t("shared.target_blank"), target: "_blank") ).html_safe %> diff --git a/app/views/organizations/registrations/success.html.erb b/app/views/organizations/registrations/success.html.erb index 550f06342..d526133bc 100644 --- a/app/views/organizations/registrations/success.html.erb +++ b/app/views/organizations/registrations/success.html.erb @@ -2,7 +2,7 @@

    <%= t("devise_views.organizations.registrations.success.thank_you_html") %>

    <%= t("devise_views.organizations.registrations.success.instructions_1_html") %>

    <%= t("devise_views.organizations.registrations.success.instructions_2_html") %>

    -

    <%= t("devise_views.organizations.registrations.success.instructions_3_html") %>

    +

    <%= t("devise_views.organizations.registrations.success.instructions_3") %>

    <%= link_to t("devise_views.organizations.registrations.success.back_to_index"), root_path, class: "button margin-top expanded" %> diff --git a/app/views/pages/help/_budgets.html.erb b/app/views/pages/help/_budgets.html.erb index 116bb0deb..0371a038c 100644 --- a/app/views/pages/help/_budgets.html.erb +++ b/app/views/pages/help/_budgets.html.erb @@ -10,7 +10,7 @@

    <%= image_tag "help/budgets_#{I18n.locale}.png", alt: t("pages.help.budgets.image_alt") %> -
    <%= t("pages.help.budgets.figcaption_html") %>
    +
    <%= t("pages.help.budgets.figcaption") %>
    diff --git a/app/views/pages/help/_proposals.html.erb b/app/views/pages/help/_proposals.html.erb index 6cc932242..ececd3b85 100644 --- a/app/views/pages/help/_proposals.html.erb +++ b/app/views/pages/help/_proposals.html.erb @@ -10,7 +10,7 @@
    <%= image_tag "help/proposals_#{I18n.locale}.png", alt: t("pages.help.proposals.image_alt") %> -
    <%= t("pages.help.proposals.figcaption_html") %>
    +
    <%= t("pages.help.proposals.figcaption") %>
    diff --git a/app/views/proposals/new.html.erb b/app/views/proposals/new.html.erb index f7fc3b335..8c1da0eb9 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 help_path(anchor: "proposals"), title: t("shared.target_blank_html"), target: "_blank" do %> + <%= link_to help_path(anchor: "proposals"), title: t("shared.target_blank"), target: "_blank" do %> <%= t("proposals.new.more_info") %> <% end %>
    diff --git a/app/views/users/registrations/new.html.erb b/app/views/users/registrations/new.html.erb index c97b1befb..de50cc265 100644 --- a/app/views/users/registrations/new.html.erb +++ b/app/views/users/registrations/new.html.erb @@ -40,7 +40,7 @@ title: t("devise_views.users.registrations.new.terms_title"), label: t("devise_views.users.registrations.new.terms", terms: link_to(t("devise_views.users.registrations.new.terms_link"), "/conditions", - title: t("shared.target_blank_html"), + title: t("shared.target_blank"), target: "_blank") ).html_safe %> diff --git a/app/views/users/registrations/success.html.erb b/app/views/users/registrations/success.html.erb index 900e29557..e622aeabe 100644 --- a/app/views/users/registrations/success.html.erb +++ b/app/views/users/registrations/success.html.erb @@ -1,7 +1,7 @@

    <%= t("devise_views.users.registrations.success.title") %>

    <%= t("devise_views.users.registrations.success.thank_you_html") %>

    <%= t("devise_views.users.registrations.success.instructions_1_html") %>

    -

    <%= t("devise_views.users.registrations.success.instructions_2_html") %>

    +

    <%= t("devise_views.users.registrations.success.instructions_2") %>

    <%= link_to t("devise_views.users.registrations.success.back_to_index"), root_path, class: "button margin-top expanded" %> diff --git a/app/views/verification/residence/new.html.erb b/app/views/verification/residence/new.html.erb index cb77a4f46..6933f94f9 100644 --- a/app/views/verification/residence/new.html.erb +++ b/app/views/verification/residence/new.html.erb @@ -78,7 +78,7 @@ title: t("verification.residence.new.accept_terms_text_title"), label: t("verification.residence.new.accept_terms_text", terms_url: link_to(t("verification.residence.new.terms"), "/census_terms", - title: t("shared.target_blank_html"), + title: t("shared.target_blank"), target: "_blank") ).html_safe %> diff --git a/config/locales/en/budgets.yml b/config/locales/en/budgets.yml index 92fd1b8bd..7871f5a61 100644 --- a/config/locales/en/budgets.yml +++ b/config/locales/en/budgets.yml @@ -10,7 +10,7 @@ en: voted_html: one: "You have voted one investment." other: "You have voted %{count} investments." - voted_info_html: "Your ballot is confirmed!" + voted_info: "Your ballot is confirmed!" voted_info_2: "But you can change your vote at any time until this phase is closed." zero: You have not voted any investment project. reasons_for_not_balloting: diff --git a/config/locales/en/devise_views.yml b/config/locales/en/devise_views.yml index 41ceae937..2840069d7 100644 --- a/config/locales/en/devise_views.yml +++ b/config/locales/en/devise_views.yml @@ -52,7 +52,7 @@ en: back_to_index: I understand; go back to main page instructions_1_html: "We will contact you soon to verify that you do in fact represent this collective." instructions_2_html: While your email is reviewed, we have sent you a link to confirm your account. - instructions_3_html: Once confirmed, you may begin to participate as an unverified collective. + instructions_3: Once confirmed, you may begin to participate as an unverified collective. thank_you_html: Thank you for registering your collective on the website. It is now pending verification. title: Registration of organisation / collective passwords: @@ -124,6 +124,6 @@ en: success: back_to_index: I understand; go back to main page instructions_1_html: Please check your email - we have sent you a link to confirm your account. - instructions_2_html: Once confirmed, you may begin participation. + instructions_2: Once confirmed, you may begin participation. thank_you_html: Thank you for registering for the website. You must now confirm your email address. title: Confirm your email address diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml index fcdba9cca..105cbf783 100644 --- a/config/locales/en/general.yml +++ b/config/locales/en/general.yml @@ -773,7 +773,7 @@ en: districts: "Districts" districts_list: "Districts list" categories: "Categories" - target_blank_html: " (link opens in new window)" + target_blank: " (link opens in new window)" you_are_in: "You are in" unflag: Unflag unfollow_entity: "Unfollow %{entity}" diff --git a/config/locales/en/pages.yml b/config/locales/en/pages.yml index 4cc92db43..abe473675 100644 --- a/config/locales/en/pages.yml +++ b/config/locales/en/pages.yml @@ -27,13 +27,13 @@ en: 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" image_alt: "Button to support a proposal" - figcaption_html: 'Button to "Support" a proposal.' + figcaption: 'Button to "Support" a proposal.' budgets: title: "Participatory Budgeting" description: "The %{link} section helps people make a direct decision on what part of the municipal budget is spent on." link: "participative budgets" image_alt: "Different phases of a participatory budget" - figcaption_html: '"Support" and "Voting" phases of participatory budgets.' + figcaption: '"Support" and "Voting" phases of participatory budgets.' polls: title: "Polls" 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." diff --git a/config/locales/es/budgets.yml b/config/locales/es/budgets.yml index 16ed2b4c0..a73292b76 100644 --- a/config/locales/es/budgets.yml +++ b/config/locales/es/budgets.yml @@ -10,7 +10,7 @@ es: voted_html: one: "Has votado un proyecto." other: "Has votado %{count} proyectos." - voted_info_html: "¡Tus votos están confirmados!" + voted_info: "¡Tus votos están confirmados!" voted_info_2: "Pero puedes cambiarlos en cualquier momento hasta el cierre de esta fase." zero: Todavía no has votado ningún proyecto de gasto. reasons_for_not_balloting: diff --git a/config/locales/es/devise_views.yml b/config/locales/es/devise_views.yml index 9e2581d9a..5134b29e2 100644 --- a/config/locales/es/devise_views.yml +++ b/config/locales/es/devise_views.yml @@ -52,7 +52,7 @@ es: back_to_index: Entendido, volver a la página principal instructions_1_html: "En breve nos pondremos en contacto contigo para verificar que realmente representas a este colectivo." instructions_2_html: Mientras revisa tu correo electrónico, te hemos enviado un enlace para confirmar tu cuenta. - instructions_3_html: Una vez confirmado, podrás empezar a participar como colectivo no verificado. + instructions_3: Una vez confirmado, podrás empezar a participar como colectivo no verificado. thank_you_html: Gracias por registrar tu colectivo en la web. Ahora está pendiente de verificación. title: Registro de organización / colectivo passwords: @@ -124,6 +124,6 @@ es: success: back_to_index: Entendido, volver a la página principal instructions_1_html: Por favor revisa tu correo electrónico - te hemos enviado un enlace para confirmar tu cuenta. - instructions_2_html: Una vez confirmado, podrás empezar a participar. + instructions_2: Una vez confirmado, podrás empezar a participar. thank_you_html: Gracias por registrarte en la web. Ahora debes confirmar tu correo. title: Revisa tu correo diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml index 680e12920..eb25dd7fd 100644 --- a/config/locales/es/general.yml +++ b/config/locales/es/general.yml @@ -770,7 +770,7 @@ es: districts: "Distritos" districts_list: "Listado de distritos" categories: "Categorías" - target_blank_html: " (se abre en ventana nueva)" + target_blank: " (se abre en ventana nueva)" you_are_in: "Estás en" unflag: Deshacer denuncia unfollow_entity: "Dejar de seguir %{entity}" diff --git a/config/locales/es/pages.yml b/config/locales/es/pages.yml index 33835a1e3..333366f65 100644 --- a/config/locales/es/pages.yml +++ b/config/locales/es/pages.yml @@ -27,13 +27,13 @@ es: 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" image_alt: "Botón para apoyar una propuesta" - figcaption_html: 'Botón para "Apoyar" una propuesta.' + figcaption: 'Botón para "Apoyar" una propuesta.' budgets: title: "Presupuestos participativos" 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" image_alt: "Diferentes fases de un presupuesto participativo" - figcaption_html: 'Fase de "Apoyos" y fase de "Votación" de los presupuestos participativos.' + figcaption: 'Fase de "Apoyos" y fase de "Votación" de los presupuestos participativos.' polls: title: "Votaciones" 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."