Merge branch '330197-kpaizee-snowplow-ui-text' into 'master'

Revise UI text for Snowplow settings

See merge request gitlab-org/gitlab!63218

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

@@ -6,7 +6,8 @@
     %button.btn.gl-button.btn-default.js-settings-toggle{ type: 'button' }
       = expanded ? _('Collapse') : _('Expand')
     %p
-      = _('Configure the %{link} integration.').html_safe % { link: link_to('Snowplow', 'https://snowplowanalytics.com/', target: '_blank') }
+      - link_start = '<a href="%{url}">'.html_safe % { url: help_page_path('development/snowplow/index') }
+      = html_escape(_('Configure %{link} to track events. %{link_start}Learn more.%{link_end}')) % { link: link_to('Snowplow', 'https://snowplowanalytics.com/', target: '_blank').html_safe, link_start: link_start, link_end: '</a>'.html_safe }
   .settings-content
     = form_for @application_setting, url: general_admin_application_settings_path(anchor: 'js-snowplow-settings'), html: { class: 'fieldset-form', id: 'snowplow-settings' } do |f|
       = form_errors(@application_setting) if expanded
@@ -15,15 +16,21 @@
         .form-group
           .form-check
             = f.check_box :snowplow_enabled, class: 'form-check-input'
-            = f.label :snowplow_enabled, _('Enable snowplow tracking'), class: 'form-check-label'
+            = f.label :snowplow_enabled, _('Enable Snowplow tracking'), class: 'form-check-label'
         .form-group
           = f.label :snowplow_collector_hostname, _('Collector hostname'), class: 'label-light'
           = f.text_field :snowplow_collector_hostname, class: 'form-control gl-form-input', placeholder: 'snowplow.example.com'
+          .form-text.text-muted
+            = _('The hostname of your Snowplow collector.')
         .form-group
           = f.label :snowplow_app_id, _('App ID'), class: 'label-light'
-          = f.text_field :snowplow_app_id, class: 'form-control gl-form-input'
+          = f.text_field :snowplow_app_id, class: 'form-control gl-form-input', placeholder: 'gitlab'
+          .form-text.text-muted
+            = _('The ID of the application.')
         .form-group
           = f.label :snowplow_cookie_domain, _('Cookie domain'), class: 'label-light'
-          = f.text_field :snowplow_cookie_domain, class: 'form-control gl-form-input'
+          = f.text_field :snowplow_cookie_domain, class: 'form-control gl-form-input', placeholder: '.your-gitlab-instance.com'
+          .form-text.text-muted
+            = _('The Snowplow cookie domain.')
 
       = f.submit _('Save changes'), class: 'gl-button btn btn-confirm'

doc/development/snowplow/index.md

@@ -58,7 +58,7 @@ To enable Snowplow tracking on a self-managed instance:
 
 1. Expand **Snowplow**.
 
-1. Select **Enable snowplow tracking** and enter your Snowplow configuration information. For example:
+1. Select **Enable Snowplow tracking** and enter your Snowplow configuration information. For example:
 
    | Name               | Value                         |
    |--------------------|-------------------------------|

locale/gitlab.pot

@@ -8133,6 +8133,9 @@ msgstr ""
 msgid "Configuration help"
 msgstr ""
 
+msgid "Configure %{link} to track events. %{link_start}Learn more.%{link_end}"
+msgstr ""
+
 msgid "Configure GitLab runners to start using the Web Terminal. %{helpStart}Learn more.%{helpEnd}"
 msgstr ""
 
@@ -8205,9 +8208,6 @@ msgstr ""
 msgid "Configure storage path settings."
 msgstr ""
 
-msgid "Configure the %{link} integration."
-msgstr ""
-
 msgid "Configure the way a user creates a new account."
 msgstr ""
 
@@ -11953,6 +11953,9 @@ msgstr ""
 msgid "Enable SSL verification"
 msgstr ""
 
+msgid "Enable Snowplow tracking"
+msgstr ""
+
 msgid "Enable Spam Check via external API endpoint"
 msgstr ""
 
@@ -12067,9 +12070,6 @@ msgstr ""
 msgid "Enable smartcn custom analyzer: Search"
 msgstr ""
 
-msgid "Enable snowplow tracking"
-msgstr ""
-
 msgid "Enable two-factor authentication"
 msgstr ""
 
@@ -32137,6 +32137,9 @@ msgstr ""
 msgid "The GitLab user to which the Jira user %{jiraDisplayName} will be mapped"
 msgstr ""
 
+msgid "The ID of the application."
+msgstr ""
+
 msgid "The Issue Tracker is the place to add things that need to be improved or solved in a project"
 msgstr ""
 
@@ -32146,6 +32149,9 @@ msgstr ""
 msgid "The Prometheus server responded with \"bad request\". Please check your queries are correct and are supported in your Prometheus version. %{documentationLink}"
 msgstr ""
 
+msgid "The Snowplow cookie domain."
+msgstr ""
+
 msgid "The URL defined on the primary node that secondary nodes should use to contact it."
 msgstr ""
 
@@ -32319,6 +32325,9 @@ msgstr ""
 msgid "The group_project_ids parameter is only allowed for a group"
 msgstr ""
 
+msgid "The hostname of your Snowplow collector."
+msgstr ""
+
 msgid "The import will time out after %{timeout}. For repositories that take longer, use a clone/push combination."
 msgstr ""