Fix the way the DATE_FORMATS are set to suit AR3.2 (closes: #9dfc93)

This commit is contained in:
Paul van Tilburg 2013-06-06 21:49:20 +02:00
parent dc89386278
commit 5301819105
1 changed files with 2 additions and 2 deletions

View File

@ -39,13 +39,13 @@ unless defined? PUBLIC_DIR
end
# Set the default date(/time) format.
ActiveSupport::CoreExtensions::Time::Conversions::DATE_FORMATS.merge!(
Time::DATE_FORMATS.merge!(
:default => "%Y-%m-%d %H:%M",
:month_and_year => "%B %Y",
:date_only => "%Y-%m-%d",
:time_only => "%H:%M",
:day_code => "%Y%m%d")
ActiveSupport::CoreExtensions::Date::Conversions::DATE_FORMATS.merge!(
Date::DATE_FORMATS.merge!(
:default => "%Y-%m-%d",
:month_and_year => "%B %Y")
end