diff --git a/awx/ui/client/features/jobs/jobsList.controller.js b/awx/ui/client/features/jobs/jobsList.controller.js index 4959d41b5e..7b5b4d8656 100644 --- a/awx/ui/client/features/jobs/jobsList.controller.js +++ b/awx/ui/client/features/jobs/jobsList.controller.js @@ -132,7 +132,7 @@ function ListJobsController ( resourceName: $filter('sanitize')(job.name), body: deleteModalBody, action, - actionText: 'DELETE' + actionText: strings.get('DELETE'), }); }; @@ -174,7 +174,8 @@ function ListJobsController ( resourceName: $filter('sanitize')(job.name), body: deleteModalBody, action, - actionText: strings.get('CANCEL') + actionText: strings.get('cancelJob.CANCEL_JOB'), + cancelText: strings.get('cancelJob.RETURN') }); }; diff --git a/awx/ui/client/features/output/details.directive.js b/awx/ui/client/features/output/details.directive.js index d4e590e1c3..76d25270d5 100644 --- a/awx/ui/client/features/output/details.directive.js +++ b/awx/ui/client/features/output/details.directive.js @@ -442,9 +442,10 @@ function toggleLabels () { } function cancelJob () { - const actionText = strings.get('warnings.CANCEL_ACTION'); - const hdr = strings.get('warnings.CANCEL_HEADER'); - const warning = strings.get('warnings.CANCEL_BODY'); + const actionText = strings.get('cancelJob.CANCEL_JOB'); + const hdr = strings.get('cancelJob.HEADER'); + const warning = strings.get('cancelJob.SUBMIT_REQUEST'); + const cancelText = strings.get('cancelJob.RETURN'); const id = resource.model.get('id'); const name = $filter('sanitize')(resource.model.get('name')); @@ -467,13 +468,13 @@ function cancelJob () { }); }; - prompt({ hdr, resourceName, body, actionText, action }); + prompt({ hdr, resourceName, body, actionText, action, cancelText }); } function deleteJob () { const actionText = strings.get('DELETE'); - const hdr = strings.get('warnings.DELETE_HEADER'); - const warning = strings.get('warnings.DELETE_BODY'); + const hdr = strings.get('deleteResource.HEADER'); + const warning = strings.get('deleteResource.CONFIRM', 'job'); const id = resource.model.get('id'); const name = $filter('sanitize')(resource.model.get('name')); diff --git a/awx/ui/client/features/output/jobs.strings.js b/awx/ui/client/features/output/jobs.strings.js index f1f3ace11d..742c4c38fb 100644 --- a/awx/ui/client/features/output/jobs.strings.js +++ b/awx/ui/client/features/output/jobs.strings.js @@ -8,14 +8,6 @@ function JobsStrings (BaseString) { TITLE: t.s('JOBZ') }; - ns.warnings = { - CANCEL_ACTION: t.s('PROCEED'), - CANCEL_BODY: t.s('Are you sure you want to cancel this job?'), - CANCEL_HEADER: t.s('Cancel Job'), - DELETE_BODY: t.s('Are you sure you want to delete this job?'), - DELETE_HEADER: t.s('Delete Job'), - }; - ns.status = { RUNNING: t.s('The host status bar will update when the job is complete.'), UNAVAILABLE: t.s('Host status information for this job is unavailable.'), diff --git a/awx/ui/client/index.template.ejs b/awx/ui/client/index.template.ejs index f16282bd91..c8d4e0d758 100644 --- a/awx/ui/client/index.template.ejs +++ b/awx/ui/client/index.template.ejs @@ -47,7 +47,7 @@