Merge branch 'russell/improve-group-advanced-ui-text' into 'master'

Improve group advanced settings UI text

See merge request gitlab-org/gitlab!75462

app/helpers/export_helper.rb

@@ -18,7 +18,7 @@ module ExportHelper
     [
       _('Milestones'),
       _('Labels'),
-      _('Boards and Board Lists'),
+      _('Boards and board lists'),
       _('Badges'),
       _('Subgroups')
     ]

app/views/groups/settings/_advanced.html.haml

@@ -7,9 +7,8 @@
     = form_errors(@group)
     .form-group
       %p
-        = s_('GroupSettings|Changing group URL can have unintended side effects.')
-        = succeed '.' do
-          = link_to _('Learn more'), help_page_path('user/group/index', anchor: 'change-a-groups-path'), target: '_blank'
+        = s_("GroupSettings|Changing a group's URL can have unintended side effects.")
+        = link_to _('Learn more.'), help_page_path('user/group/index', anchor: 'change-a-groups-path'), target: '_blank', rel: 'noopener noreferrer'
 
       .input-group.gl-field-error-anchor
         .group-root-path.input-group-prepend.has-tooltip{ title: group_path(@group), :'data-placement' => 'bottom' }

app/views/groups/settings/_export.html.haml

@@ -4,8 +4,11 @@
 
 .sub-section
   %h4= s_('GroupSettings|Export group')
-  %p= _('Export this group with all related data to a new GitLab instance. Once complete, you can import the data file from the "New Group" page.')
-
+  %p= _('Export this group with all related data.')
+  %p
+    - export_information = _('After the export is complete, download the data file from a notification email or from this page. You can then import the data file from the %{strong_text_start}Create new group%{strong_text_end} page of another GitLab instance.') % { strong_text_start: '<strong>'.html_safe, strong_text_end: '</strong>'.html_safe}
+    = export_information.html_safe
+    = link_to _('Learn more.'), help_page_path('user/group/settings/import_export.md'), target: '_blank', rel: 'noopener noreferrer'
   .bs-callout.bs-callout-info
     %p.gl-mb-0
       %p= _('The following items will be exported:')
@@ -17,7 +20,6 @@
         %li= _('Projects')
         %li= _('Runner tokens')
         %li= _('SAML discovery tokens')
-  %p= _('Once the exported file is ready, you will receive a notification email with a download link, or you can download it from this page.')
   - if group.export_file_exists?
     = link_to _('Regenerate export'), export_group_path(group),
         method: :post, class: 'btn gl-button btn-default', data: { qa_selector: 'regenerate_export_group_link' }

app/views/groups/settings/_transfer.html.haml

 .sub-section
   %h4.warning-title= s_('GroupSettings|Transfer group')
+  %p= _('Transfer group to another parent group.')
   = form_for group, url: transfer_group_path(group), method: :put, html: { class: 'js-group-transfer-form' } do |f|
-    .form-group
-      = dropdown_tag('Select parent group', options: { toggle_class: 'js-groups-dropdown', title: 'Parent Group', filter: true, dropdown_class: 'dropdown-open-top dropdown-group-transfer', placeholder: 'Search groups', disabled: group.paid?, data: { data: parent_group_options(group), qa_selector: 'select_group_dropdown' } })
-      = hidden_field_tag 'new_parent_group_id'
 
     %ul
-      - side_effects_link_start = '<a href="https://docs.gitlab.com/ee/user/project/repository/index.html#what-happens-when-a-repository-path-changes" target="_blank">'.html_safe
-      - warning_text = s_("GroupSettings|Be careful. Changing a group's parent can have unintended %{side_effects_link_start}side effects%{side_effects_link_end}.") % { side_effects_link_start: side_effects_link_start, side_effects_link_end: '</a>'.html_safe }
+      - learn_more_link_start = '<a href="https://docs.gitlab.com/ee/user/project/index.html#redirects-when-changing-repository-paths" target="_blank" rel="noopener noreferrer">'.html_safe
+      - warning_text = s_("GroupSettings|Be careful. Changing a group's parent can have unintended side effects. %{learn_more_link_start}Learn more.%{learn_more_link_end}") % { learn_more_link_start: learn_more_link_start, learn_more_link_end: '</a>'.html_safe }
       %li= warning_text.html_safe
       %li= s_('GroupSettings|You can only transfer the group to a group you manage.')
       %li= s_('GroupSettings|You will need to update your local repositories to point to the new location.')
       %li= s_("GroupSettings|If the parent group's visibility is lower than the group current visibility, visibility levels for subgroups and projects will be changed to match the new parent group's visibility.")
 
+    .form-group
+      = dropdown_tag(s_('GroupSettings|Select parent group'), options: { toggle_class: 'js-groups-dropdown', title: s_('GroupSettings|Parent Group'), filter: true, dropdown_class: 'dropdown-open-top dropdown-group-transfer', placeholder: s_('GroupSettings|Search groups'), disabled: group.paid?, data: { data: parent_group_options(group), qa_selector: 'select_group_dropdown' } })
+      = hidden_field_tag 'new_parent_group_id'
     - if group.paid?
       .gl-alert.gl-alert-info.gl-mb-5
         = sprite_icon('information-o', size: 16, css_class: 'gl-icon gl-alert-icon gl-alert-icon-no-title')

ee/app/helpers/ee/export_helper.rb

@@ -6,7 +6,7 @@ module EE
 
     override :group_export_descriptions
     def group_export_descriptions
-      super + [_('Epics'), _('Events'), _('Group Wikis')]
+      super + [_('Epics'), _('Events'), _('Group wikis')]
     end
   end
 end

ee/app/views/groups/settings/_adjourned_deletion.html.haml

@@ -6,9 +6,7 @@
   %h4.danger-title= _('Remove group')
   = form_tag(group, method: :delete, id: remove_form_id) do
     %p
-      = html_escape(_("Upon performing this action, the contents of this group, its subgroup and projects will be permanently deleted after %{deletion_adjourned_period} days on %{date}. Until that time:")) % { date: tag.strong(date), deletion_adjourned_period: deletion_adjourned_period }
-    %ul
-      %li= _("The group will be placed in 'pending deletion' state")
-      %li= _("The group can be fully restored")
+      = html_escape(_("This group and its subgroups and projects will be placed in a 'pending deletion' state for %{deletion_adjourned_period} days, then permanently deleted on %{date}. The group can be fully restored before that date.")) % { date: tag.strong(date), deletion_adjourned_period: deletion_adjourned_period }
+      = link_to _('Learn more.'), help_page_path('user/group/index', anchor: 'remove-a-group'), target: '_blank', rel: 'noopener noreferrer'
 
     = render 'groups/settings/remove_button', group: group, remove_form_id: remove_form_id

ee/spec/helpers/ee/export_helper_spec.rb

@@ -5,7 +5,7 @@ require 'spec_helper'
 RSpec.describe ExportHelper do
   describe '#group_export_descriptions' do
     it 'includes EE features in the description' do
-      expect(helper.group_export_descriptions).to include('Epics', 'Events', 'Group Wikis')
+      expect(helper.group_export_descriptions).to include('Epics', 'Events', 'Group wikis')
     end
   end
 end

locale/gitlab.pot

@@ -2993,6 +2993,9 @@ msgstr ""
 msgid "After it expires, you can't use merge approvals, epics, or many security features."
 msgstr ""
 
+msgid "After the export is complete, download the data file from a notification email or from this page. You can then import the data file from the %{strong_text_start}Create new group%{strong_text_end} page of another GitLab instance."
+msgstr ""
+
 msgid "After you've reviewed these contribution guidelines, you'll be all set to"
 msgstr ""
 
@@ -5633,7 +5636,7 @@ msgstr ""
 msgid "Boards"
 msgstr ""
 
-msgid "Boards and Board Lists"
+msgid "Boards and board lists"
 msgstr ""
 
 msgid "Boards|+ %{displayedIssuablesCount} more %{issuableType}"
@@ -14259,7 +14262,7 @@ msgstr ""
 msgid "Export requirements"
 msgstr ""
 
-msgid "Export this group with all related data to a new GitLab instance. Once complete, you can import the data file from the \"New Group\" page."
+msgid "Export this group with all related data."
 msgstr ""
 
 msgid "Export this project with all its related data in order to move it to a new GitLab instance. When the exported file is ready, you can download it from this page or from the download link in the email notification you will receive. You can then import it when creating a new project. %{link_start}Learn more.%{link_end}"
@@ -16440,9 +16443,6 @@ msgstr ""
 msgid "Group URL"
 msgstr ""
 
-msgid "Group Wikis"
-msgstr ""
-
 msgid "Group application: %{name}"
 msgstr ""
 
@@ -16569,6 +16569,9 @@ msgstr ""
 msgid "Group was successfully updated."
 msgstr ""
 
+msgid "Group wikis"
+msgstr ""
+
 msgid "Group: %{group_name}"
 msgstr ""
 
@@ -16842,7 +16845,7 @@ msgstr ""
 msgid "GroupSettings|Badges"
 msgstr ""
 
-msgid "GroupSettings|Be careful. Changing a group's parent can have unintended %{side_effects_link_start}side effects%{side_effects_link_end}."
+msgid "GroupSettings|Be careful. Changing a group's parent can have unintended side effects. %{learn_more_link_start}Learn more.%{learn_more_link_end}"
 msgstr ""
 
 msgid "GroupSettings|Cannot update the path because there are projects under this group that contain Docker images in their Container Registry. Please remove the images from your projects first and try again."
@@ -16851,7 +16854,7 @@ msgstr ""
 msgid "GroupSettings|Change group URL"
 msgstr ""
 
-msgid "GroupSettings|Changing group URL can have unintended side effects."
+msgid "GroupSettings|Changing a group's URL can have unintended side effects."
 msgstr ""
 
 msgid "GroupSettings|Compliance frameworks"
@@ -16893,6 +16896,9 @@ msgstr ""
 msgid "GroupSettings|Overrides user notification preferences for all members of the group, subgroups, and projects."
 msgstr ""
 
+msgid "GroupSettings|Parent Group"
+msgstr ""
+
 msgid "GroupSettings|Pipeline settings was updated for the group"
 msgstr ""
 
@@ -16920,12 +16926,18 @@ msgstr ""
 msgid "GroupSettings|Projects will be permanently deleted after a %{waiting_period}-day delay. This delay can be %{link_start}customized by an admin%{link_end} in instance settings. Inherited by subgroups."
 msgstr ""
 
+msgid "GroupSettings|Search groups"
+msgstr ""
+
 msgid "GroupSettings|Select a project with the %{code_start}.gitlab/insights.yml%{code_end} file"
 msgstr ""
 
 msgid "GroupSettings|Select a subgroup to use as the source for custom project templates for this group."
 msgstr ""
 
+msgid "GroupSettings|Select parent group"
+msgstr ""
+
 msgid "GroupSettings|Select the project that contains your custom Insights file."
 msgstr ""
 
@@ -24409,9 +24421,6 @@ msgstr ""
 msgid "Once removed, the fork relationship cannot be restored. This project will no longer be able to receive or send merge requests to the source project or other forks."
 msgstr ""
 
-msgid "Once the exported file is ready, you will receive a notification email with a download link, or you can download it from this page."
-msgstr ""
-
 msgid "Once you confirm and press \"Reduce project visibility\":"
 msgstr ""
 
@@ -34811,9 +34820,6 @@ msgstr ""
 msgid "The group and its projects can only be viewed by members."
 msgstr ""
 
-msgid "The group can be fully restored"
-msgstr ""
-
 msgid "The group export can be downloaded from:"
 msgstr ""
 
@@ -34823,9 +34829,6 @@ msgstr ""
 msgid "The group settings for %{group_links} require you to enable Two-Factor Authentication for your account. You can %{leave_group_links}."
 msgstr ""
 
-msgid "The group will be placed in 'pending deletion' state"
-msgstr ""
-
 msgid "The group_project_ids parameter is only allowed for a group"
 msgstr ""
 
@@ -35654,6 +35657,9 @@ msgstr ""
 msgid "This group"
 msgstr ""
 
+msgid "This group and its subgroups and projects will be placed in a 'pending deletion' state for %{deletion_adjourned_period} days, then permanently deleted on %{date}. The group can be fully restored before that date."
+msgstr ""
+
 msgid "This group can't be removed because it is linked to a subscription. To remove this group, %{linkStart}link the subscription%{linkEnd} with a different group."
 msgstr ""
 
@@ -36771,6 +36777,9 @@ msgstr ""
 msgid "Transfer"
 msgstr ""
 
+msgid "Transfer group to another parent group."
+msgstr ""
+
 msgid "Transfer ownership"
 msgstr ""
 
@@ -37556,9 +37565,6 @@ msgstr ""
 msgid "Uploading changes to terminal"
 msgstr ""
 
-msgid "Upon performing this action, the contents of this group, its subgroup and projects will be permanently deleted after %{deletion_adjourned_period} days on %{date}. Until that time:"
-msgstr ""
-
 msgid "Upstream"
 msgstr ""