From 6e1457607e1ff813420ff85ce2bae1d3950f718a Mon Sep 17 00:00:00 2001 From: mabashian Date: Fri, 8 Feb 2019 11:27:47 -0500 Subject: [PATCH] Mark various strings for translation --- awx/ui/client/features/jobs/jobs.strings.js | 11 +++++++- .../features/jobs/jobsList.controller.js | 25 ++++++++++++++++++- .../client/features/jobs/jobsList.view.html | 2 +- .../client/features/output/stats.partial.html | 4 +-- 4 files changed, 37 insertions(+), 5 deletions(-) diff --git a/awx/ui/client/features/jobs/jobs.strings.js b/awx/ui/client/features/jobs/jobs.strings.js index d888d293cf..a5b69df13f 100644 --- a/awx/ui/client/features/jobs/jobs.strings.js +++ b/awx/ui/client/features/jobs/jobs.strings.js @@ -16,7 +16,16 @@ function JobsStrings (BaseString) { ROW_ITEM_LABEL_CREDENTIALS: t.s('Credentials'), NO_RUNNING: t.s('There are no running jobs.'), JOB: t.s('Job'), - STATUS_TOOLTIP: status => t.s('Job {{status}}. Click for details.', { status }) + STATUS_TOOLTIP: status => t.s('Job {{status}}. Click for details.', { status }), + SLICE_JOB: t.s('Slice Job'), + NEW: t.s('new'), + PENDING: t.s('pending'), + WAITING: t.s('waiting'), + RUNNING: t.s('running'), + SUCCESSFUL: t.s('successful'), + FAILED: t.s('failed'), + ERROR: t.s('error'), + CANCELED: t.s('canceled') }; } diff --git a/awx/ui/client/features/jobs/jobsList.controller.js b/awx/ui/client/features/jobs/jobsList.controller.js index 0f6e92f0d8..ec66198614 100644 --- a/awx/ui/client/features/jobs/jobsList.controller.js +++ b/awx/ui/client/features/jobs/jobsList.controller.js @@ -86,12 +86,35 @@ function ListJobsController ( } if (job.job_slice_number && job.job_slice_count) { - return `Slice Job ${job.job_slice_number}/${job.job_slice_count}`; + return `${strings.get('list.SLICE_JOB')} ${job.job_slice_number}/${job.job_slice_count}`; } return null; }; + vm.getTranslatedStatusString = (status) => { + switch (status) { + case 'new': + return strings.get('list.NEW'); + case 'pending': + return strings.get('list.PENDING'); + case 'waiting': + return strings.get('list.WAITING'); + case 'running': + return strings.get('list.RUNNING'); + case 'successful': + return strings.get('list.SUCCESSFUL'); + case 'failed': + return strings.get('list.FAILED'); + case 'error': + return strings.get('list.ERROR'); + case 'canceled': + return strings.get('list.CANCELED'); + default: + return status; + } + }; + vm.getSref = ({ type, id }) => { let sref; diff --git a/awx/ui/client/features/jobs/jobsList.view.html b/awx/ui/client/features/jobs/jobsList.view.html index ea3058dbad..d32d74a7e2 100644 --- a/awx/ui/client/features/jobs/jobsList.view.html +++ b/awx/ui/client/features/jobs/jobsList.view.html @@ -28,7 +28,7 @@
- plays + {{:: vm.strings.get('stats.PLAYS')}} ... {{ vm.plays || 0 }} - tasks + {{:: vm.strings.get('stats.TASKS')}} ... {{ vm.tasks || 0 }}