From 8babac49a6cdebff607fe2d427a735dfde12fe67 Mon Sep 17 00:00:00 2001
From: John Mitchell <jlmitch5@ncsu.edu>
Date: Fri, 16 Mar 2018 15:56:30 -0400
Subject: [PATCH] update users token crud list to utilize string file

---
 awx/ui/client/src/users/tokens.strings.js        | 14 ++++++++++++--
 .../src/users/users-tokens-add.controller.js     | 16 ++++++++--------
 .../client/src/users/users-tokens-add.route.js   |  2 +-
 .../src/users/users-tokens-list.controller.js    |  4 ++--
 4 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/awx/ui/client/src/users/tokens.strings.js b/awx/ui/client/src/users/tokens.strings.js
index 2780661e79..0dc2fa61b5 100644
--- a/awx/ui/client/src/users/tokens.strings.js
+++ b/awx/ui/client/src/users/tokens.strings.js
@@ -15,11 +15,21 @@ function TokensStrings (BaseString) {
     };
 
     ns.add = {
-        PANEL_TITLE: t.s('CREATE TOKEN')
+        PANEL_TITLE: t.s('CREATE TOKEN'),
+        APP_PLACEHOLDER: t.s('SELECT AN APPLICATION'),
+        SCOPE_HELP_TEXT: t.s('Specify a scope for the token\'s access'),
+        TOKEN_MODAL_HEADER: t.s('TOKEN INFORMATION'),
+        TOKEN_LABEL: t.s('TOKEN'),
+        REFRESH_TOKEN_LABEL: t.s('REFRESH TOKEN'),
+        TOKEN_EXPIRES_LABEL: t.s('EXPIRES'),
+        ERROR_HEADER: t.s('COULD NOT CREATE TOKEN'),
+        ERROR_BODY_LABEL: t.s('Returned status:'),
+        LAST_USED_LABEL: t.s('by'),
+        DELETE_ACTION_LABEL: t.s('DELETE')
     };
 
     ns.list = {
-        ROW_ITEM_LABEL_EXPIRED: t.s('DESCRIPTION'),
+        ROW_ITEM_LABEL_DESCRIPTION: t.s('DESCRIPTION'),
         ROW_ITEM_LABEL_EXPIRED: t.s('EXPIRATION'),
         ROW_ITEM_LABEL_USED: t.s('LAST USED')
     };
diff --git a/awx/ui/client/src/users/users-tokens-add.controller.js b/awx/ui/client/src/users/users-tokens-add.controller.js
index 7b63a8ce61..6e5d4c4d26 100644
--- a/awx/ui/client/src/users/users-tokens-add.controller.js
+++ b/awx/ui/client/src/users/users-tokens-add.controller.js
@@ -22,14 +22,14 @@ function AddTokensController (models, $state, strings, Rest, Alert, Wait, GetBas
     vm.form.application._resource = 'application';
     vm.form.application._route = 'users.edit.tokens.add.application';
     vm.form.application._model = application;
-    vm.form.application._placeholder = strings.get('SELECT AN APPLICATION');
+    vm.form.application._placeholder = strings.get('add.APP_PLACEHOLDER');
     vm.form.application.required = true;
 
     vm.form.description.required = false;
 
     vm.form.scope = {
         choices: ['', 'read', 'write'],
-        help_text: 'Specify a scope for the token\'s access',
+        help_text: strings.get('add.SCOPE_HELP_TEXT'),
         id: 'scope',
         label: 'Scope',
         required: true,
@@ -43,10 +43,10 @@ function AddTokensController (models, $state, strings, Rest, Alert, Wait, GetBas
         Rest.setUrl(GetBasePath('users') + $state.params.user_id + '/authorized_tokens');
         return Rest.post(data)
             .then(({data}) => {
-                Alert('TOKEN INFORMATION', `
+                Alert(strings.get('add.TOKEN_MODAL_HEADER'), `
                   <div class="TokenModal">
                       <div class="TokenModal-label">
-                          TOKEN
+                          ${strings.get('add.TOKEN_LABEL')}
                       </div>
                       <div class="TokenModal-value">
                           ${data.token}
@@ -54,7 +54,7 @@ function AddTokensController (models, $state, strings, Rest, Alert, Wait, GetBas
                   </div>
                   <div class="TokenModal">
                       <div class="TokenModal-label">
-                          REFRESH TOKEN
+                          ${strings.get('add.REFRESH_TOKEN_LABEL')}
                       </div>
                       <div class="TokenModal-value">
                           ${data.refresh_token}
@@ -62,7 +62,7 @@ function AddTokensController (models, $state, strings, Rest, Alert, Wait, GetBas
                   </div>
                   <div class="TokenModal">
                       <div class="TokenModal-label">
-                          EXPIRES
+                          ${strings.get('add.TOKEN_EXPIRES_LABEL')}
                       </div>
                       <div class="TokenModal-value">
                           ${$filter('longDate')(data.expires)}
@@ -73,8 +73,8 @@ function AddTokensController (models, $state, strings, Rest, Alert, Wait, GetBas
             })
             .catch(({data, status}) => {
                 ProcessErrors($scope, data, status, null, {
-                    hdr: 'COULD NOT CREATE TOKEN',
-                    msg: `Returned status: ${status}`
+                    hdr: strings.get('add.ERROR_HEADER'),
+                    msg: `${strings.get('add.ERROR_BODY_LABEL')} ${status}`
                 });
                 Wait('stop');
             });
diff --git a/awx/ui/client/src/users/users-tokens-add.route.js b/awx/ui/client/src/users/users-tokens-add.route.js
index e3832133a9..f1047fb24b 100644
--- a/awx/ui/client/src/users/users-tokens-add.route.js
+++ b/awx/ui/client/src/users/users-tokens-add.route.js
@@ -23,7 +23,7 @@ export default {
     params: {
     },
     ncyBreadcrumb: {
-        label: N_("ADD TOKEN")
+        label: N_("CREATE TOKEN")
     },
     views: {
         'preFormView@users.edit': {
diff --git a/awx/ui/client/src/users/users-tokens-list.controller.js b/awx/ui/client/src/users/users-tokens-list.controller.js
index bee39f45ae..da1de35507 100644
--- a/awx/ui/client/src/users/users-tokens-list.controller.js
+++ b/awx/ui/client/src/users/users-tokens-list.controller.js
@@ -50,7 +50,7 @@ function ListTokensController (
         const { username, id } = _.get(user, 'summary_fields.last_used', {});
 
         if (username && id) {
-            html += ` by <a href="/#/users/${id}">${$filter('sanitize')(username)}</a>`;
+            html += ` ${strings.get('add.LAST_USED_LABEL')} <a href="/#/users/${id}">${$filter('sanitize')(username)}</a>`;
         }
 
         return html;
@@ -98,7 +98,7 @@ function ListTokensController (
             resourceName: 'token',
             body: deleteModalBody,
             action,
-            actionText: 'DELETE'
+            actionText: strings.get('add.DELETE_ACTION_LABEL')
         });
     };
 }