From 66bde4ca521eddb3210f8d5a0ab20e55a3047e9c Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Sat, 26 May 2007 01:07:25 +0000 Subject: DateTime uses Time formats. Closes #8476. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6854 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- .../lib/active_support/core_ext/date_time/conversions.rb | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'activesupport/lib/active_support/core_ext/date_time/conversions.rb') 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 -- cgit v1.2.3