DateTime uses Time formats. Closes #8476.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6854 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 1 insertions, 10 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 f0a0b5892b..0b66593499 100644
--- a/activesupport/lib/active_support/core_ext/date_time/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/date_time/conversions.rb
@@ -3,22 +3,13 @@ module ActiveSupport #:nodoc:
     module DateTime #:nodoc:
       # Getting datetimes in different convenient string representations and other objects
       module Conversions
-        DATE_FORMATS = {
-          :db     => "%Y-%m-%d %H:%M:%S",
-          :time   => "%H:%M",
-          :short  => "%d %b %H:%M",
-          :long   => "%B %d, %Y %H:%M",
-          :long_ordinal => lambda { |datetime| datetime.strftime("%B #{datetime.day.ordinalize}, %Y %H:%M") },
-          :rfc822 => "%a, %d %b %Y %H:%M:%S %z",
-        }
-
         def self.included(klass)
           klass.send(:alias_method, :to_datetime_default_s, :to_s)
           klass.send(:alias_method, :to_s, :to_formatted_s)
         end
 
         def to_formatted_s(format = :default)
-          if formatter = DATE_FORMATS[format]
+          if formatter = ::Time::DATE_FORMATS[format]
             if formatter.respond_to?(:call)
               formatter.call(self).to_s
             else