diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2010-12-17 08:34:29 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2010-12-17 08:34:29 +0000 |
| commit | 3c1576e364c911e38f7c002582fc794f16ca87dd (patch) | |
| tree | 67d133d06c15364e17cd48b4fb4f4cebf139d127 /lib/redmine/i18n.rb | |
| parent | 9f18426ca7b1e798ffd763382721660c674d2043 (diff) | |
| download | redmine-3c1576e364c911e38f7c002582fc794f16ca87dd.tar.gz redmine-3c1576e364c911e38f7c002582fc794f16ca87dd.zip | |
Manually require i18n 0.4.2 before Rails tries to load the most recent gem (#7013).
This workaround makes Redmine work even if i18n 0.5.0 gem is installed.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4516 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib/redmine/i18n.rb')
| -rw-r--r-- | lib/redmine/i18n.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/redmine/i18n.rb b/lib/redmine/i18n.rb index e7aac9f7e..1bfca81e4 100644 --- a/lib/redmine/i18n.rb +++ b/lib/redmine/i18n.rb @@ -37,7 +37,7 @@ 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) + Setting.date_format.blank? ? ::I18n.l(date.to_date) : date.strftime(Setting.date_format) end def format_time(time, include_date = true) @@ -45,7 +45,7 @@ module Redmine time = time.to_time if time.is_a?(String) zone = User.current.time_zone local = zone ? time.in_time_zone(zone) : (time.utc? ? time.localtime : time) - Setting.time_format.blank? ? ::I18n.l(local, :count => local.strftime('%d'), :format => (include_date ? :default : :time)) : + Setting.time_format.blank? ? ::I18n.l(local, :format => (include_date ? :default : :time)) : ((include_date ? "#{format_date(time)} " : "") + "#{local.strftime(Setting.time_format)}") end |