Skip to content
Snippets Groups Projects
Commit d0cc13d6 authored by Ashraf Khamis's avatar Ashraf Khamis Committed by Justin Ho Tuan Duong
Browse files

Update copy from technical writing review

parent 9bfd849c
No related branches found
No related tags found
No related merge requests found
This commit is part of merge request !149055. Comments created here will be created in the context of that merge request.
......@@ -92,10 +92,10 @@ export default {
},
i18n: {
enableCheckboxHelp: s__(
'JiraService|Warning: All GitLab users with access to this GitLab project can view all issues from the Jira project you select.',
'JiraService|Warning: All users with access to this GitLab project can view all issues from the Jira project you specify.',
),
projectKeyLabel: s__('JiraService|Jira project key'),
projectKeyPlaceholder: s__('JiraService|For example, AB'),
projectKeyPlaceholder: s__('JiraService|AB'),
requiredFieldFeedback: __('This field is required.'),
},
};
......@@ -122,7 +122,11 @@ export default {
v-if="multipleProjectKeys && !isIssueCreation"
:label="s__('JiraService|Jira project keys')"
label-for="service_project_keys"
:description="s__('JiraService|Leave blank to include all available project keys.')"
:description="
s__(
'JiraService|Comma-separated list of Jira project keys. Leave blank to include all available keys.',
)
"
data-testid="jira-project-keys"
>
<gl-form-input
......@@ -130,7 +134,7 @@ export default {
v-model="projectKeys"
name="service[project_keys]"
width="xl"
:placeholder="s__('JiraService|For example, AB,CD')"
:placeholder="s__('JiraService|AB,CD')"
:readonly="isInheriting"
/>
</gl-form-group>
......
......@@ -22,19 +22,21 @@ export const i18n = {
checkbox: {
label: s__('JiraService|Create Jira issues for vulnerabilities'),
description: s__(
'JiraService|Issues created from vulnerabilities in this project will be Jira issues, even if GitLab issues are enabled.',
"JiraService|Create only Jira issues for vulnerabilities in this project even if you've enabled GitLab issues.",
),
},
issueTypeSelect: {
description: s__('JiraService|Create Jira issues of this type from vulnerabilities.'),
description: s__('JiraService|Create Jira issues of this type.'),
defaultText: s__('JiraService|Select issue type'),
},
issueTypeLabel: s__('JiraService|Jira issue type'),
fetchIssueTypesButtonLabel: s__('JiraService|Fetch issue types for this Jira project'),
fetchIssueTypesErrorMessage: s__('JiraService|An error occurred while fetching issue list'),
fetchIssueTypesButtonLabel: s__('JiraService|Fetch issue types for this project key'),
fetchIssueTypesErrorMessage: s__(
'JiraService|An error occurred while fetching the Jira issue list',
),
projectKeyWarnings: {
missing: s__('JiraService|Project key is required to generate issue types'),
changed: s__('JiraService|Project key changed, refresh list'),
missing: s__('JiraService|Enter a Jira project key to generate issue types.'),
changed: s__('JiraService|Fetch issue types again for the new project key.'),
},
};
......@@ -244,7 +246,7 @@ export default {
v-model="issueCreationProjectKey"
name="service[project_key]"
width="md"
:placeholder="s__('JiraService|For example, AB')"
:placeholder="s__('JiraService|AB')"
:required="isJiraVulnerabilitiesEnabled"
:state="validProjectKey"
:readonly="isInheriting"
......
......@@ -312,7 +312,7 @@ describe('JiraIssueCreationVulnerabilities', () => {
describe('when "Jira project key" is empty', () => {
it('shows a warning message telling the user to enter a valid project key', () => {
expect(wrapper.text()).toContain('Project key is required to generate issue types');
expect(wrapper.text()).toContain('Enter a Jira project key to generate issue types.');
});
});
......@@ -335,7 +335,7 @@ describe('JiraIssueCreationVulnerabilities', () => {
});
it('shows a warning message telling the user to refetch the issues list', () => {
expect(wrapper.text()).toContain('Project key changed, refresh list');
expect(wrapper.text()).toContain('Fetch issue types again for the new project key.');
});
});
});
......
......@@ -28692,13 +28692,19 @@ msgstr ""
msgid "JiraService|%{user_link} mentioned this issue in %{entity_link} of %{project_link}%{branch}:{quote}%{entity_message}{quote}"
msgstr ""
 
msgid "JiraService|AB"
msgstr ""
msgid "JiraService|AB,CD"
msgstr ""
msgid "JiraService|API token for Jira Cloud or password for Jira Data Center and Jira Server"
msgstr ""
 
msgid "JiraService|API token or password"
msgstr ""
 
msgid "JiraService|An error occurred while fetching issue list"
msgid "JiraService|An error occurred while fetching the Jira issue list"
msgstr ""
 
msgid "JiraService|Authentication type"
......@@ -28713,15 +28719,21 @@ msgstr ""
msgid "JiraService|Basic"
msgstr ""
 
msgid "JiraService|Comma-separated list of Jira project keys. Leave blank to include all available keys."
msgstr ""
msgid "JiraService|Create Jira issues for vulnerabilities"
msgstr ""
 
msgid "JiraService|Create Jira issues of this type from vulnerabilities."
msgid "JiraService|Create Jira issues of this type."
msgstr ""
 
msgid "JiraService|Create a Jira issue for a vulnerability to track any action taken to resolve or mitigate a vulnerability."
msgstr ""
 
msgid "JiraService|Create only Jira issues for vulnerabilities in this project even if you've enabled GitLab issues."
msgstr ""
msgid "JiraService|Displaying Jira issues while leaving GitLab issues also enabled might be confusing. Consider %{gitlab_issues_link_start}disabling GitLab issues%{link_end} if they won't otherwise be used."
msgstr ""
 
......@@ -28734,25 +28746,25 @@ msgstr ""
msgid "JiraService|Enable Jira transitions"
msgstr ""
 
msgid "JiraService|Events for %{noteable_model_name} are disabled."
msgid "JiraService|Enter a Jira project key to generate issue types."
msgstr ""
 
msgid "JiraService|Failed to load Jira issue. View the issue in Jira, or reload the page."
msgid "JiraService|Events for %{noteable_model_name} are disabled."
msgstr ""
 
msgid "JiraService|Fetch issue types for this Jira project"
msgid "JiraService|Failed to load Jira issue. View the issue in Jira, or reload the page."
msgstr ""
 
msgid "JiraService|For Jira Cloud, the authentication type must be %{basic}"
msgid "JiraService|Fetch issue types again for the new project key."
msgstr ""
 
msgid "JiraService|For example, 12, 24"
msgid "JiraService|Fetch issue types for this project key"
msgstr ""
 
msgid "JiraService|For example, AB"
msgid "JiraService|For Jira Cloud, the authentication type must be %{basic}"
msgstr ""
 
msgid "JiraService|For example, AB,CD"
msgid "JiraService|For example, 12, 24"
msgstr ""
 
msgid "JiraService|IDs must be a list of numbers that can be split with , or ;"
......@@ -28761,9 +28773,6 @@ msgstr ""
msgid "JiraService|If different from the Web URL"
msgstr ""
 
msgid "JiraService|Issues created from vulnerabilities in this project will be Jira issues, even if GitLab issues are enabled."
msgstr ""
msgid "JiraService|Jira API URL"
msgstr ""
 
......@@ -28803,9 +28812,6 @@ msgstr ""
msgid "JiraService|Jira project keys"
msgstr ""
 
msgid "JiraService|Leave blank to include all available project keys."
msgstr ""
msgid "JiraService|Leave blank to use your current configuration"
msgstr ""
 
......@@ -28821,12 +28827,6 @@ msgstr ""
msgid "JiraService|Open Jira"
msgstr ""
 
msgid "JiraService|Project key changed, refresh list"
msgstr ""
msgid "JiraService|Project key is required to generate issue types"
msgstr ""
msgid "JiraService|Recommended. Only available for Jira Data Center and Jira Server."
msgstr ""
 
......@@ -28863,7 +28863,7 @@ msgstr ""
msgid "JiraService|View Jira issues"
msgstr ""
 
msgid "JiraService|Warning: All GitLab users with access to this GitLab project can view all issues from the Jira project you select."
msgid "JiraService|Warning: All users with access to this GitLab project can view all issues from the Jira project you specify."
msgstr ""
 
msgid "JiraService|Web URL"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment