Merge branch 'ui-text-error-tracking' into 'master'

UI text edits for error tracking

See merge request gitlab-org/gitlab!57276

app/assets/javascripts/error_tracking_settings/components/error_tracking_form.vue

@@ -33,7 +33,7 @@ export default {
           <p class="form-text text-muted">
             {{
               s__(
-                "ErrorTracking|If you self-host Sentry, enter the full URL of your Sentry instance. If you're using Sentry's hosted solution, enter https://sentry.io",
+                "ErrorTracking|If you self-host Sentry, enter your Sentry instance's full URL. If you use Sentry's hosted solution, enter https://sentry.io",
               )
             }}
           </p>
@@ -75,12 +75,12 @@ export default {
         </div>
       </div>
       <p v-if="connectError" class="gl-field-error">
-        {{ s__('ErrorTracking|Connection has failed. Re-check Auth Token and try again.') }}
+        {{ s__('ErrorTracking|Connection failed. Check Auth Token and try again.') }}
       </p>
       <p v-else class="form-text text-muted">
         {{
           s__(
-            "ErrorTracking|After adding your Auth Token, use the 'Connect' button to load projects",
+            'ErrorTracking|After adding your Auth Token, select the Connect button to load projects.',
           )
         }}
       </p>

app/assets/javascripts/error_tracking_settings/store/getters.js

@@ -34,8 +34,8 @@ export const invalidProjectLabel = (state) => {
 export const projectSelectionLabel = (state) => {
   if (state.token) {
     return s__(
-      "ErrorTracking|Click 'Connect' to re-establish the connection to Sentry and activate the dropdown.",
+      'ErrorTracking|Click Connect to reestablish the connection to Sentry and activate the dropdown.',
     );
   }
-  return s__('ErrorTracking|To enable project selection, enter a valid Auth Token');
+  return s__('ErrorTracking|To enable project selection, enter a valid Auth Token.');
 };

changelogs/unreleased/ui-text-error-tracking.yml

+---
+title: Updated UI text to match style guidelines
+merge_request: 57276
+author:
+type: other

locale/gitlab.pot

@@ -12320,19 +12320,19 @@ msgstr ""
 msgid "ErrorTracking|Active"
 msgstr ""
 
-msgid "ErrorTracking|After adding your Auth Token, use the 'Connect' button to load projects"
+msgid "ErrorTracking|After adding your Auth Token, select the Connect button to load projects."
 msgstr ""
 
 msgid "ErrorTracking|Auth Token"
 msgstr ""
 
-msgid "ErrorTracking|Click 'Connect' to re-establish the connection to Sentry and activate the dropdown."
+msgid "ErrorTracking|Click Connect to reestablish the connection to Sentry and activate the dropdown."
 msgstr ""
 
-msgid "ErrorTracking|Connection has failed. Re-check Auth Token and try again."
+msgid "ErrorTracking|Connection failed. Check Auth Token and try again."
 msgstr ""
 
-msgid "ErrorTracking|If you self-host Sentry, enter the full URL of your Sentry instance. If you're using Sentry's hosted solution, enter https://sentry.io"
+msgid "ErrorTracking|If you self-host Sentry, enter your Sentry instance's full URL. If you use Sentry's hosted solution, enter https://sentry.io"
 msgstr ""
 
 msgid "ErrorTracking|No projects available"
@@ -12341,7 +12341,7 @@ msgstr ""
 msgid "ErrorTracking|Select project"
 msgstr ""
 
-msgid "ErrorTracking|To enable project selection, enter a valid Auth Token"
+msgid "ErrorTracking|To enable project selection, enter a valid Auth Token."
 msgstr ""
 
 msgid "Errors"

spec/features/projects/settings/operations_settings_spec.rb

@@ -146,7 +146,7 @@ RSpec.describe 'Projects > Settings > For a forked project', :js do
 
           click_button('Connect')
 
-          assert_text('Connection has failed. Re-check Auth Token and try again.')
+          assert_text('Connection failed. Check Auth Token and try again.')
         end
       end
     end

spec/frontend/error_tracking_settings/components/error_tracking_form_spec.js

@@ -44,13 +44,13 @@ describe('error tracking settings form', () => {
       const pageText = wrapper.text();
 
       expect(pageText).toContain(
-        "If you self-host Sentry, enter the full URL of your Sentry instance. If you're using Sentry's hosted solution, enter https://sentry.io",
+        "If you self-host Sentry, enter your Sentry instance's full URL. If you use Sentry's hosted solution, enter https://sentry.io",
       );
       expect(pageText).toContain(
-        "After adding your Auth Token, use the 'Connect' button to load projects",
+        'After adding your Auth Token, select the Connect button to load projects.',
       );
 
-      expect(pageText).not.toContain('Connection has failed. Re-check Auth Token and try again');
+      expect(pageText).not.toContain('Connection failed. Check Auth Token and try again.');
       expect(wrapper.findAll(GlFormInput).at(0).attributes('placeholder')).toContain(
         'https://mysentryserver.com',
       );
@@ -80,9 +80,7 @@ describe('error tracking settings form', () => {
     });
 
     it('does not show an error', () => {
-      expect(wrapper.text()).not.toContain(
-        'Connection has failed. Re-check Auth Token and try again',
-      );
+      expect(wrapper.text()).not.toContain('Connection failed. Check Auth Token and try again.');
     });
   });
 
@@ -96,7 +94,7 @@ describe('error tracking settings form', () => {
     });
 
     it('shows an error', () => {
-      expect(wrapper.text()).toContain('Connection has failed. Re-check Auth Token and try again');
+      expect(wrapper.text()).toContain('Connection failed. Check Auth Token and try again.');
     });
   });
 });

spec/frontend/error_tracking_settings/store/getters_spec.js

@@ -78,7 +78,7 @@ describe('Error Tracking Settings - Getters', () => {
   describe('projectSelectionLabel', () => {
     it('should show the correct message when the token is empty', () => {
       expect(getters.projectSelectionLabel(state)).toEqual(
-        'To enable project selection, enter a valid Auth Token',
+        'To enable project selection, enter a valid Auth Token.',
       );
     });
 
@@ -86,7 +86,7 @@ describe('Error Tracking Settings - Getters', () => {
       state.token = 'test-token';
 
       expect(getters.projectSelectionLabel(state)).toEqual(
-        "Click 'Connect' to re-establish the connection to Sentry and activate the dropdown.",
+        'Click Connect to reestablish the connection to Sentry and activate the dropdown.',
       );
     });
   });