From 294b85eb7c83cdff3950322ee7a06c68b9523651 Mon Sep 17 00:00:00 2001
From: Kati Paizee <kpaizee@gitlab.com>
Date: Wed, 23 Jun 2021 14:54:00 +0200
Subject: [PATCH] Revise UI text for third-party offers
Update the Admin Area third-party offers UI text
Changelog: changed
---
.../application_settings/_third_party_offers.html.haml | 6 +++---
doc/user/admin_area/settings/third_party_offers.md | 7 ++++---
locale/gitlab.pot | 6 +++---
3 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/app/views/admin/application_settings/_third_party_offers.html.haml b/app/views/admin/application_settings/_third_party_offers.html.haml
index 5df2454ed2e..9a34400092e 100644
--- a/app/views/admin/application_settings/_third_party_offers.html.haml
+++ b/app/views/admin/application_settings/_third_party_offers.html.haml
@@ -2,11 +2,11 @@
%section.settings.as-third-party-offers.no-animate#js-third-party-offers-settings{ class: ('expanded' if expanded) }
.settings-header
%h4
- = _('Third party offers')
+ = _('Third-party offers')
%button.btn.gl-button.btn-default.js-settings-toggle{ type: 'button' }
= expanded ? _('Collapse') : _('Expand')
%p
- = _('Control the display of third party offers.')
+ = _('Control whether to display third-party offers in GitLab.')
.settings-content
= form_for @application_setting, url: general_admin_application_settings_path(anchor: 'js-third-party-offers-settings'), html: { class: 'fieldset-form', id: 'third-party-offers-settings' } do |f|
= form_errors(@application_setting) if expanded
@@ -15,6 +15,6 @@
.form-group
.form-check
= f.check_box :hide_third_party_offers, class: 'form-check-input'
- = f.label :hide_third_party_offers, _('Do not display offers from third parties within GitLab'), class: 'form-check-label'
+ = f.label :hide_third_party_offers, _('Do not display offers from third parties'), class: 'form-check-label'
= f.submit _('Save changes'), class: "gl-button btn btn-confirm"
diff --git a/doc/user/admin_area/settings/third_party_offers.md b/doc/user/admin_area/settings/third_party_offers.md
index e7fa8b1dc40..6f7cb081315 100644
--- a/doc/user/admin_area/settings/third_party_offers.md
+++ b/doc/user/admin_area/settings/third_party_offers.md
@@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
type: reference
---
-# Third party offers **(FREE SELF)**
+# Third-party offers **(FREE SELF)**
> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/20379) in GitLab Free 11.1.
@@ -16,8 +16,9 @@ for using [Google Kubernetes Engine](https://cloud.google.com/kubernetes-engine/
To toggle the display of third-party offers:
1. On the top bar, select **Menu >** **{admin}** **Admin**.
-1. In the left sidebar, select **Settings**, and expand **Third party offers**.
-1. Select **Do not display offers from third parties within GitLab**.
+1. On the left sidebar, select **Settings**, and expand **Third-party offers**.
+1. Select **Do not display offers from third parties**.
+1. Select **Save changes**.
<!-- ## Troubleshooting
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 39837e1768e..c6a855ac918 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -8736,7 +8736,7 @@ msgstr ""
msgid "Control emails linked to your account"
msgstr ""
-msgid "Control the display of third party offers."
+msgid "Control whether to display third-party offers in GitLab."
msgstr ""
msgid "Cookie domain"
@@ -11431,7 +11431,7 @@ msgstr ""
msgid "Display source"
msgstr ""
-msgid "Do not display offers from third parties within GitLab"
+msgid "Do not display offers from third parties"
msgstr ""
msgid "Do you want to remove this deploy key?"
@@ -32940,7 +32940,7 @@ msgstr ""
msgid "Third Party Advisory Link"
msgstr ""
-msgid "Third party offers"
+msgid "Third-party offers"
msgstr ""
msgid "This %{issuableDisplayName} is locked. Only project members can comment."
--
2.30.9