summaryrefslogtreecommitdiffstats
path: root/lib/redmine/i18n.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/redmine/i18n.rb')
-rw-r--r--lib/redmine/i18n.rb12
1 files changed, 10 insertions, 2 deletions
diff --git a/lib/redmine/i18n.rb b/lib/redmine/i18n.rb
index 0091186f4..b028e3e30 100644
--- a/lib/redmine/i18n.rb
+++ b/lib/redmine/i18n.rb
@@ -52,8 +52,16 @@ module Redmine
"%.2f h" % hours.to_f
end
- def ll(lang, str, value=nil)
- ::I18n.t(str.to_s, :value => value, :locale => lang.to_s.gsub(%r{(.+)\-(.+)$}) { "#{$1}-#{$2.upcase}" })
+ def ll(lang, str, arg=nil)
+ options = arg.is_a?(Hash) ? arg : {:value => arg}
+ locale = lang.to_s.gsub(%r{(.+)\-(.+)$}) { "#{$1}-#{$2.upcase}" }
+ ::I18n.t(str.to_s, options.merge(:locale => locale))
+ end
+
+ # Localizes the given args with user's language
+ def lu(user, *args)
+ lang = user.try(:language) || Setting.default_language
+ ll(lang, *args)
end
def format_date(date)