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

Merge pull request #1534 from consul/budget-text

Browse Source 
changes add button text to vote
This commit is contained in:
Juanjo Bazán
2017-05-11 17:33:53 +02:00
committed by GitHub
parent b62eb8cd85 cd4d37470b
commit aca9866d4e
4 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/views/budgets/ballot/_ballot.html.erb
View File

@@ -27,11 +27,9 @@
<h3>
<%= group.name %> - <%= @ballot.heading_for_group(group).name %>
</h3>
<strong>
<%= link_to t("budgets.ballots.show.remaining",
amount: @ballot.formatted_amount_available(@ballot.heading_for_group(group))).html_safe,
budget_group_path(@budget, group) %>
</strong>
<%= link_to t("budgets.ballots.show.remaining",
amount: @ballot.formatted_amount_available(@ballot.heading_for_group(group))).html_safe,
budget_group_path(@budget, group) %>
</div>
<% if @ballot.has_lines_in_group?(group) %>
<h4 class="amount-spent text-right">
@@ -62,9 +60,7 @@
<h3>
<%= group.name %>
</h3>
<strong>
<%= link_to t("budgets.ballots.show.no_balloted_group_yet"), budget_group_path(@budget, group) %>
</strong>
<%= link_to t("budgets.ballots.show.no_balloted_group_yet"), budget_group_path(@budget, group) %>
</div>
</div>
</div>

12
app/views/budgets/investments/_sidebar.html.erb
View File

@@ -13,6 +13,14 @@
<% end %>
<% end %>
<% if @heading && can?(:show, @ballot) %>
<p class="callout">
<%= t("budgets.investments.index.sidebar.voted_info",
link: link_to(t("budgets.investments.index.sidebar.voted_info_link"),
budget_ballot_path(@budget))).html_safe %>
</p>
<% end %>
<%= render "shared/tag_cloud", taggable: 'budget/investment' %>
<%= render 'budgets/investments/categories' %>
@@ -45,8 +53,4 @@
<% end %>
<% end %>
</ul>
<p class="callout primary">
<%= t("budgets.investments.index.sidebar.voted_info") %>
</p>
<% end %>

7
config/locales/budgets.en.yml
View File

@@ -10,7 +10,7 @@ en:
voted_html:
one: "You have voted <span>one</span> investment."
other: "You have voted <span>%{count}</span> investments."
voted_info_html: "You can change your vote at any time until the close of this phase.<br> No need to invest all the money available."
voted_info_html: "You can change your vote at any time until the close of this phase.<br> No need to spend all the money available."
zero: You have not voted any investment project.
reasons_for_not_balloting:
not_logged_in: You must %{signin} or %{signup} to continue.
@@ -61,7 +61,8 @@ en:
voted_html:
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>"
voted_info: You can change your vote at any time until the close of this phase. No need to spend all the money available.
voted_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
zero: You have not voted any investment project.
verified_only: "To create a new budget investment %{verify}."
verify_account: "verify your account"
@@ -91,7 +92,7 @@ en:
wrong_price_format: Only integer numbers
investment:
title: Investment project
add: Add
add: Vote
already_added: You have already added this investment project
already_supported: You have already supported this. Share it!
support_title: Support this project

7
config/locales/budgets.es.yml
View File

@@ -10,7 +10,7 @@ es:
voted_html:
one: "Has votado <span>una</span> propuesta."
other: "Has votado <span>%{count}</span> propuestas."
voted_info_html: "Puedes cambiar tus votos en cualquier momento hasta el cierre de esta fase.<br> No hace falta que inviertas todo el dinero disponible."
voted_info_html: "Puedes cambiar tus votos en cualquier momento hasta el cierre de esta fase.<br> No hace falta que gastes todo el dinero disponible."
zero: "Todavía no has votado ninguna propuesta de inversión."
reasons_for_not_balloting:
not_logged_in: Necesitas %{signin} o %{signup} para continuar.
@@ -61,7 +61,8 @@ es:
voted_html:
one: "<strong>Has votado una propuesta por un valor de %{amount_spent}</strong>"
other: "<strong>Has votado %{count} propuestas por un valor de %{amount_spent}</strong>"
voted_info: Puedes cambiar tus votos en cualquier momento hasta el cierre de esta fase. No hace falta que gastes todo el dinero disponible.
voted_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
zero: "Todavía no has votado ninguna propuesta de inversión."
verified_only: "Para crear una nueva propuesta de inversión %{verify}."
verify_account: "verifica tu cuenta"
@@ -91,7 +92,7 @@ es:
wrong_price_format: Solo puede incluir caracteres numéricos
investment:
title: Propuesta de inversión
add: Añadir
add: Votar
already_added: "Ya has añadido esta propuesta de inversión"
already_supported: Ya has apoyado esta propuesta. ¡Compártelo!
support_title: Apoyar esta propuesta