aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support
diff options
context:
space:
mode:
Diffstat (limited to 'activesupport/lib/active_support')
-rw-r--r--activesupport/lib/active_support/core_ext/time/conversions.rb9
1 files changed, 5 insertions, 4 deletions
diff --git a/activesupport/lib/active_support/core_ext/time/conversions.rb b/activesupport/lib/active_support/core_ext/time/conversions.rb
index fadfb6b0df..6e7299762d 100644
--- a/activesupport/lib/active_support/core_ext/time/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/time/conversions.rb
@@ -6,9 +6,10 @@ module ActiveSupport #: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"
+ :db => "%Y-%m-%d %H:%M:%S",
+ :short => "%e %b %H:%M",
+ :long => "%B %e, %Y %H:%M",
+ :rfc822 => "%a, %d %b %Y %H:%M:%S %z"
}
def self.append_features(klass)
@@ -32,4 +33,4 @@ module ActiveSupport #:nodoc:
end
end
end
-end \ No newline at end of file
+end