Move Numeric#to_utc_offset_s to TimeZone.seconds_to_utc_offset

3 files changed, 2 insertions, 17 deletions

diff --git a/activesupport/lib/active_support/core_ext/date_time/conversions.rb b/activesupport/lib/active_support/core_ext/date_time/conversions.rb
index 7c948267b3..f2cc87e119 100644
--- a/activesupport/lib/active_support/core_ext/date_time/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/date_time/conversions.rb
@@ -56,7 +56,7 @@ module ActiveSupport #:nodoc:
         #   datetime.formatted_offset         # => "-06:00"
         #   datetime.formatted_offset(false)  # => "-0600"
         def formatted_offset(colon = true, alternate_utc_string = nil)
-          utc? && alternate_utc_string || utc_offset.to_utc_offset_s(colon)
+          utc? && alternate_utc_string || TimeZone.seconds_to_utc_offset(utc_offset, colon)
         end
         
         # Overrides the default inspect method with a human readable one, e.g., "Mon, 21 Feb 2005 14:30:00 +0000"
diff --git a/activesupport/lib/active_support/core_ext/numeric/conversions.rb b/activesupport/lib/active_support/core_ext/numeric/conversions.rb
deleted file mode 100644
index a16a8e7c09..0000000000
--- a/activesupport/lib/active_support/core_ext/numeric/conversions.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-class Numeric
-  UTC_OFFSET_WITH_COLON = '%+03d:%02d'
-  UTC_OFFSET_WITHOUT_COLON = UTC_OFFSET_WITH_COLON.sub(':', '')
-
-  # Assumes self represents an offset from UTC in seconds (as returned from Time#utc_offset)
-  # and turns this into an +HH:MM formatted string. Example:
-  #
-  #   -21_600.to_utc_offset_s   # => "-06:00"
-  def to_utc_offset_s(colon = true)
-    format = colon ? UTC_OFFSET_WITH_COLON : UTC_OFFSET_WITHOUT_COLON
-    hours = self / 3600
-    minutes = (abs % 3600) / 60
-    format % [hours, minutes]
-  end
-end
diff --git a/activesupport/lib/active_support/core_ext/time/conversions.rb b/activesupport/lib/active_support/core_ext/time/conversions.rb
index e6f9134661..d18a7e5295 100644
--- a/activesupport/lib/active_support/core_ext/time/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/time/conversions.rb
@@ -54,7 +54,7 @@ module ActiveSupport #:nodoc:
         #   Time.local(2000).formatted_offset         # => "-06:00"
         #   Time.local(2000).formatted_offset(false)  # => "-0600"
         def formatted_offset(colon = true, alternate_utc_string = nil)
-          utc? && alternate_utc_string || utc_offset.to_utc_offset_s(colon)
+          utc? && alternate_utc_string || TimeZone.seconds_to_utc_offset(utc_offset, colon)
         end
 
         # Converts a Time object to a Date, dropping hour, minute, and second precision.