diff options
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/date/conversions.rb | 11 | ||||
| -rw-r--r-- | activesupport/lib/active_support/core_ext/time/conversions.rb | 13 |
2 files changed, 13 insertions, 11 deletions
diff --git a/activesupport/lib/active_support/core_ext/date/conversions.rb b/activesupport/lib/active_support/core_ext/date/conversions.rb index e6ddf9fade..048a260ada 100644 --- a/activesupport/lib/active_support/core_ext/date/conversions.rb +++ b/activesupport/lib/active_support/core_ext/date/conversions.rb @@ -3,6 +3,11 @@ module ActiveSupport #:nodoc: module Date #:nodoc: # Getting dates in different convenient string representations and other objects module Conversions + DATE_FORMATS = { + :short => "%e %b", + :long => "%B %e, %Y" + } + def self.append_features(klass) #:nodoc: super klass.send(:alias_method, :to_default_s, :to_s) @@ -10,11 +15,7 @@ module ActiveSupport #:nodoc: end def to_formatted_s(format = :default) - case format - when :default then to_default_s - when :short then strftime("%e %b").strip - when :long then strftime("%B %e, %Y").strip - end + DATE_FORMATS[format] ? strftime(DATE_FORMATS[format]).strip : to_default_s end # To be able to keep Dates and Times interchangeable on conversions diff --git a/activesupport/lib/active_support/core_ext/time/conversions.rb b/activesupport/lib/active_support/core_ext/time/conversions.rb index 689da6db52..fadfb6b0df 100644 --- a/activesupport/lib/active_support/core_ext/time/conversions.rb +++ b/activesupport/lib/active_support/core_ext/time/conversions.rb @@ -5,6 +5,12 @@ module ActiveSupport #:nodoc: module Time #:nodoc: # Getting times in different convenient string representations and other objects module Conversions + DATE_FORMATS = { + :db => "%Y-%m-%d %H:%M:%S", + :short => "%e %b %H:%M", + :long => "%B %e, %Y %H:%M" + } + def self.append_features(klass) super klass.send(:alias_method, :to_default_s, :to_s) @@ -12,12 +18,7 @@ module ActiveSupport #:nodoc: end def to_formatted_s(format = :default) - case format - when :default then to_default_s - when :db then strftime("%Y-%m-%d %H:%M:%S") - when :short then strftime("%e %b %H:%M").strip - when :long then strftime("%B %e, %Y %H:%M").strip - end + DATE_FORMATS[format] ? strftime(DATE_FORMATS[format]).strip : to_default_s end def to_date |