diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-15 21:09:50 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-15 21:09:50 +0300 |
commit | b302502690b2e1422a4ef6abebdcf3ff4dc88543 (patch) | |
tree | 0cd7ca6ff21b59c007277b5bae9611a7cedd8134 /app/assets/javascripts/work_items | |
parent | b616fd825faac3e7f194e1f942ef30730021e463 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/work_items')
3 files changed, 5 insertions, 7 deletions
diff --git a/app/assets/javascripts/work_items/components/work_item_actions.vue b/app/assets/javascripts/work_items/components/work_item_actions.vue index 31e4a932c5a..77002eeaf55 100644 --- a/app/assets/javascripts/work_items/components/work_item_actions.vue +++ b/app/assets/javascripts/work_items/components/work_item_actions.vue @@ -5,7 +5,7 @@ import Tracking from '~/tracking'; export default { i18n: { - deleteWorkItem: s__('WorkItem|Delete work item'), + deleteTask: s__('WorkItem|Delete task'), }, components: { GlDropdown, @@ -54,7 +54,7 @@ export default { right > <gl-dropdown-item v-gl-modal="'work-item-confirm-delete'">{{ - $options.i18n.deleteWorkItem + $options.i18n.deleteTask }}</gl-dropdown-item> </gl-dropdown> <gl-modal @@ -66,9 +66,7 @@ export default { @hide="handleCancelDeleteWorkItem" > {{ - s__( - 'WorkItem|Are you sure you want to delete the work item? This action cannot be reversed.', - ) + s__('WorkItem|Are you sure you want to delete the task? This action cannot be reversed.') }} </gl-modal> </div> diff --git a/app/assets/javascripts/work_items/components/work_item_detail_modal.vue b/app/assets/javascripts/work_items/components/work_item_detail_modal.vue index b4f9e38a64a..df7c6cab7ef 100644 --- a/app/assets/javascripts/work_items/components/work_item_detail_modal.vue +++ b/app/assets/javascripts/work_items/components/work_item_detail_modal.vue @@ -80,7 +80,7 @@ export default { .catch((e) => { this.error = e.message || - s__('WorkItem|Something went wrong when deleting the work item. Please try again.'); + s__('WorkItem|Something went wrong when deleting the task. Please try again.'); }); }, closeModal() { diff --git a/app/assets/javascripts/work_items/pages/create_work_item.vue b/app/assets/javascripts/work_items/pages/create_work_item.vue index 0047b03108a..482da5419c6 100644 --- a/app/assets/javascripts/work_items/pages/create_work_item.vue +++ b/app/assets/javascripts/work_items/pages/create_work_item.vue @@ -10,7 +10,7 @@ import projectWorkItemTypesQuery from '../graphql/project_work_item_types.query. import ItemTitle from '../components/item_title.vue'; export default { - createErrorText: s__('WorkItem|Something went wrong when creating a work item. Please try again'), + createErrorText: s__('WorkItem|Something went wrong when creating a task. Please try again'), fetchTypesErrorText: s__( 'WorkItem|Something went wrong when fetching work item types. Please try again', ), |