Merge branch 'jira-form-copy-updates' into 'master'

Minor copy updates to Jira integration form

See merge request gitlab-org/gitlab!61205

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

@@ -16,13 +16,13 @@ const commentDetailOptions = [
   {
     value: 'standard',
     label: s__('Integrations|Standard'),
-    help: s__('Integrations|Includes commit title and branch'),
+    help: s__('Integrations|Includes commit title and branch.'),
   },
   {
     value: 'all_details',
     label: s__('Integrations|All details'),
     help: s__(
-      'Integrations|Includes Standard plus entire commit message, commit hash, and issue IDs',
+      'Integrations|Includes Standard, plus the entire commit message, commit hash, and issue IDs',
     ),
   },
 ];
@@ -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) is created.',
+          'Integrations|When you mention a Jira issue in a commit or merge request, GitLab creates a remote link and comment (if enabled).',
         )
       "
     >

app/models/project_services/jira_service.rb

@@ -106,9 +106,8 @@ class JiraService < IssueTrackerService
   end
 
   def help
-    "You need to configure Jira before enabling this service. For more details
-    read the
-    [Jira service documentation](#{help_page_url('user/project/integrations/jira')})."
+    jira_doc_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: help_page_url('integration/jira/index.html') }
+    s_("JiraService|You need to configure Jira before enabling this integration. For more details, read the %{jira_doc_link_start}Jira integration documentation%{link_end}.") % { jira_doc_link_start: jira_doc_link_start, link_end: '</a>'.html_safe }
   end
 
   def title

changelogs/unreleased/jira-form-copy-updates.yml

+---
+title: Improve field descriptions in the Jira integration form
+merge_request: 61205
+author:
+type: changed

locale/gitlab.pot

@@ -17586,10 +17586,10 @@ msgstr ""
 msgid "Integrations|Failed to unlink namespace. Please try again."
 msgstr ""
 
-msgid "Integrations|Includes Standard plus entire commit message, commit hash, and issue IDs"
+msgid "Integrations|Includes Standard, plus the entire commit message, commit hash, and issue IDs"
 msgstr ""
 
-msgid "Integrations|Includes commit title and branch"
+msgid "Integrations|Includes commit title and branch."
 msgstr ""
 
 msgid "Integrations|Issues created in Jira are shown here once you have created the issues in project setup in Jira."
@@ -17667,7 +17667,7 @@ msgstr ""
 msgid "Integrations|Use default settings"
 msgstr ""
 
-msgid "Integrations|When a Jira issue is mentioned in a commit or merge request a remote link and comment (if enabled) is created."
+msgid "Integrations|When you mention a Jira issue in a commit or merge request, GitLab creates a remote link and comment (if enabled)."
 msgstr ""
 
 msgid "Integrations|You can now close this window and return to the GitLab for Jira application."
@@ -18609,6 +18609,9 @@ 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|You need to configure Jira before enabling this integration. For more details, read the %{jira_doc_link_start}Jira integration documentation%{link_end}."
+msgstr ""
+
 msgid "JiraService|transition ids can have only numbers which can be split with , or ;"
 msgstr ""