Merge branch 'russell-edit-whats-new-ui-text' into 'master'

Edit UI text of Settings UI section - What's new

See merge request gitlab-org/gitlab!64381

app/helpers/whats_new_helper.rb

@@ -32,11 +32,11 @@ module WhatsNewHelper
   def whats_new_variants_description(variant)
     case variant
     when 'all_tiers'
-      _("What's new presents new features from all tiers to help you keep track of all new features.")
+      _("Include new features from all tiers.")
     when 'current_tier'
-      _("What's new presents new features for your current subscription tier, while hiding new features not available to your subscription tier.")
+      _("Only include features new to your current subscription tier.")
     when 'disabled'
-      _("What's new is disabled and can no longer be viewed.")
+      _("%{italic_start}What's new%{italic_end} is inactive and cannot be viewed.").html_safe % { italic_start: '<i>'.html_safe, italic_end: '</i>'.html_safe }
     end
   end
 end

app/views/admin/application_settings/preferences.html.haml

@@ -20,7 +20,7 @@
     %button.btn.gl-button.btn-default.js-settings-toggle{ type: 'button' }
       = expanded_by_default? ? _('Collapse') : _('Expand')
     %p
-      = _("Configure What's new drawer and content.")
+      = _("Configure %{italic_start}What's new%{italic_end} drawer and content.").html_safe % { italic_start: '<i>'.html_safe, italic_end: '</i>'.html_safe }
   .settings-content
     = render 'whats_new'
 

locale/gitlab.pot

@@ -612,6 +612,9 @@ msgstr ""
 msgid "%{issuesSize} with a limit of %{maxIssueCount}"
 msgstr ""
 
+msgid "%{italic_start}What's new%{italic_end} is inactive and cannot be viewed."
+msgstr ""
+
 msgid "%{itemsCount} issues with a limit of %{maxIssueCount}"
 msgstr ""
 
@@ -8199,6 +8202,9 @@ msgstr ""
 msgid "Configure"
 msgstr ""
 
+msgid "Configure %{italic_start}What's new%{italic_end} drawer and content."
+msgstr ""
+
 msgid "Configure %{link} to track events. %{link_start}Learn more.%{link_end}"
 msgstr ""
 
@@ -8232,9 +8238,6 @@ msgstr ""
 msgid "Configure Tracing"
 msgstr ""
 
-msgid "Configure What's new drawer and content."
-msgstr ""
-
 msgid "Configure a %{codeStart}.gitlab-webide.yml%{codeEnd} file in the %{codeStart}.gitlab%{codeEnd} directory to start using the Web Terminal. %{helpStart}Learn more.%{helpEnd}"
 msgstr ""
 
@@ -17273,6 +17276,9 @@ msgstr ""
 msgid "Include merge request description"
 msgstr ""
 
+msgid "Include new features from all tiers."
+msgstr ""
+
 msgid "Include the username in the URL if required: %{code_open}https://username@gitlab.company.com/group/project.git%{code_close}."
 msgstr ""
 
@@ -22931,6 +22937,9 @@ msgstr ""
 msgid "Only admins can delete project"
 msgstr ""
 
+msgid "Only include features new to your current subscription tier."
+msgstr ""
+
 msgid "Only policy:"
 msgstr ""
 
@@ -36715,15 +36724,6 @@ msgstr ""
 msgid "What's new"
 msgstr ""
 
-msgid "What's new is disabled and can no longer be viewed."
-msgstr ""
-
-msgid "What's new presents new features for your current subscription tier, while hiding new features not available to your subscription tier."
-msgstr ""
-
-msgid "What's new presents new features from all tiers to help you keep track of all new features."
-msgstr ""
-
 msgid "What’s your experience level?"
 msgstr ""