From 6e1457607e1ff813420ff85ce2bae1d3950f718a Mon Sep 17 00:00:00 2001
From: mabashian <mabashia@redhat.com>
Date: Fri, 8 Feb 2019 11:27:47 -0500
Subject: [PATCH 1/3] 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 @@
                 <div class="at-Row-container">
                     <at-row-item
                         status="{{ job.status }}"
-                        status-tip="{{ vm.strings.get('list.STATUS_TOOLTIP', job.status) }}"
+                        status-tip="{{ vm.strings.get('list.STATUS_TOOLTIP', vm.getTranslatedStatusString(job.status)) }}"
                         header-value="{{ job.id }} - {{ job.name }}"
                         header-state="{{ vm.getSref(job) }}"
                         header-tag="{{ vm.jobTypes[job.type] }}"
diff --git a/awx/ui/client/features/output/stats.partial.html b/awx/ui/client/features/output/stats.partial.html
index 35babd1505..9ad29ca7d1 100644
--- a/awx/ui/client/features/output/stats.partial.html
+++ b/awx/ui/client/features/output/stats.partial.html
@@ -1,10 +1,10 @@
 <!-- todo: styling, markup, css etc. - disposition according to project lib conventions -->
 <div class="at-u-floatRight">
-    <span ng-show="!vm.hideCounts" class="at-Panel-label">plays</span>
+    <span ng-show="!vm.hideCounts" class="at-Panel-label">{{:: vm.strings.get('stats.PLAYS')}}</span>
     <span ng-show="!vm.hideCounts && vm.running" class="at-Panel-headingTitleBadge at-Panel-headingTitleBadge--inline">...</span>
     <span ng-show="!vm.hideCounts && !vm.running" class="at-Panel-headingTitleBadge at-Panel-headingTitleBadge--inline">{{ vm.plays || 0 }}</span>
 
-    <span ng-show="!vm.hideCounts" class="at-Panel-label">tasks</span>
+    <span ng-show="!vm.hideCounts" class="at-Panel-label">{{:: vm.strings.get('stats.TASKS')}}</span>
     <span ng-show="!vm.hideCounts && vm.running" class="at-Panel-headingTitleBadge at-Panel-headingTitleBadge--inline">...</span>
     <span ng-show="!vm.hideCounts && !vm.running" class="at-Panel-headingTitleBadge at-Panel-headingTitleBadge--inline">{{ vm.tasks || 0 }}</span>
 

From d2852616978a3f4bc05c613b80438486ee164b1c Mon Sep 17 00:00:00 2001
From: mabashian <mabashia@redhat.com>
Date: Mon, 11 Feb 2019 10:28:35 -0500
Subject: [PATCH 2/3] Fixes split job unit test confirming string match

---
 .../test/unit/components/jobs-list-split-jobs.unit.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/awx/ui/test/unit/components/jobs-list-split-jobs.unit.js b/awx/ui/test/unit/components/jobs-list-split-jobs.unit.js
index cd4438a0b5..e5da40c676 100644
--- a/awx/ui/test/unit/components/jobs-list-split-jobs.unit.js
+++ b/awx/ui/test/unit/components/jobs-list-split-jobs.unit.js
@@ -31,6 +31,15 @@ describe('View: Split Jobs List', () => {
                 options: () => ['foo', 'bar'],
             }
         ];
+        JobsStrings = {
+            get: (str) => {
+                if (str === 'list.SLICE_JOB') {
+                    return 'Slice Job';
+                } else {
+                    return '';
+                }
+            }
+        }
 
         ProcessErrors = jasmine.createSpy('ProcessErrors');
         Wait = jasmine.createSpy('Wait');
@@ -44,7 +53,7 @@ describe('View: Split Jobs List', () => {
         $provide.value('Prompt', Prompt);
         $provide.value('Rest', angular.noop);
         $provide.value('SearchBasePath', '');
-        $provide.value('JobsStrings', angular.noop);
+        $provide.value('JobsStrings', JobsStrings);
         $provide.value('QuerySet', angular.noop);
 
         $provide.provider('$stateProvider', { $get: jasmine.createSpy('$get'), });

From c0f9ee5e6ef50f0f100cf63ccd8ec117cc69d1c3 Mon Sep 17 00:00:00 2001
From: mabashian <mabashia@redhat.com>
Date: Mon, 11 Feb 2019 11:38:28 -0500
Subject: [PATCH 3/3] Fixes linting errors

---
 awx/ui/test/unit/components/jobs-list-split-jobs.unit.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/awx/ui/test/unit/components/jobs-list-split-jobs.unit.js b/awx/ui/test/unit/components/jobs-list-split-jobs.unit.js
index e5da40c676..6cc4ff7ae0 100644
--- a/awx/ui/test/unit/components/jobs-list-split-jobs.unit.js
+++ b/awx/ui/test/unit/components/jobs-list-split-jobs.unit.js
@@ -35,11 +35,10 @@ describe('View: Split Jobs List', () => {
             get: (str) => {
                 if (str === 'list.SLICE_JOB') {
                     return 'Slice Job';
-                } else {
-                    return '';
                 }
+                return '';
             }
-        }
+        };
 
         ProcessErrors = jasmine.createSpy('ProcessErrors');
         Wait = jasmine.createSpy('Wait');