diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2019-06-20 06:23:48 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2019-06-20 06:23:48 +0000 |
| commit | 001853ef7951b866089015a7d22e07c787e541a8 (patch) | |
| tree | f42101bec9faa24cafe1e393b389827f593cd22b /lib/redmine/i18n.rb | |
| parent | 87e82b4894671b222656c93f5255471747267340 (diff) | |
| download | redmine-001853ef7951b866089015a7d22e07c787e541a8.tar.gz redmine-001853ef7951b866089015a7d22e07c787e541a8.zip | |
Groups are incorrect when grouping by date without user timezone set.
git-svn-id: http://svn.redmine.org/redmine/trunk@18264 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib/redmine/i18n.rb')
| -rw-r--r-- | lib/redmine/i18n.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/redmine/i18n.rb b/lib/redmine/i18n.rb index badf39b1a..7756b4975 100644 --- a/lib/redmine/i18n.rb +++ b/lib/redmine/i18n.rb @@ -79,8 +79,7 @@ module Redmine options = {} options[:format] = (Setting.time_format.blank? ? :time : Setting.time_format) time = time.to_time if time.is_a?(String) - zone = user.time_zone - local = zone ? time.in_time_zone(zone) : (time.utc? ? time.localtime : time) + local = user.convert_time_to_user_timezone(time) (include_date ? "#{format_date(local)} " : "") + ::I18n.l(local, options) end |