Merge branch '225858-update-pref-page-homepage' into 'master'

Update preferences for homepage/dashboard wording

See merge request gitlab-org/gitlab!39092

app/views/profiles/preferences/show.html.haml

@@ -35,7 +35,7 @@
   .col-sm-12
     %hr
 
-  .col-lg-4.profile-settings-sidebar
+  .col-lg-4.profile-settings-sidebar#behavior
     %h4.gl-mt-0
       = s_('Preferences|Behavior')
     %p
@@ -51,8 +51,10 @@
         = s_('Preferences|Choose between fixed (max. 1280px) and fluid (%{percentage}) application layout.').html_safe % { percentage: '100%' }
     .form-group
       = f.label :dashboard, class: 'label-bold' do
-        = s_('Preferences|Default dashboard')
+        = s_('Preferences|Homepage content')
       = f.select :dashboard, dashboard_choices, {}, class: 'select2'
+      .form-text.text-muted
+        = s_('Preferences|Choose what content you want to see on your homepage.')
 
     = render_if_exists 'profiles/preferences/group_overview_selector', f: f # EE-specific
 

changelogs/unreleased/225858-update-pref-page-homepage.yml

+---
+title: Update preferences for homepage/dashboard wording
+merge_request: 39092
+author:
+type: changed

ee/app/views/profiles/preferences/_group_overview_selector.html.haml

@@ -5,4 +5,4 @@
     = _('Group overview content')
   = f.select :group_view, group_view_choices, {}, class: 'select2'
   .form-text.text-muted
-    = _('Choose what content you want to see on a group’s overview page')
+    = _('Choose what content you want to see on a group’s overview page.')

locale/gitlab.pot

@@ -4775,7 +4775,7 @@ msgstr ""
 msgid "Choose visibility level, enable/disable project features (issues, repository, wiki, snippets) and set permissions."
 msgstr ""
 
-msgid "Choose what content you want to see on a group’s overview page"
+msgid "Choose what content you want to see on a group’s overview page."
 msgstr ""
 
 msgid "Choose which repositories you want to connect and run CI/CD pipelines."
@@ -18070,13 +18070,13 @@ msgstr ""
 msgid "Preferences|Choose what content you want to see on a project’s overview page."
 msgstr ""
 
-msgid "Preferences|Customize integrations with third party services."
+msgid "Preferences|Choose what content you want to see on your homepage."
 msgstr ""
 
-msgid "Preferences|Customize the appearance of the application header and navigation sidebar."
+msgid "Preferences|Customize integrations with third party services."
 msgstr ""
 
-msgid "Preferences|Default dashboard"
+msgid "Preferences|Customize the appearance of the application header and navigation sidebar."
 msgstr ""
 
 msgid "Preferences|Display time in 24-hour format"
@@ -18088,6 +18088,9 @@ msgstr ""
 msgid "Preferences|For example: 30 mins ago."
 msgstr ""
 
+msgid "Preferences|Homepage content"
+msgstr ""
+
 msgid "Preferences|Instead of all the files changed, show only one file at a time. To switch between files, use the file browser."
 msgstr ""
 

spec/views/profiles/preferences/show.html.haml_spec.rb

@@ -20,6 +20,15 @@ RSpec.describe 'profiles/preferences/show' do
     it 'has option for Render whitespace characters in the Web IDE' do
       expect(rendered).to have_unchecked_field('Render whitespace characters in the Web IDE')
     end
+
+    it 'has an id for anchoring on behavior' do
+      expect(rendered).to have_css('#behavior')
+    end
+
+    it 'has helpful homepage setup guidance' do
+      expect(rendered).to have_field('Homepage content')
+      expect(rendered).to have_content('Choose what content you want to see on your homepage.')
+    end
   end
 
   context 'sourcegraph' do