Make translations more consistent

We're passing the amount as a paramenter to the "remaining" text, so it
makes sense to pass it to the "amount spent" text as well.

Here we're also changing the I18n key to the text saying users can
change their vote, so it's easier to note the text is about changing
their vote, and not about the projects they have voted so far.
This commit is contained in:
Javi Martín
2020-07-13 02:04:41 +02:00
parent ad094e5063
commit ad6d830c1f
4 changed files with 10 additions and 12 deletions

View File

@@ -32,10 +32,8 @@
</div> </div>
<% if @ballot.has_lines_in_group?(group) %> <% if @ballot.has_lines_in_group?(group) %>
<h4 class="amount-spent text-right"> <h4 class="amount-spent text-right">
<%= t("budgets.ballots.show.amount_spent") %> <%= sanitize(t("budgets.ballots.show.amount_spent",
<span> amount: @ballot.formatted_amount_spent(heading))) %>
<%= @ballot.formatted_amount_spent(heading) %>
</span>
</h4> </h4>
<% else %> <% else %>
<p> <p>

View File

@@ -14,8 +14,8 @@
<% if @heading && can?(:show, @ballot) %> <% if @heading && can?(:show, @ballot) %>
<p class="callout"> <p class="callout">
<%= sanitize(t("budgets.investments.index.sidebar.voted_info", <%= sanitize(t("budgets.investments.index.sidebar.change_vote_info",
link: link_to(t("budgets.investments.index.sidebar.voted_info_link"), link: link_to(t("budgets.investments.index.sidebar.change_vote_link"),
budget_ballot_path(@budget)))) %> budget_ballot_path(@budget)))) %>
</p> </p>
<% end %> <% end %>

View File

@@ -3,7 +3,7 @@ en:
ballots: ballots:
show: show:
title: Your ballot title: Your ballot
amount_spent: Amount spent amount_spent: "Amount spent <span>%{amount}</span>"
remaining: "You still have <span>%{amount}</span> to invest." remaining: "You still have <span>%{amount}</span> to invest."
no_balloted_group_yet: "You have not voted on this group yet, go vote!" no_balloted_group_yet: "You have not voted on this group yet, go vote!"
remove: Remove vote remove: Remove vote
@@ -87,8 +87,8 @@ en:
voted: voted:
one: "<strong>You voted one proposal with a cost of %{amount_spent}</strong>" one: "<strong>You voted one proposal with a cost of %{amount_spent}</strong>"
other: "<strong>You voted %{count} proposals with a cost of %{amount_spent}</strong>" other: "<strong>You voted %{count} proposals with a cost of %{amount_spent}</strong>"
voted_info: You can %{link} at any time until the close of this phase. No need to spend all the money available. change_vote_info: "You can %{link} at any time until the close of this phase. No need to spend all the money available."
voted_info_link: change your vote change_vote_link: "change your vote"
different_heading_assigned: "You have active votes in another heading: %{heading_link}" different_heading_assigned: "You have active votes in another heading: %{heading_link}"
change_ballot: "If your change your mind you can remove your votes in %{check_ballot} and start again." change_ballot: "If your change your mind you can remove your votes in %{check_ballot} and start again."
check_ballot_link: "check and confirm my ballot" check_ballot_link: "check and confirm my ballot"

View File

@@ -3,7 +3,7 @@ es:
ballots: ballots:
show: show:
title: Mis votos title: Mis votos
amount_spent: Coste total amount_spent: "Coste total <span>%{amount}</span>"
remaining: "Te quedan <span>%{amount}</span> para invertir" remaining: "Te quedan <span>%{amount}</span> para invertir"
no_balloted_group_yet: "Todavía no has votado proyectos de este grupo, ¡vota!" no_balloted_group_yet: "Todavía no has votado proyectos de este grupo, ¡vota!"
remove: Quitar voto remove: Quitar voto
@@ -87,8 +87,8 @@ es:
voted: voted:
one: "<strong>Has votado un proyecto por un valor de %{amount_spent}</strong>" one: "<strong>Has votado un proyecto por un valor de %{amount_spent}</strong>"
other: "<strong>Has votado %{count} proyectos por un valor de %{amount_spent}</strong>" other: "<strong>Has votado %{count} proyectos por un valor de %{amount_spent}</strong>"
voted_info: Puedes %{link} en cualquier momento hasta el cierre de esta fase. No hace falta que gastes todo el dinero disponible. change_vote_info: "Puedes %{link} en cualquier momento hasta el cierre de esta fase. No hace falta que gastes todo el dinero disponible."
voted_info_link: cambiar tus votos change_vote_link: "cambiar tus votos"
different_heading_assigned: "Ya apoyaste proyectos de otra sección del presupuesto: %{heading_link}" different_heading_assigned: "Ya apoyaste proyectos de otra sección del presupuesto: %{heading_link}"
change_ballot: "Si cambias de opinión puedes borrar tus votos en %{check_ballot} y volver a empezar." change_ballot: "Si cambias de opinión puedes borrar tus votos en %{check_ballot} y volver a empezar."
check_ballot_link: "revisar y confirmar mis votos" check_ballot_link: "revisar y confirmar mis votos"