From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 29 Jul 2012 12:10:34 +0000 (+0000)
Subject: Fixed label with invalid for attribute.
X-Git-Tag: 2.1.0~195
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0c72347d617fe04756b55e7ca0583a5d0f720c1a;p=redmine.git

Fixed label with invalid for attribute.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10128 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/app/helpers/settings_helper.rb b/app/helpers/settings_helper.rb
index ae3fe87b1..dd20f24c6 100644
--- a/app/helpers/settings_helper.rb
+++ b/app/helpers/settings_helper.rb
@@ -44,7 +44,7 @@ module SettingsHelper
     setting_values = Setting.send(setting)
     setting_values = [] unless setting_values.is_a?(Array)
 
-    setting_label(setting, options).html_safe +
+    content_tag("label", l(options[:label] || "setting_#{setting}")) +
       hidden_field_tag("settings[#{setting}][]", '').html_safe +
       choices.collect do |choice|
         text, value = (choice.is_a?(Array) ? choice : [choice, choice])