aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/core_ext/time
diff options
context:
space:
mode:
authorMarcel Molina <marcel@vernix.org>2005-10-10 00:19:04 +0000
committerMarcel Molina <marcel@vernix.org>2005-10-10 00:19:04 +0000
commit847a3232864a91fa69bb82e43b488fbd090b64f6 (patch)
tree65dca084546e1441b4ba75336bfa9f2d07820755 /activesupport/lib/active_support/core_ext/time
parenteb2fbf05c6a0f367bc330618076b99dd5a8bf308 (diff)
downloadrails-847a3232864a91fa69bb82e43b488fbd090b64f6.tar.gz
rails-847a3232864a91fa69bb82e43b488fbd090b64f6.tar.bz2
rails-847a3232864a91fa69bb82e43b488fbd090b64f6.zip
Replace '%e' from long and short time formats as Windows does not support it. Closes #2344.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2512 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activesupport/lib/active_support/core_ext/time')
-rw-r--r--activesupport/lib/active_support/core_ext/time/conversions.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/core_ext/time/conversions.rb b/activesupport/lib/active_support/core_ext/time/conversions.rb
index 6e7299762d..408ff515b3 100644
--- a/activesupport/lib/active_support/core_ext/time/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/time/conversions.rb
@@ -7,8 +7,8 @@ module ActiveSupport #:nodoc:
module Conversions
DATE_FORMATS = {
:db => "%Y-%m-%d %H:%M:%S",
- :short => "%e %b %H:%M",
- :long => "%B %e, %Y %H:%M",
+ :short => "%d %b %H:%M",
+ :long => "%B %d, %Y %H:%M",
:rfc822 => "%a, %d %b %Y %H:%M:%S %z"
}