From f34ef6e83977abe83909cdb4318e741a55e32e64 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 5 Feb 2016 07:48:22 +0000
Subject: Harmonize setting labels (#21421).

For every setting, there should always is be a "setting_%{label}
Patch by Jan Schulz-Hofen.

git-svn-id: http://svn.redmine.org/redmine/trunk@15146 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/settings/_authentication.html.erb | 2 +-
 app/views/settings/_repositories.html.erb   | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'app/views/settings')

diff --git a/app/views/settings/_authentication.html.erb b/app/views/settings/_authentication.html.erb
index 35aa66425..15367813a 100644
--- a/app/views/settings/_authentication.html.erb
+++ b/app/views/settings/_authentication.html.erb
@@ -18,7 +18,7 @@
   <%= setting_select :password_max_age, [[l(:label_disabled), 0]] + [7, 30, 60, 90, 180, 365].collect{|days| [l('datetime.distance_in_words.x_days', :count => days), days.to_s]} %>
 </p>
 
-<p><%= setting_check_box :lost_password, :label => :label_password_lost %></p>
+<p><%= setting_check_box :lost_password %></p>
 
 <p><%= setting_text_field :max_additional_emails, :size => 6 %></p>
 
diff --git a/app/views/settings/_repositories.html.erb b/app/views/settings/_repositories.html.erb
index bb7a23704..b2c001a9b 100644
--- a/app/views/settings/_repositories.html.erb
+++ b/app/views/settings/_repositories.html.erb
@@ -46,8 +46,7 @@
 <p><%= setting_text_field :sys_api_key,
                           :size     => 30,
                           :id       => 'settings_sys_api_key',
-                          :disabled => !Setting.sys_api_enabled?,
-                          :label    => :setting_mail_handler_api_key %>
+                          :disabled => !Setting.sys_api_enabled? %>
   <%= link_to_function l(:label_generate_key),
                        "if (!$('#settings_sys_api_key').attr('disabled')) { $('#settings_sys_api_key').val(randomKey(20)) }" %>
 </p>
-- 
cgit v1.2.3