diff options
| author | rpheath <rpheath@gmail.com> | 2009-03-08 23:52:28 -0400 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-03-09 12:53:44 +0000 |
| commit | 1ab2ff58eddee8ac523624dd097424f9a760ad8b (patch) | |
| tree | 0e23cec568020d67ba739f1dc900b2865b0b8067 | |
| parent | faf4ba6b79e56dde383a8761fb1f485fcd07c72b (diff) | |
| download | rails-1ab2ff58eddee8ac523624dd097424f9a760ad8b.tar.gz rails-1ab2ff58eddee8ac523624dd097424f9a760ad8b.tar.bz2 rails-1ab2ff58eddee8ac523624dd097424f9a760ad8b.zip | |
Fixed number_to_phone to work with 7 digit numbers [#2176 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| -rw-r--r-- | actionpack/lib/action_view/helpers/number_helper.rb | 4 | ||||
| -rw-r--r-- | actionpack/test/template/number_helper_test.rb | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/number_helper.rb b/actionpack/lib/action_view/helpers/number_helper.rb index e622f97b9e..539f43c6e3 100644 --- a/actionpack/lib/action_view/helpers/number_helper.rb +++ b/actionpack/lib/action_view/helpers/number_helper.rb @@ -15,6 +15,7 @@ module ActionView # * <tt>:country_code</tt> - Sets the country code for the phone number. # # ==== Examples + # number_to_phone(5551234) # => 555-1234 # number_to_phone(1235551234) # => 123-555-1234 # number_to_phone(1235551234, :area_code => true) # => (123) 555-1234 # number_to_phone(1235551234, :delimiter => " ") # => 123 555 1234 @@ -37,7 +38,8 @@ module ActionView str << if area_code number.gsub!(/([0-9]{1,3})([0-9]{3})([0-9]{4}$)/,"(\\1) \\2#{delimiter}\\3") else - number.gsub!(/([0-9]{1,3})([0-9]{3})([0-9]{4})$/,"\\1#{delimiter}\\2#{delimiter}\\3") + number.gsub!(/([0-9]{0,3})([0-9]{3})([0-9]{4})$/,"\\1#{delimiter}\\2#{delimiter}\\3") + number.starts_with?('-') ? number.slice!(1..-1) : number end str << " x #{extension}" unless extension.blank? str diff --git a/actionpack/test/template/number_helper_test.rb b/actionpack/test/template/number_helper_test.rb index 9c9f54936c..29cb60fd73 100644 --- a/actionpack/test/template/number_helper_test.rb +++ b/actionpack/test/template/number_helper_test.rb @@ -4,6 +4,7 @@ class NumberHelperTest < ActionView::TestCase tests ActionView::Helpers::NumberHelper def test_number_to_phone + assert_equal("555-1234", number_to_phone(5551234)) assert_equal("800-555-1212", number_to_phone(8005551212)) assert_equal("(800) 555-1212", number_to_phone(8005551212, {:area_code => true})) assert_equal("800 555 1212", number_to_phone(8005551212, {:delimiter => " "})) |