diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-08-28 03:07:34 -0300 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-08-28 03:07:34 -0300 |
commit | 93a4dfaebc48e3324997be780539fad996349c84 (patch) | |
tree | f889ee6897b455120356f64505579c5864d15dd3 /actionview | |
parent | 3cc7b0a239c66af39acc979d9afa9e7c593c1f4b (diff) | |
parent | 7f23c5d52438f12d7af167a399a77025b1d58a9c (diff) | |
download | rails-93a4dfaebc48e3324997be780539fad996349c84.tar.gz rails-93a4dfaebc48e3324997be780539fad996349c84.tar.bz2 rails-93a4dfaebc48e3324997be780539fad996349c84.zip |
Merge pull request #17502 from vipulnsward/configurable-delimited-regex
Support for custom regular expression for number_to_delimeted
Diffstat (limited to 'actionview')
-rw-r--r-- | actionview/CHANGELOG.md | 10 | ||||
-rw-r--r-- | actionview/test/template/number_helper_test.rb | 2 |
2 files changed, 12 insertions, 0 deletions
diff --git a/actionview/CHANGELOG.md b/actionview/CHANGELOG.md index 90c9c2171c..f97ca88b87 100644 --- a/actionview/CHANGELOG.md +++ b/actionview/CHANGELOG.md @@ -1,3 +1,13 @@ +* `number_to_currency` and `number_with_delimiter` now accept custom `delimiter_pattern` option + to handle placement of delimiter, to support currency formats like INR + + Example: + + number_to_currency(1230000, delimiter_pattern: /(\d+?)(?=(\d\d)+(\d)(?!\d))/, unit: '₹', format: "%u %n") + # => '₹ 12,30,000.00' + + *Vipul A M* + * Make `disable_with` the default behavior for submit tags. Disables the button on submit to prevent double submits. diff --git a/actionview/test/template/number_helper_test.rb b/actionview/test/template/number_helper_test.rb index b70b750869..631d45586b 100644 --- a/actionview/test/template/number_helper_test.rb +++ b/actionview/test/template/number_helper_test.rb @@ -1,3 +1,4 @@ +# encoding: utf-8 require "abstract_unit" class NumberHelperTest < ActionView::TestCase @@ -21,6 +22,7 @@ class NumberHelperTest < ActionView::TestCase assert_equal "<b>1,234,567,890.50</b> $", number_to_currency("1234567890.50", format: "<b>%n</b> %u") assert_equal "<b>1,234,567,890.50</b> $", number_to_currency("-1234567890.50", negative_format: "<b>%n</b> %u") assert_equal "<b>1,234,567,890.50</b> $", number_to_currency("-1234567890.50", 'negative_format' => "<b>%n</b> %u") + assert_equal '₹ 12,30,000.00', number_to_currency(1230000, delimiter_pattern: /(\d+?)(?=(\d\d)+(\d)(?!\d))/, unit: '₹', format: "%u %n") end def test_number_to_percentage |