consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removes custom content on proposals

Browse Source
This commit is contained in:
decabeza
2018-07-30 19:35:12 +02:00
parent e14b7b67fb
commit 71d45093b6
5 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/views/proposals/_proposal.html.erb
View File

@@ -70,8 +70,7 @@
<div class="padding text-center">
<p>
<%= t("proposals.proposal.successful",
voting: link_to(t("proposals.proposal.voting"), polls_path)).html_safe %>
<%= t("proposals.proposal.successful") %>
</p>
</div>
<% if can? :create, Poll::Question %>

2
app/views/proposals/_votes.html.erb
View File

@@ -9,7 +9,7 @@
<span class="total-supports">
<%= t("proposals.proposal.supports", count: proposal.total_votes) %>&nbsp;
<span>
<abbr title="<%= t("proposals.proposal.reason_for_supports_necessary") %>">
<abbr>
<%= t("proposals.proposal.supports_necessary", number: number_with_delimiter(Proposal.votes_needed_for_success)) %>
</abbr>
</span>

3
app/views/proposals/show.html.erb
View File

@@ -171,8 +171,7 @@
<% if @proposal.successful? %>
<p>
<%= t("proposals.proposal.successful",
voting: link_to(t("proposals.proposal.voting"), polls_path)).html_safe %>
<%= t("proposals.proposal.successful") %>
</p>
<% if can? :create, Poll::Question %>
<p class="text-center">

6
config/locales/en/general.yml
View File

@@ -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. <br>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:'

6
config/locales/es/general.yml
View File

@@ -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. <br>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:'