diff --git a/app/views/proposals/_proposal.html.erb b/app/views/proposals/_proposal.html.erb index 27cd38499..e1ffc0689 100644 --- a/app/views/proposals/_proposal.html.erb +++ b/app/views/proposals/_proposal.html.erb @@ -70,8 +70,7 @@

- <%= t("proposals.proposal.successful", - voting: link_to(t("proposals.proposal.voting"), polls_path)).html_safe %> + <%= t("proposals.proposal.successful") %>

<% if can? :create, Poll::Question %> diff --git a/app/views/proposals/_votes.html.erb b/app/views/proposals/_votes.html.erb index 98723513c..92b680493 100644 --- a/app/views/proposals/_votes.html.erb +++ b/app/views/proposals/_votes.html.erb @@ -9,7 +9,7 @@ <%= t("proposals.proposal.supports", count: proposal.total_votes) %>  - "> + <%= t("proposals.proposal.supports_necessary", number: number_with_delimiter(Proposal.votes_needed_for_success)) %> diff --git a/app/views/proposals/show.html.erb b/app/views/proposals/show.html.erb index ed385ab05..9794c0365 100644 --- a/app/views/proposals/show.html.erb +++ b/app/views/proposals/show.html.erb @@ -171,8 +171,7 @@ <% if @proposal.successful? %>

- <%= t("proposals.proposal.successful", - voting: link_to(t("proposals.proposal.voting"), polls_path)).html_safe %> + <%= t("proposals.proposal.successful") %>

<% if can? :create, Poll::Question %>

diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml index a491dfd45..c407f8f39 100644 --- a/config/locales/en/general.yml +++ b/config/locales/en/general.yml @@ -322,7 +322,7 @@ en: geozone: Scope of operation proposal_external_url: Link to additional documentation proposal_question: Proposal question - proposal_question_example_html: "Must be summarised in one question with a Yes or No answer.
E.g. 'Do you agree with the pedestrianisation of Calle Mayor?'" + proposal_question_example_html: "Must be summarised in one question with a Yes or No answer" proposal_responsible_name: Full name of the person submitting the proposal proposal_responsible_name_note: "(individually or as representative of a collective; will not be displayed publically)" proposal_summary: Proposal summary @@ -412,7 +412,6 @@ en: one: 1 comment other: "%{count} comments" zero: No comments - reason_for_supports_necessary: 1% of Census support: Support support_title: Support this proposal supports: @@ -426,8 +425,7 @@ en: supports_necessary: "%{number} supports needed" total_percent: 100% archived: "This proposal has been archived and can't collect supports." - successful: "This proposal has reached the required supports and will be voted in the %{voting}." - voting: "next voting" + successful: "This proposal has reached the required supports." show: author_deleted: User deleted code: 'Proposal code:' diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml index 2706862bc..f7b5e7fa2 100644 --- a/config/locales/es/general.yml +++ b/config/locales/es/general.yml @@ -322,7 +322,7 @@ es: geozone: Ámbito de actuación proposal_external_url: Enlace a documentación adicional proposal_question: Pregunta de la propuesta - proposal_question_example_html: "Debe ser resumida en una pregunta cuya respuesta sea Sí o No.
Ej. '¿Está usted de acuerdo en peatonalizar la calle Mayor?'" + proposal_question_example_html: "Debe ser resumida en una pregunta cuya respuesta sea Sí o No" proposal_responsible_name: Nombre y apellidos de la persona que hace esta propuesta proposal_responsible_name_note: "(individualmente o como representante de un colectivo; no se mostrará públicamente)" proposal_summary: Resumen de la propuesta @@ -412,7 +412,6 @@ es: zero: Sin comentarios one: 1 Comentario other: "%{count} Comentarios" - reason_for_supports_necessary: 1% del Censo support: Apoyar support_title: Apoyar esta propuesta supports: @@ -426,8 +425,7 @@ es: supports_necessary: "%{number} apoyos necesarios" total_percent: 100% archived: "Esta propuesta ha sido archivada y ya no puede recoger apoyos." - successful: "Esta propuesta ha alcanzado los apoyos necesarios y pasará a la %{voting}." - voting: "próxima votación" + successful: "Esta propuesta ha alcanzado los apoyos necesarios." show: author_deleted: Usuario eliminado code: 'Código de la propuesta:'