diff options
Diffstat (limited to 'app/helpers/visibility_level_helper.rb')
-rw-r--r-- | app/helpers/visibility_level_helper.rb | 33 |
1 files changed, 25 insertions, 8 deletions
diff --git a/app/helpers/visibility_level_helper.rb b/app/helpers/visibility_level_helper.rb index c577e2da1bb..68b15f7e042 100644 --- a/app/helpers/visibility_level_helper.rb +++ b/app/helpers/visibility_level_helper.rb @@ -22,7 +22,7 @@ module VisibilityLevelHelper when Project project_visibility_level_description(level) when Group - group_visibility_level_description(level) + group_visibility_level_description(level, form_model) end end @@ -125,22 +125,39 @@ module VisibilityLevelHelper def project_visibility_level_description(level) case level when Gitlab::VisibilityLevel::PRIVATE - _("Project access must be granted explicitly to each user. If this project is part of a group, access is granted to members of the group.") + s_("VisibilityLevel|Project access must be granted explicitly to each user. If this project is part of a group, access is granted to members of the group.") when Gitlab::VisibilityLevel::INTERNAL - _("The project can be accessed by any logged in user except external users.") + s_("VisibilityLevel|The project can be accessed by any logged in user except external users.") when Gitlab::VisibilityLevel::PUBLIC - _("The project can be accessed without any authentication.") + s_("VisibilityLevel|The project can be accessed without any authentication.") end end - def group_visibility_level_description(level) + def show_updated_public_description_for_setting(group) + group && !group.new_record? && Gitlab::CurrentSettings.current_application_settings.try(:should_check_namespace_plan?) + end + + def group_visibility_level_description(level, group = nil) case level when Gitlab::VisibilityLevel::PRIVATE - _("The group and its projects can only be viewed by members.") + s_("VisibilityLevel|The group and its projects can only be viewed by members.") when Gitlab::VisibilityLevel::INTERNAL - _("The group and any internal projects can be viewed by any logged in user except external users.") + s_("VisibilityLevel|The group and any internal projects can be viewed by any logged in user except external users.") when Gitlab::VisibilityLevel::PUBLIC - _("The group and any public projects can be viewed without any authentication.") + unless show_updated_public_description_for_setting(group) + return s_('VisibilityLevel|The group and any public projects can be viewed without any authentication.') + end + + Kernel.format( + s_( + 'VisibilityLevel|The group, any public projects, and any of their members, issues, and merge requests can be viewed without authentication. ' \ + 'Public groups and projects will be indexed by search engines. ' \ + 'Read more about %{free_user_limit_doc_link_start}free user limits%{link_end}, ' \ + 'or %{group_billings_link_start}upgrade to a paid tier%{link_end}.'), + free_user_limit_doc_link_start: "<a href='#{help_page_path('user/free_user_limit')}' target='_blank' rel='noopener noreferrer'>".html_safe, + group_billings_link_start: "<a href='#{group_billings_path(group)}' target='_blank' rel='noopener noreferrer'>".html_safe, + link_end: "</a>".html_safe + ).html_safe end end |