diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2011-10-13 16:26:55 -0700 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2011-10-13 16:26:55 -0700 |
| commit | a5b0f914f16aac806a157dd4b6f3e3f3656d8396 (patch) | |
| tree | 1160f1434eea0f0d1ab5f95600e7ffad0e72f377 /actionpack | |
| parent | 8cbe826958f78e5de5723bcbd3c90ea381a79e48 (diff) | |
| parent | 20728f551c2a429fc7c29c6ac17b3f44b57526b9 (diff) | |
| download | rails-a5b0f914f16aac806a157dd4b6f3e3f3656d8396.tar.gz rails-a5b0f914f16aac806a157dd4b6f3e3f3656d8396.tar.bz2 rails-a5b0f914f16aac806a157dd4b6f3e3f3656d8396.zip | |
Merge pull request #3314 from macmartine/master
Remove user-specified delimiter from start when no area code is present (in number_to_phone)
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_view/helpers/number_helper.rb | 2 | ||||
| -rw-r--r-- | actionpack/test/template/number_helper_test.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/number_helper.rb b/actionpack/lib/action_view/helpers/number_helper.rb index ec6c2c8db3..7031694af4 100644 --- a/actionpack/lib/action_view/helpers/number_helper.rb +++ b/actionpack/lib/action_view/helpers/number_helper.rb @@ -69,7 +69,7 @@ module ActionView number.gsub!(/(\d{1,3})(\d{3})(\d{4}$)/,"(\\1) \\2#{delimiter}\\3") else number.gsub!(/(\d{0,3})(\d{3})(\d{4})$/,"\\1#{delimiter}\\2#{delimiter}\\3") - number.slice!(0, 1) if number.starts_with?('-') + number.slice!(0, 1) if number.starts_with?(delimiter) && !delimiter.blank? end str = [] diff --git a/actionpack/test/template/number_helper_test.rb b/actionpack/test/template/number_helper_test.rb index 0e3475d98b..8d679aac1d 100644 --- a/actionpack/test/template/number_helper_test.rb +++ b/actionpack/test/template/number_helper_test.rb @@ -27,6 +27,7 @@ class NumberHelperTest < ActionView::TestCase assert_equal("800 555 1212", number_to_phone(8005551212, {:delimiter => " "})) assert_equal("(800) 555-1212 x 123", number_to_phone(8005551212, {:area_code => true, :extension => 123})) assert_equal("800-555-1212", number_to_phone(8005551212, :extension => " ")) + assert_equal("555.1212", number_to_phone(5551212, :delimiter => '.')) assert_equal("800-555-1212", number_to_phone("8005551212")) assert_equal("+1-800-555-1212", number_to_phone(8005551212, :country_code => 1)) assert_equal("+18005551212", number_to_phone(8005551212, :country_code => 1, :delimiter => '')) |