diff --git a/awx/ui/client/src/job-results/job-results.service.js b/awx/ui/client/src/job-results/job-results.service.js index 686803c135..0db4d4cca4 100644 --- a/awx/ui/client/src/job-results/job-results.service.js +++ b/awx/ui/client/src/job-results/job-results.service.js @@ -5,8 +5,8 @@ *************************************************/ -export default ['$q', 'Prompt', '$filter', 'Wait', 'Rest', '$state', 'ProcessErrors', 'InitiatePlaybookRun', 'GetBasePath', 'Alert', '$rootScope', -function ($q, Prompt, $filter, Wait, Rest, $state, ProcessErrors, InitiatePlaybookRun, GetBasePath, Alert, $rootScope) { +export default ['$q', 'Prompt', '$filter', 'Wait', 'Rest', '$state', 'ProcessErrors', 'InitiatePlaybookRun', 'GetBasePath', 'Alert', '$rootScope', 'i18n', +function ($q, Prompt, $filter, Wait, Rest, $state, ProcessErrors, InitiatePlaybookRun, GetBasePath, Alert, $rootScope, i18n) { var val = { // the playbook_on_stats event returns the count data in a weird format. // format to what we need! @@ -90,9 +90,9 @@ function ($q, Prompt, $filter, Wait, Rest, $state, ProcessErrors, InitiatePlaybo }, deleteJob: function(job) { Prompt({ - hdr: 'Delete Job', + hdr: i18n._("Delete Job"), body: `
- Are you sure you want to delete the job below? + ${i18n._("Are you sure you want to delete the job below?")}
#${job.id} ${$filter('sanitize')(job.name)} @@ -116,7 +116,7 @@ function ($q, Prompt, $filter, Wait, Rest, $state, ProcessErrors, InitiatePlaybo }); }); }, - actionText: 'DELETE' + actionText: i18n._('DELETE') }); }, cancelJob: function(job) { @@ -139,9 +139,9 @@ function ($q, Prompt, $filter, Wait, Rest, $state, ProcessErrors, InitiatePlaybo }; Prompt({ - hdr: 'Cancel Job', - body: `
- Are you sure you want to cancel the job below? + hdr: i18n._('Cancel Job'), + body: `
+ ${i18n._("Are you sure you want to cancel the job below?")}
#${job.id} ${$filter('sanitize')(job.name)} @@ -163,7 +163,7 @@ function ($q, Prompt, $filter, Wait, Rest, $state, ProcessErrors, InitiatePlaybo } }); }, - actionText: 'PROCEED' + actionText: i18n._('PROCEED') }); }, relaunchJob: function(scope) { diff --git a/awx/ui/client/src/jobs/factories/delete-job.factory.js b/awx/ui/client/src/jobs/factories/delete-job.factory.js index 0bc75eb2e8..7157b9fa93 100644 --- a/awx/ui/client/src/jobs/factories/delete-job.factory.js +++ b/awx/ui/client/src/jobs/factories/delete-job.factory.js @@ -1,4 +1,4 @@ -export default + export default function DeleteJob($state, Find, Rest, Wait, ProcessErrors, Prompt, Alert, $filter, i18n) { return function(params) { @@ -76,7 +76,7 @@ export default reloadListStateParams = _.cloneDeep($state.params); reloadListStateParams.job_search.page = (parseInt(reloadListStateParams.job_search.page)-1).toString(); } - + $state.go('.', reloadListStateParams, {reload: true}); Wait('stop'); } @@ -107,12 +107,12 @@ export default } scope.removeCancelJob = scope.$on('CancelJob', function() { var cancelBody = "
" + i18n._("Submit the request to cancel?") + "
"; - var deleteBody = "
" + i18n._("Are you sure you want to delete the job below?") + "
#" + id + " " + $filter('sanitize')(job.name) + "
"; + var deleteBody = "
" + i18n._("Are you sure you want to delete the job below?") + "
#" + id + " " + $filter('sanitize')(job.name) + "
"; Prompt({ hdr: hdr, body: (action_label === 'cancel' || job.status === 'new') ? cancelBody : deleteBody, action: action, - actionText: (action_label === 'cancel' || job.status === 'new') ? "OK" : "DELETE" + actionText: (action_label === 'cancel' || job.status === 'new') ? i18n._("OK") : i18n._("DELETE") }); }); diff --git a/awx/ui/client/src/templates/list/templates-list.controller.js b/awx/ui/client/src/templates/list/templates-list.controller.js index 2a292ade7b..47567d7c62 100644 --- a/awx/ui/client/src/templates/list/templates-list.controller.js +++ b/awx/ui/client/src/templates/list/templates-list.controller.js @@ -8,12 +8,12 @@ export default ['$scope', '$rootScope', 'Alert','TemplateList', 'Prompt', 'ProcessErrors', 'GetBasePath', 'InitiatePlaybookRun', 'Wait', '$state', '$filter', 'Dataset', 'rbacUiControlService', 'TemplatesService','QuerySet', - 'TemplateCopyService', + 'TemplateCopyService', 'i18n', function( $scope, $rootScope, Alert, TemplateList, Prompt, ProcessErrors, GetBasePath, InitiatePlaybookRun, Wait, $state, $filter, Dataset, rbacUiControlService, TemplatesService, - qs, TemplateCopyService + qs, TemplateCopyService, i18n ) { var list = TemplateList; @@ -99,8 +99,8 @@ export default ['$scope', '$rootScope', $scope.deleteJobTemplate = function(template) { if(template) { Prompt({ - hdr: 'Delete', - body: '
Are you sure you want to delete the template below?
' + $filter('sanitize')(template.name) + '
', + hdr: i18n._('Delete'), + body: `
${i18n._("Are you sure you want to delete the template below?")}
${$filter('sanitize')(template.name)}
`, action: function() { function handleSuccessfulDelete(isWorkflow) { @@ -151,7 +151,7 @@ export default ['$scope', '$rootScope', Alert('Error: Unable to determine template type', 'We were unable to determine this template\'s type while deleting.'); } }, - actionText: 'DELETE' + actionText: i18n._('DELETE') }); } else {