diff options
| author | Marcel Molina <marcel@vernix.org> | 2005-10-10 00:19:04 +0000 |
|---|---|---|
| committer | Marcel Molina <marcel@vernix.org> | 2005-10-10 00:19:04 +0000 |
| commit | 847a3232864a91fa69bb82e43b488fbd090b64f6 (patch) | |
| tree | 65dca084546e1441b4ba75336bfa9f2d07820755 | |
| parent | eb2fbf05c6a0f367bc330618076b99dd5a8bf308 (diff) | |
| download | rails-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
| -rw-r--r-- | activesupport/CHANGELOG | 2 | ||||
| -rw-r--r-- | activesupport/lib/active_support/core_ext/time/conversions.rb | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG index 493575d0fa..ea645d8de0 100644 --- a/activesupport/CHANGELOG +++ b/activesupport/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Replace '%e' from long and short time formats as Windows does not support it. #2344. [Tom Ward <tom@popdog.net>] + * Added to_s(:db) to Range, so you can get "BETWEEN '2005-12-10' AND '2005-12-12'" from Date.new(2005, 12, 10)..Date.new(2005, 12, 12) (and likewise with Times) * Moved require_library_or_gem into Kernel. #1992 [Michael Schuerig <michael@schuerig.de>] 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" } |