From 2ce76266aa6d6e35834bac21922103dc4f624d2b Mon Sep 17 00:00:00 2001 From: Holger Just Date: Thu, 14 Sep 2017 17:44:20 +0200 Subject: [PATCH 2/2] Clarify consequences of setting a project as public --- app/views/projects/_form.html.erb | 5 ++++- config/locales/de.yml | 2 ++ config/locales/en.yml | 2 ++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/app/views/projects/_form.html.erb b/app/views/projects/_form.html.erb index 5bd5a9f0c..fc758f4e9 100644 --- a/app/views/projects/_form.html.erb +++ b/app/views/projects/_form.html.erb @@ -10,7 +10,10 @@ <%= l(:text_length_between, :min => 1, :max => Project::IDENTIFIER_MAX_LENGTH) %> <%= l(:text_project_identifier_info).html_safe %> <% end %>

<%= f.text_field :homepage, :size => 60 %>

-

<%= f.check_box :is_public %>

+

+ <%= f.check_box :is_public %> + <%= Setting.login_required? ? l(:text_project_is_public_non_member) : l(:text_project_is_public_anonymous) %> +

<% unless @project.allowed_parents.compact.empty? %>

<%= label(:project, :parent_id, l(:field_parent)) %><%= parent_project_select_tag(@project) %>

diff --git a/config/locales/de.yml b/config/locales/de.yml index 2f44b6bff..7691a9638 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -1237,3 +1237,5 @@ de: text_login_required_html: Ohne erforderliche Authentifizierung sind öffentlichen Projekte und deren Inhalte ohne Anmeldung frei zugänglich. Sie können die verwendeten Berechtigungen anpassen. label_login_required_yes: "Ja" label_login_required_no: "Nein, anonymen Zugriff auf öffentliche Projekte erlauben" + text_project_is_public_non_member: Öffentliche Projekte und deren Inhalte sind für alle angemeldeten Benutzer zugänglich. + text_project_is_public_anonymous: Öffentliche Projekte und deren Inhalte sind ohne Anmeldung frei zugänglich. diff --git a/config/locales/en.yml b/config/locales/en.yml index c70af61c2..8e5d257bb 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1217,3 +1217,5 @@ en: text_login_required_html: When not requiring authentication, public projects and their contents are openly available on the network. You can edit the applicable permissions. label_login_required_yes: "Yes" label_login_required_no: "No, allow anonymous access to public projects" + text_project_is_public_non_member: Public projects and their contents are available to all logged-in users. + text_project_is_public_anonymous: Public projects and their contents are openly available on the network. -- 2.17.0