Labyricorn/liquid
1
0
Fork 0
mirror of https://github.com/Shopify/liquid.git synced 2026-09-19 19:00:39 -07:00
Code Issues Packages Projects Releases Wiki Activity

Follow ISO recommendation to use space as thousands separator

Browse Source
This commit is contained in:
Mike Angell
2019-09-01 09:01:02 +10:00
parent 32b9530985
commit bfe4f60e13
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/liquid/standardfilters.rb
+5 -1
View File
@@ -391,7 +391,11 @@ module Liquid
raise Liquid::FloatDomainError, e.message raise Liquid::FloatDomainError, e.message
end end
def format(input, n = 2, thousands = ',', decimal = '.') # Defaults are passed as nil so systems can easily override
def format(input, n = nil, thousands = nil, decimal = nil)
n = 2 if n.nil?
thousands = " ".freeze if thousands.nil?
decimal = ".".freeze if decimal.nil?
return input if (precision = Utils.to_number(n).to_i) < 0 return input if (precision = Utils.to_number(n).to_i) < 0
whole_part, decimal_part = Kernel.format("%.#{precision}f", Utils.to_number(input)).split('.') whole_part, decimal_part = Kernel.format("%.#{precision}f", Utils.to_number(input)).split('.')
[whole_part.gsub(/(\d)(?=\d{3}+$)/, "\\1#{thousands}"), decimal_part].compact.join(decimal.to_s) [whole_part.gsub(/(\d)(?=\d{3}+$)/, "\\1#{thousands}"), decimal_part].compact.join(decimal.to_s)
test/integration/standard_filter_test.rb
+4 -3
View File
@@ -619,12 +619,13 @@ class StandardFiltersTest < Minitest::Test
assert_template_result "4.30", "{{ price | format: 2 }}", 'price' => NumberLikeThing.new(4.3) assert_template_result "4.30", "{{ price | format: 2 }}", 'price' => NumberLikeThing.new(4.3)
assert_template_result "5.0000000", "{{ price | format: 7 }}", 'price' => 5 assert_template_result "5.0000000", "{{ price | format: 7 }}", 'price' => 5
assert_template_result "50", "{{ price | format: -1 }}", 'price' => 50 assert_template_result "50", "{{ price | format: -1 }}", 'price' => 50
assert_template_result "50", "{{ price | format: A }}", 'price' => 50 assert_template_result "50.00", "{{ price | format: A }}", 'price' => 50
assert_template_result "50.00", "{{ price | format: '2e' }}", 'price' => 50 assert_template_result "50.00", "{{ price | format: '2e' }}", 'price' => 50
assert_template_result "50,000,000", "{{ price | format: 0 }}", 'price' => 50000000 assert_template_result "50 000 000", "{{ price | format: 0 }}", 'price' => 50000000
assert_template_result "50,000,000.00", "{{ price | format }}", 'price' => 50000000 assert_template_result "50 000 000.00", "{{ price | format }}", 'price' => 50000000
assert_template_result "50000000.00", "{{ price | format: 2, '', '.'}}", 'price' => 50000000 assert_template_result "50000000.00", "{{ price | format: 2, '', '.'}}", 'price' => 50000000
assert_template_result "50$000$000#00", "{{ price | format: 2, '$', '#'}}", 'price' => 50000000 assert_template_result "50$000$000#00", "{{ price | format: 2, '$', '#'}}", 'price' => 50000000
assert_template_result "-50$000$000#00", "{{ price | format: 2, '$', '#'}}", 'price' => -50000000
end end
def test_ceil def test_ceil