Merge branch '332280-integration-settings-template-jira-copy-refinement' into 'master'

Refine copy for Jira integration

See merge request gitlab-org/gitlab!81819

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

@@ -83,17 +83,17 @@ export default {
   i18n: {
     sectionTitle: s__('JiraService|View Jira issues in GitLab'),
     sectionDescription: s__(
-      '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.',
+      'JiraService|Work on Jira issues without leaving GitLab. Add a Jira menu to access a read-only list of your Jira issues.',
     ),
     enableCheckboxLabel: s__('JiraService|Enable Jira issues'),
     enableCheckboxHelp: s__(
-      'JiraService|Warning: All GitLab users that have access to this GitLab project are able to view all issues from the Jira project specified below.',
+      'JiraService|Warning: All GitLab users with access to this GitLab project can view all issues from the Jira project you select.',
     ),
     projectKeyLabel: s__('JiraService|Jira project key'),
     projectKeyPlaceholder: s__('JiraService|For example, AB'),
     requiredFieldFeedback: __('This field is required.'),
     issueTrackerConflictWarning: s__(
-      'JiraService|Displaying Jira issues while leaving the GitLab issue functionality enabled might be confusing. Consider %{linkStart}disabling GitLab issues%{linkEnd} if they won’t otherwise be used.',
+      'JiraService|Displaying Jira issues while leaving GitLab issues also enabled might be confusing. Consider %{linkStart}disabling GitLab issues%{linkEnd} if they won’t otherwise be used.',
     ),
   },
 };

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

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

app/models/integrations/jira.rb

@@ -111,8 +111,8 @@ module Integrations
     end
 
     def help
-      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 must 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 }
+      jira_doc_link_start = '<a href="%{url}">'.html_safe % { url: help_page_url('integration/jira/index.html') }
+      s_("JiraService|You must configure Jira before enabling this integration. %{jira_doc_link_start}Learn more.%{link_end}") % { jira_doc_link_start: jira_doc_link_start, link_end: '</a>'.html_safe }
     end
 
     def title

doc/integration/jira/configure.md

@@ -50,7 +50,7 @@ To configure your project:
    If you enable Jira issues with this setting, all users with access to this GitLab project
    can view all issues from the specified Jira project.
 
-1. To enable [issue creation for vulnerabilities](../../user/application_security/vulnerabilities/index.md#create-a-jira-issue-for-a-vulnerability), select **Enable Jira issues creation from vulnerabilities**.
+1. To enable [issue creation for vulnerabilities](../../user/application_security/vulnerabilities/index.md#create-a-jira-issue-for-a-vulnerability), select **Enable Jira issue creation from vulnerabilities**.
 1. Select the **Jira issue type**. If the dropdown is empty, select refresh (**{retry}**) and try again.
 1. To verify the Jira connection is working, select **Test settings**.
 1. Select **Save changes**.

doc/user/application_security/vulnerabilities/index.md

@@ -80,7 +80,7 @@ The issue is then opened so you can take further action.
 Prerequisites:
 
 - [Enable Jira integration](../../../integration/jira/index.md).
-  The **Enable Jira issues creation from vulnerabilities** option must be selected as part of the configuration.
+  The **Enable Jira issue creation from vulnerabilities** option must be selected as part of the configuration.
 - Each user must have a personal Jira user account with permission to create issues in the target project.
 
 To create a Jira issue for a vulnerability:

ee/app/assets/javascripts/integrations/edit/components/jira_issue_creation_vulnerabilities.vue

@@ -16,7 +16,7 @@ import { defaultJiraIssueTypeId } from '../constants';
 
 export const i18n = {
   checkbox: {
-    label: s__('JiraService|Enable Jira issues creation from vulnerabilities'),
+    label: s__('JiraService|Enable Jira issue creation from vulnerabilities'),
     description: s__(
       'JiraService|Issues created from vulnerabilities in this project will be Jira issues, even if GitLab issues are enabled.',
     ),

ee/spec/frontend/integrations/edit/components/jira_issue_creation_vulnerabilities_spec.js

@@ -81,7 +81,7 @@ describe('JiraIssuesFields', () => {
     });
   });
 
-  describe('"Enable Jira issues creation from vulnerabilities" checkbox', () => {
+  describe('"Enable Jira issue creation from vulnerabilities" checkbox', () => {
     beforeEach(() => {
       wrapper = createShallowComponent();
     });

locale/gitlab.pot

@@ -19861,9 +19861,6 @@ msgstr ""
 msgid "Integrations|Use default settings"
 msgstr ""
 
-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."
 msgstr ""
 
@@ -20827,13 +20824,13 @@ msgstr ""
 msgid "JiraService|Define the type of Jira issue to create from a vulnerability."
 msgstr ""
 
-msgid "JiraService|Displaying Jira issues while leaving the GitLab issue functionality enabled might be confusing. Consider %{linkStart}disabling GitLab issues%{linkEnd} if they won’t otherwise be used."
+msgid "JiraService|Displaying Jira issues while leaving GitLab issues also enabled might be confusing. Consider %{linkStart}disabling GitLab issues%{linkEnd} if they won’t otherwise be used."
 msgstr ""
 
-msgid "JiraService|Enable Jira issues"
+msgid "JiraService|Enable Jira issue creation from vulnerabilities"
 msgstr ""
 
-msgid "JiraService|Enable Jira issues creation from vulnerabilities"
+msgid "JiraService|Enable Jira issues"
 msgstr ""
 
 msgid "JiraService|Enable Jira transitions"
@@ -20950,16 +20947,19 @@ msgstr ""
 msgid "JiraService|View Jira issues in GitLab"
 msgstr ""
 
-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."
+msgid "JiraService|Warning: All GitLab users with access to this GitLab project can view all issues from the Jira project you select."
 msgstr ""
 
 msgid "JiraService|Web URL"
 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."
+msgid "JiraService|When a Jira issue is mentioned in a commit or merge request, a remote link and comment (if enabled) will be created."
+msgstr ""
+
+msgid "JiraService|Work on Jira issues without leaving GitLab. Add a Jira menu to access a read-only list of your Jira issues."
 msgstr ""
 
-msgid "JiraService|You must configure Jira before enabling this integration. For more details, read the %{jira_doc_link_start}Jira integration documentation%{link_end}."
+msgid "JiraService|You must configure Jira before enabling this integration. %{jira_doc_link_start}Learn more.%{link_end}"
 msgstr ""
 
 msgid "Job"