From bf1aea72f4e1cd7771b2f5e6dfc60ff5c5f0fb8b Mon Sep 17 00:00:00 2001
From: Jan Schulz-Hofen <jan@plan.io>
Date: Wed, 2 Dec 2015 18:40:03 +0800
Subject: [PATCH 5/7] Harmonize setting labels

For every setting, there should always is be a "setting_%{label}"
---
 app/views/settings/_authentication.html.erb | 2 +-
 app/views/settings/_repositories.html.erb   | 3 +--
 config/locales/de.yml                       | 4 +++-
 config/locales/en.yml                       | 4 +++-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/views/settings/_authentication.html.erb b/app/views/settings/_authentication.html.erb
index f9c569c..4d07de2 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 b3c5b1b..5136f0f 100644
--- a/app/views/settings/_repositories.html.erb
+++ b/app/views/settings/_repositories.html.erb
@@ -51,8 +51,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>
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 4f43f1b..ce5c7ed 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -1020,7 +1020,8 @@ de:
   setting_login_required: Authentifizierung erforderlich
   setting_mail_from: E-Mail-Absender
   setting_mail_handler_api_enabled: Abruf eingehender E-Mails aktivieren
-  setting_mail_handler_api_key: API-Schlüssel
+  setting_mail_handler_api_key: API-Schlüssel für eingehende E-Mails
+  setting_sys_api_key: API-Schlüssel für Webservice zur Projektarchiv-Verwaltung
   setting_mail_handler_body_delimiters: "Schneide E-Mails nach einer dieser Zeilen ab"
   setting_mail_handler_excluded_filenames: Anhänge nach Namen ausschließen
   setting_new_project_user_role_id: Rolle, die einem Nicht-Administrator zugeordnet wird, der ein Projekt erstellt
@@ -1028,6 +1029,7 @@ de:
   setting_openid: Erlaube OpenID-Anmeldung und -Registrierung
   setting_password_min_length: Mindestlänge des Kennworts
   setting_password_max_age: Erzwinge Passwortwechsel nach
+  setting_lost_password: Erlaube Passwort-Zurücksetzen per E-Mail
   setting_per_page_options: Objekte pro Seite
   setting_plain_text_mail: Nur reinen Text (kein HTML) senden
   setting_protocol: Protokoll
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 4495a7a..1125e33 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -397,7 +397,8 @@ en:
   setting_enabled_scm: Enabled SCM
   setting_mail_handler_body_delimiters: "Truncate emails after one of these lines"
   setting_mail_handler_api_enabled: Enable WS for incoming emails
-  setting_mail_handler_api_key: API key
+  setting_mail_handler_api_key: Incoming email WS API key
+  setting_sys_api_key: Repository management WS API key
   setting_sequential_project_identifiers: Generate sequential project identifiers
   setting_gravatar_enabled: Use Gravatar user icons
   setting_gravatar_default: Default Gravatar image
@@ -407,6 +408,7 @@ en:
   setting_openid: Allow OpenID login and registration
   setting_password_max_age: Require password change after
   setting_password_min_length: Minimum password length
+  setting_lost_password: Allow password reset via email
   setting_new_project_user_role_id: Role given to a non-admin user who creates a project
   setting_default_projects_modules: Default enabled modules for new projects
   setting_issue_done_ratio: Calculate the issue done ratio with
-- 
2.4.0