meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-10-17 17:01:01 +00:00
Code Issues Releases Wiki Activity

Allow strings representing dates to be passed to format_date (#6788)

Browse Source
This commit is contained in:
Holger Just 2010-11-01 20:44:31 +01:00
parent db2ecd3010
commit aac69276cc
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/redmine/i18n.rb
View File

@ -37,7 +37,8 @@ module Redmine
def format_date(date)
return nil unless date
Setting.date_format.blank? ? ::I18n.l(date.to_date, :count => date.strftime('%d')) : date.strftime(Setting.date_format)
date = date.to_time if date.is_a?(String)
Setting.date_format.blank? ? ::I18n.l(date, :count => date.strftime('%d')) : date.strftime(Setting.date_format)
end
def format_time(time, include_date = true)

1
test/unit/lib/redmine/i18n_test.rb
View File

@ -37,6 +37,7 @@ class Redmine::I18nTest < ActiveSupport::TestCase
today = Date.today
Setting.date_format = '%d %m %Y'
assert_equal today.strftime('%d %m %Y'), format_date(today)
assert_equal today.strftime('%d %m %Y'), format_date(today.to_s)
end
def test_date_and_time_for_each_language