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

fixes i18n

Browse Source
This commit is contained in:
kikito
2016-12-08 11:49:13 +01:00
parent 748fd8becf
commit 869f7b39d6
8 changed files with 46 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/budgets/ballot/lines_controller.rb
View File

@@ -20,11 +20,11 @@ module Budgets
#@ballot.set_geozone(@geozone)
#@current_user.update(representative_id: nil)
if request.get?
redirect_to @spending_proposal, notice: t('spending_proposals.notice.voted')
redirect_to @investment, notice: t('budget_investments.notice.voted')
end
else
if request.get?
redirect_to @spending_proposal, notice: t('spending_proposals.notice.could_not_vote')
redirect_to @investment, notice: t('budget_investments.notice.could_not_vote')
else
render :new
end
@@ -74,4 +74,4 @@ module Budgets
end
end
end
end

2
app/views/budgets/ballot/_progress_bar.html.erb
View File

@@ -20,7 +20,7 @@
<p id="amount-spent" class="progress-meter-text spent-amount-text">
<%= @budget.format_amount(@ballot.amount_spent(@heading.id)) %>
<span id="amount-available" class="amount-available">
<%= t("spending_proposals.index.available") %>
<%= t("budget.progress_bar.available") %>
<span><%= @budget.format_amount(@ballot.amount_available(@heading)) %></span>
</span>
</p>

6
app/views/management/budgets/investments/index.html.erb
View File

@@ -7,12 +7,12 @@
<div id="budget-investments" class="budget-investments-list small-12 medium-9 column">
<div class="small-12 search-results">
<%= content_tag(:h2, t("management.investments.filters.unfeasible")) if params[:unfeasible].present? %>
<%= content_tag(:h2, t("management.investments.filters.by_geozone", geozone: @geozone_name)) if @geozone_name.present? %>
<%= content_tag(:h2, t("management.budget_investments.filters.unfeasible")) if params[:unfeasible].present? %>
<%= content_tag(:h2, t("management.budget_investments.filters.heading", heading: @heading.name)) if @heading.present? %>
<% if params[:search].present? %>
<h2>
<%= page_entries_info @investments %>
<%= t("management.investments.search_results", count: @investments.size, search_term: params[:search]) %>
<%= t("management.budget_investments.search_results", count: @investments.size, search_term: params[:search]) %>
</h2>
<% end %>
</div>