From 3b5b7d6ad53f63b6c8eed1205fb5db3f72138a38 Mon Sep 17 00:00:00 2001
From: Holger Just <holger@plan.io>
Date: Thu, 14 Sep 2017 17:18:50 +0200
Subject: [PATCH 1/2] Clarify consequences of disabling the login_required
 setting

---
 app/views/settings/_authentication.html.erb | 6 +++++-
 config/locales/de.yml                       | 3 +++
 config/locales/en.yml                       | 3 +++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/views/settings/_authentication.html.erb b/app/views/settings/_authentication.html.erb
index 4454bbae4..fc8fb0a78 100644
--- a/app/views/settings/_authentication.html.erb
+++ b/app/views/settings/_authentication.html.erb
@@ -1,7 +1,11 @@
 <%= form_tag({:action => 'edit', :tab => 'authentication'}) do %>
 
 <div class="box tabular settings">
-<p><%= setting_check_box :login_required %></p>
+<p>
+<p><%= setting_select :login_required, [[l(:label_login_required_yes), "1"],
+                                        [l(:label_login_required_no), "0"]] %>
+  <em class="info"><%= t(:text_login_required_html, anonymous_role_path: edit_role_path(Role.anonymous)) %></em>
+</p>
 
 <p><%= setting_select :autologin, [[l(:label_disabled), 0]] + [1, 7, 30, 365].collect{|days| [l('datetime.distance_in_words.x_days', :count => days), days.to_s]} %></p>
 
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 62def24c4..2f44b6bff 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -1234,3 +1234,6 @@ de:
   label_x_revisions: "%{count} revisions"
   error_can_not_delete_auth_source: This authentication mode is in use and cannot be
     deleted.
+  text_login_required_html: Ohne erforderliche Authentifizierung sind öffentlichen Projekte und deren Inhalte ohne Anmeldung frei zugänglich. Sie können die <a href="%{anonymous_role_path}">verwendeten Berechtigungen anpassen</a>.
+  label_login_required_yes: "Ja"
+  label_login_required_no: "Nein, anonymen Zugriff auf öffentliche Projekte erlauben"
diff --git a/config/locales/en.yml b/config/locales/en.yml
index d9095432b..c70af61c2 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1214,3 +1214,6 @@ en:
   description_issue_category_reassign: Choose issue category
   description_wiki_subpages_reassign: Choose new parent page
   text_repository_identifier_info: 'Only lower case letters (a-z), numbers, dashes and underscores are allowed.<br />Once saved, the identifier cannot be changed.'
+  text_login_required_html: When not requiring authentication, public projects and their contents are openly available on the network. You can <a href="%{anonymous_role_path}">edit the applicable permissions</a>.
+  label_login_required_yes: "Yes"
+  label_login_required_no: "No, allow anonymous access to public projects"
-- 
2.17.0