summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/redmine/i18n.rb2
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/redmine/i18n.rb b/lib/redmine/i18n.rb
index 19da67426..4422bbe13 100644
--- a/lib/redmine/i18n.rb
+++ b/lib/redmine/i18n.rb
@@ -56,7 +56,6 @@ module Redmine
return nil unless date
options = {}
options[:format] = Setting.date_format unless Setting.date_format.blank?
- options[:locale] = User.current.language unless User.current.language.blank?
::I18n.l(date.to_date, options)
end
@@ -64,7 +63,6 @@ module Redmine
return nil unless time
options = {}
options[:format] = (Setting.time_format.blank? ? :time : Setting.time_format)
- options[:locale] = User.current.language unless User.current.language.blank?
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)