summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2020-12-04 13:59:36 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2020-12-04 13:59:36 +0000
commit8cd42bc603f10b0b4a15c99cae48774dbbfb41b9 (patch)
treeff8e6374a17de0c3155b1b5e95c1f1c8b9b7fd7f /lib
parent73b25dd2b444c31b4a2070b55b1b61688e6e4a16 (diff)
downloadredmine-8cd42bc603f10b0b4a15c99cae48774dbbfb41b9.tar.gz
redmine-8cd42bc603f10b0b4a15c99cae48774dbbfb41b9.zip
add empty line after guard clause to lib/redmine/i18n.rb
git-svn-id: http://svn.redmine.org/redmine/trunk@20572 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib')
-rw-r--r--lib/redmine/i18n.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/redmine/i18n.rb b/lib/redmine/i18n.rb
index 8599a09f4..301bb763f 100644
--- a/lib/redmine/i18n.rb
+++ b/lib/redmine/i18n.rb
@@ -68,6 +68,7 @@ module Redmine
def format_date(date)
return nil unless date
+
options = {}
options[:format] = Setting.date_format unless Setting.date_format.blank?
::I18n.l(date.to_date, **options)
@@ -75,6 +76,7 @@ module Redmine
def format_time(time, include_date=true, user=nil)
return nil unless time
+
user ||= User.current
options = {}
options[:format] = (Setting.time_format.blank? ? :time : Setting.time_format)