Merge branch 'russell/improve-jira-service-help-text-2' into 'master'

UI text - Settings - Jira integration

See merge request gitlab-org/gitlab!57793

app/assets/javascripts/integrations/edit/components/jira_issues_fields.vue

@@ -129,7 +129,7 @@ export default {
             <template #help>
               {{
                 s__(
-                  'JiraService|Warning: All GitLab users that have access to this GitLab project will be able to view all issues from the Jira project specified below.',
+                  'JiraService|Warning: All GitLab users that have access to this GitLab project are able to view all issues from the Jira project specified below.',
                 )
               }}
             </template>
@@ -169,7 +169,7 @@ export default {
           id="service_project_key"
           v-model="projectKey"
           name="service[project_key]"
-          :placeholder="s__('JiraService|e.g. AB')"
+          :placeholder="s__('JiraService|For example, AB')"
           :required="enableJiraIssues"
           :state="validProjectKey"
           :disabled="!enableJiraIssues"

app/assets/javascripts/integrations/edit/components/jira_trigger_fields.vue

@@ -144,7 +144,7 @@ export default {
       label-for="service[trigger]"
       :description="
         s__(
-          'Integrations|When a Jira issue is mentioned in a commit or merge request a remote link and comment (if enabled) will be created.',
+          'Integrations|When a Jira issue is mentioned in a commit or merge request a remote link and comment (if enabled) is created.',
         )
       "
     >

app/models/project_services/jira_service.rb

@@ -116,7 +116,7 @@ class JiraService < IssueTrackerService
   end
 
   def description
-    s_('JiraService|Jira issue tracker')
+    s_('JiraService|Track issues in Jira')
   end
 
   def self.to_param
@@ -130,19 +130,20 @@ class JiraService < IssueTrackerService
         name: 'url',
         title: s_('JiraService|Web URL'),
         placeholder: 'https://jira.example.com',
+        help: s_('JiraService|Base URL of the Jira instance.'),
         required: true
       },
       {
         type: 'text',
         name: 'api_url',
         title: s_('JiraService|Jira API URL'),
-        placeholder: s_('JiraService|If different from Web URL')
+        help: s_('JiraService|If different from Web URL.')
       },
       {
         type: 'text',
         name: 'username',
         title: s_('JiraService|Username or Email'),
-        placeholder: s_('JiraService|Use a username for server version and an email for cloud version'),
+        help: s_('JiraService|Use a username for server version and an email for cloud version.'),
         required: true
       },
       {
@@ -150,8 +151,8 @@ class JiraService < IssueTrackerService
         name: 'password',
         title: s_('JiraService|Password or API token'),
         non_empty_password_title: s_('JiraService|Enter new password or API token'),
-        non_empty_password_help: s_('JiraService|Leave blank to use your current password or API token'),
-        placeholder: s_('JiraService|Use a password for server version and an API token for cloud version'),
+        non_empty_password_help: s_('JiraService|Leave blank to use your current password or API token.'),
+        help: s_('JiraService|Use a password for server version and an API token for cloud version.'),
         required: true
       }
     ]

changelogs/unreleased/russell-improve-jira-service-help-text-2.yml

+---
+title: Update Jira plugin UI copy
+merge_request: 57793
+author: Russell Dickenson rdickenson@gitlab.com
+type: other

locale/gitlab.pot

@@ -16961,7 +16961,7 @@ msgstr ""
 msgid "Integrations|Use the GitLab Slack application"
 msgstr ""
 
-msgid "Integrations|When a Jira issue is mentioned in a commit or merge request a remote link and comment (if enabled) will be created."
+msgid "Integrations|When a Jira issue is mentioned in a commit or merge request a remote link and comment (if enabled) is created."
 msgstr ""
 
 msgid "Integrations|You can now close this window and return to the GitLab for Jira application."
@@ -17678,6 +17678,9 @@ msgstr ""
 msgid "JiraService|Automatically transitions Jira issues to the \"Done\" category. %{linkStart}Learn more%{linkEnd}"
 msgstr ""
 
+msgid "JiraService|Base URL of the Jira instance."
+msgstr ""
+
 msgid "JiraService|Define the type of Jira issue to create from a vulnerability."
 msgstr ""
 
@@ -17708,10 +17711,13 @@ msgstr ""
 msgid "JiraService|For example, 12, 24"
 msgstr ""
 
+msgid "JiraService|For example, AB"
+msgstr ""
+
 msgid "JiraService|GitLab for Jira Configuration"
 msgstr ""
 
-msgid "JiraService|If different from Web URL"
+msgid "JiraService|If different from Web URL."
 msgstr ""
 
 msgid "JiraService|Issue List"
@@ -17732,16 +17738,13 @@ msgstr ""
 msgid "JiraService|Jira comments will be created when an issue gets referenced in a merge request."
 msgstr ""
 
-msgid "JiraService|Jira issue tracker"
-msgstr ""
-
 msgid "JiraService|Jira issue type"
 msgstr ""
 
 msgid "JiraService|Jira project key"
 msgstr ""
 
-msgid "JiraService|Leave blank to use your current password or API token"
+msgid "JiraService|Leave blank to use your current password or API token."
 msgstr ""
 
 msgid "JiraService|Move to Done"
@@ -17777,13 +17780,16 @@ msgstr ""
 msgid "JiraService|This issue is synchronized with Jira"
 msgstr ""
 
+msgid "JiraService|Track issues in Jira"
+msgstr ""
+
 msgid "JiraService|Transition Jira issues to their final state:"
 msgstr ""
 
-msgid "JiraService|Use a password for server version and an API token for cloud version"
+msgid "JiraService|Use a password for server version and an API token for cloud version."
 msgstr ""
 
-msgid "JiraService|Use a username for server version and an email for cloud version"
+msgid "JiraService|Use a username for server version and an email for cloud version."
 msgstr ""
 
 msgid "JiraService|Use custom transitions"
@@ -17798,7 +17804,7 @@ msgstr ""
 msgid "JiraService|View Jira issues in GitLab"
 msgstr ""
 
-msgid "JiraService|Warning: All GitLab users that have access to this GitLab project will be able to view all issues from the Jira project specified below."
+msgid "JiraService|Warning: All GitLab users that have access to this GitLab project are able to view all issues from the Jira project specified below."
 msgstr ""
 
 msgid "JiraService|Web URL"
@@ -17807,9 +17813,6 @@ msgstr ""
 msgid "JiraService|Work on Jira issues without leaving GitLab. Adds a Jira menu to access your list of Jira issues and view any issue as read-only."
 msgstr ""
 
-msgid "JiraService|e.g. AB"
-msgstr ""
-
 msgid "JiraService|transition ids can have only numbers which can be split with , or ;"
 msgstr ""
 

spec/serializers/service_field_entity_spec.rb

@@ -23,10 +23,10 @@ RSpec.describe ServiceFieldEntity do
             type: 'text',
             name: 'username',
             title: 'Username or Email',
-            placeholder: 'Use a username for server version and an email for cloud version',
+            placeholder: nil,
+            help: 'Use a username for server version and an email for cloud version.',
             required: true,
             choices: nil,
-            help: nil,
             value: 'jira_username'
           }
 
@@ -42,10 +42,10 @@ RSpec.describe ServiceFieldEntity do
             type: 'password',
             name: 'password',
             title: 'Enter new password or API token',
-            placeholder: 'Use a password for server version and an API token for cloud version',
+            placeholder: nil,
+            help: 'Leave blank to use your current password or API token.',
             required: true,
             choices: nil,
-            help: 'Leave blank to use your current password or API token',
             value: 'true'
           }