summaryrefslogtreecommitdiffstats
path: root/app/helpers
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2014-01-24 10:28:12 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2014-01-24 10:28:12 +0000
commite391be40866f720ddc47398bb51e63e551935de3 (patch)
treed0bf0d5efd8e020e0bf9b03a2e07f3bbc0a2eb25 /app/helpers
parent6e6c6fac5caf92103a54e0c8f76a06f5f1b3b4f4 (diff)
downloadredmine-e391be40866f720ddc47398bb51e63e551935de3.tar.gz
redmine-e391be40866f720ddc47398bb51e63e551935de3.zip
Adds settings for disabling browser language detection and language preference (#2691).
git-svn-id: http://svn.redmine.org/redmine/trunk@12691 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/settings_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/settings_helper.rb b/app/helpers/settings_helper.rb
index a01e29a3a..8dcc1ecb6 100644
--- a/app/helpers/settings_helper.rb
+++ b/app/helpers/settings_helper.rb
@@ -79,7 +79,7 @@ module SettingsHelper
def setting_label(setting, options={})
label = options.delete(:label)
- label != false ? label_tag("settings_#{setting}", l(label || "setting_#{setting}")).html_safe : ''
+ label != false ? label_tag("settings_#{setting}", l(label || "setting_#{setting}"), options[:label_options]).html_safe : ''
end
# Renders a notification field for a Redmine::Notifiable option