Fix the way the DATE_FORMATS are set to suit AR3.2 (closes: #9dfc93)
This commit is contained in:
parent
dc89386278
commit
5301819105
|
@ -39,13 +39,13 @@ unless defined? PUBLIC_DIR
|
||||||
end
|
end
|
||||||
|
|
||||||
# Set the default date(/time) format.
|
# Set the default date(/time) format.
|
||||||
ActiveSupport::CoreExtensions::Time::Conversions::DATE_FORMATS.merge!(
|
Time::DATE_FORMATS.merge!(
|
||||||
:default => "%Y-%m-%d %H:%M",
|
:default => "%Y-%m-%d %H:%M",
|
||||||
:month_and_year => "%B %Y",
|
:month_and_year => "%B %Y",
|
||||||
:date_only => "%Y-%m-%d",
|
:date_only => "%Y-%m-%d",
|
||||||
:time_only => "%H:%M",
|
:time_only => "%H:%M",
|
||||||
:day_code => "%Y%m%d")
|
:day_code => "%Y%m%d")
|
||||||
ActiveSupport::CoreExtensions::Date::Conversions::DATE_FORMATS.merge!(
|
Date::DATE_FORMATS.merge!(
|
||||||
:default => "%Y-%m-%d",
|
:default => "%Y-%m-%d",
|
||||||
:month_and_year => "%B %Y")
|
:month_and_year => "%B %Y")
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue