GitLab steht wegen Wartungsarbeiten am Montag, den 10. Mai, zwischen 17:00 und 19:00 Uhr nicht zur Verfügung.

Commit 449dbf9f authored by jplang's avatar jplang

Add optional user parameter to I18n#format_time to (#21421).

This is useful for mails where times should be displayed in the timezone of the recipient - not the current user causing the mail to be sent.

git-svn-id: https://svn.redmine.org/redmine/trunk@15094 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent 9dba8ac0
......@@ -71,12 +71,12 @@ module Redmine
::I18n.l(date.to_date, options)
end
def format_time(time, include_date = true)
def format_time(time, include_date=true, user=User.currant)
return nil unless time
options = {}
options[:format] = (Setting.time_format.blank? ? :time : Setting.time_format)
time = time.to_time if time.is_a?(String)
zone = User.current.time_zone
zone = user.time_zone
local = zone ? time.in_time_zone(zone) : (time.utc? ? time.localtime : time)
(include_date ? "#{format_date(local)} " : "") + ::I18n.l(local, options)
end
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment