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

Merge pull request #2443 from consul/fix_currency_locale

Browse Source 
Use user locale instead of default locale to format currencies
This commit is contained in:
Alberto Calderón Queimadelos
2018-03-08 18:03:52 +01:00
committed by GitHub
parent 8c6c567c76 6e843730b0
commit a55218ad9f
4 changed files with 39 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/helpers/application_helper.rb
View File

@@ -57,10 +57,6 @@ module ApplicationHelper
SiteCustomization::ContentBlock.block_for(name, locale)
end
def format_price(number)
number_to_currency(number, precision: 0, locale: I18n.default_locale)
end
def kaminari_path(url)
"#{root_url.chomp("\/")}#{url}"
end

2
app/models/budget.rb
View File

@@ -124,7 +124,7 @@ class Budget < ActiveRecord::Base
def formatted_amount(amount)
ActionController::Base.helpers.number_to_currency(amount,
precision: 0,
locale: I18n.default_locale,
locale: I18n.locale,
unit: currency_symbol)
end

8
app/views/budgets/results/_results_table.html.erb
View File

@@ -21,7 +21,7 @@
<% if results_type == :compatible %>
<th scope="col" class="text-right">
<small><%= t("budgets.results.amount_available") %></small><br>
<%= format_price(heading_price) %><br>
<%= @budget.formatted_amount(heading_price) %><br>
</th>
<% end %>
</tr>
@@ -53,12 +53,12 @@
<%= investment.ballot_lines_count %>
</td>
<td class="text-center">
<%= format_price investment.price %>
<%= @budget.formatted_amount(investment.price) %>
</td>
<% if results_type == :compatible %>
<td class="small text-right"
title="<%= format_price(amount_available) %> - <%= format_price(investment.price) %>">
<%= format_price amount_available - investment.price %>
title="<%= @budget.formatted_amount(amount_available) %> - <%= @budget.formatted_amount(investment.price) %>">
<%= @budget.formatted_amount(amount_available - investment.price) %>
<% amount_available -= investment.price if investment.winner? %>
</td>
<% end %>