diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2015-02-08 09:34:48 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2015-02-08 09:34:48 +0000 |
| commit | 4a6b784d143def6be99fc498cd99f06dae1b1ddb (patch) | |
| tree | 505ad847f0a01843083150ee4942dd3a8649c989 /lib/redmine/i18n.rb | |
| parent | e622ce6691775580d8e9d412c70a05b2d411dafd (diff) | |
| download | redmine-4a6b784d143def6be99fc498cd99f06dae1b1ddb.tar.gz redmine-4a6b784d143def6be99fc498cd99f06dae1b1ddb.zip | |
Don't use current user locale to format dates (#19039).
git-svn-id: http://svn.redmine.org/redmine/trunk@13978 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib/redmine/i18n.rb')
| -rw-r--r-- | lib/redmine/i18n.rb | 2 |
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) |