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

Merge pull request #1535 from consul/sidebar-msg

Browse Source 
Proper message in sidebar depending on user's ballot status
This commit is contained in:
Alberto
2017-05-12 19:49:05 +02:00
committed by GitHub
parent 1787caf23a 0395970b24
commit b6eaaea62e
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,6 +40,12 @@
amount_spent: @ballot.formatted_amount_spent(@heading)) %> amount_spent: @ballot.formatted_amount_spent(@heading)) %>
</em> </em>
</p> </p>
<% elsif @assigned_heading.present? %>
<p><%= t("budgets.investments.index.sidebar.different_heading_assigned_html",
heading_link: link_to(
@assigned_heading.name,
budget_investments_path(@budget, heading_id: @assigned_heading.try(:id)))
) %></p>
<% else %> <% else %>
<p><strong><%= t("budgets.investments.index.sidebar.zero") %></strong></p> <p><strong><%= t("budgets.investments.index.sidebar.zero") %></strong></p>
<% end %> <% end %>

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

@@ -63,7 +63,8 @@ en:
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. 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 voted_info_link: change your vote
zero: You have not voted any investment project. different_heading_assigned_html: "You have active votes in another heading: %{heading_link}"
zero: You have not voted any investment project in this group.
verified_only: "To create a new budget investment %{verify}." verified_only: "To create a new budget investment %{verify}."
verify_account: "verify your account" verify_account: "verify your account"
create: "Create budget investment" create: "Create budget investment"

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

@@ -63,7 +63,8 @@ es:
other: "<strong>Has votado %{count} propuestas por un valor de %{amount_spent}</strong>" other: "<strong>Has votado %{count} propuestas 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. 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 voted_info_link: cambiar tus votos
zero: "Todavía no has votado ninguna propuesta de inversión." different_heading_assigned_html: "Ya apoyaste propuestas de otra sección del presupuesto: %{heading_link}"
zero: "Todavía no has votado ninguna propuesta de inversión en este ámbito del presupuesto."
verified_only: "Para crear una nueva propuesta de inversión %{verify}." verified_only: "Para crear una nueva propuesta de inversión %{verify}."
verify_account: "verifica tu cuenta" verify_account: "verifica tu cuenta"
create: "Crear propuesta de inversión" create: "Crear propuesta de inversión"