diff options
Diffstat (limited to 'activesupport/lib/active_support/core_ext/time/conversions.rb')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/time/conversions.rb | 6 |
1 files changed, 4 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 b79acf9f75..689da6db52 100644 --- a/activesupport/lib/active_support/core_ext/time/conversions.rb +++ b/activesupport/lib/active_support/core_ext/time/conversions.rb @@ -1,3 +1,5 @@ +require 'date' + module ActiveSupport #:nodoc: module CoreExtensions #:nodoc: module Time #:nodoc: @@ -14,12 +16,12 @@ module ActiveSupport #:nodoc: 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("%e %B, %Y %H:%M").strip + when :long then strftime("%B %e, %Y %H:%M").strip end end def to_date - Date.new(year, month, day) + ::Date.new(year, month, day) end # To be able to keep Dates and Times interchangeable on conversions |