diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2011-02-20 14:56:37 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2011-02-20 14:56:37 +0000 |
| commit | 7ddb1c694aaee2c36b0e3e67043f626903e0c961 (patch) | |
| tree | 454527dcfea8e1f0c3470a62fc29b3d288b4b72b /lib/redmine/i18n.rb | |
| parent | 20a54f1ef5cf15a0fa31de004ceb4ea34446fd42 (diff) | |
| download | redmine-7ddb1c694aaee2c36b0e3e67043f626903e0c961.tar.gz redmine-7ddb1c694aaee2c36b0e3e67043f626903e0c961.zip | |
Fixed: date part of the time default format doesn't respect the date format (#7639).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4894 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 1bfca81e4..f0cc529b0 100644 --- a/lib/redmine/i18n.rb +++ b/lib/redmine/i18n.rb @@ -45,8 +45,8 @@ 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, :format => (include_date ? :default : :time)) : - ((include_date ? "#{format_date(time)} " : "") + "#{local.strftime(Setting.time_format)}") + (include_date ? "#{format_date(local)} " : "") + + (Setting.time_format.blank? ? ::I18n.l(local, :format => :time) : local.strftime(Setting.time_format)) end def day_name(day) |