From 2c6e229e7165e0a8705cf3f4a49921e8f9090fa8 Mon Sep 17 00:00:00 2001 From: Jared Tabor Date: Wed, 12 Jul 2017 16:12:25 -0700 Subject: [PATCH] Tower String Audit --- awx/ui/client/assets/default.strings.json | 2 +- awx/ui/client/lib/services/index.js | 4 +++- awx/ui/client/src/about/about.controller.js | 5 +++-- awx/ui/client/src/about/about.partial.html | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/awx/ui/client/assets/default.strings.json b/awx/ui/client/assets/default.strings.json index 0db3279e44..93d37fca2b 100644 --- a/awx/ui/client/assets/default.strings.json +++ b/awx/ui/client/assets/default.strings.json @@ -1,3 +1,3 @@ { - + "BRAND_NAME": "Tower" } diff --git a/awx/ui/client/lib/services/index.js b/awx/ui/client/lib/services/index.js index f82bc49616..85930d852d 100644 --- a/awx/ui/client/lib/services/index.js +++ b/awx/ui/client/lib/services/index.js @@ -1,9 +1,11 @@ import EventService from './event.service'; import PathService from './path.service'; import BaseStringService from './base-string.service'; +import AppStrings from './app.strings'; angular .module('at.lib.services', []) .service('EventService', EventService) .service('PathService', PathService) - .service('BaseStringService', BaseStringService); + .service('BaseStringService', BaseStringService) + .service('AppStrings', AppStrings); diff --git a/awx/ui/client/src/about/about.controller.js b/awx/ui/client/src/about/about.controller.js index 159f61458a..aea6c190e9 100644 --- a/awx/ui/client/src/about/about.controller.js +++ b/awx/ui/client/src/about/about.controller.js @@ -1,7 +1,8 @@ export default - ['$scope', '$state', 'ConfigService', - function($scope, $state, ConfigService){ + ['$scope', '$state', 'ConfigService', 'AppStrings', + function($scope, $state, ConfigService, AppStrings){ var init = function(){ + $scope.name = AppStrings.get('BRAND_NAME'); ConfigService.getConfig() .then(function(config){ $scope.version = config.version.split('-')[0]; diff --git a/awx/ui/client/src/about/about.partial.html b/awx/ui/client/src/about/about.partial.html index 7ff5f4a16a..22bd5ec49c 100644 --- a/awx/ui/client/src/about/about.partial.html +++ b/awx/ui/client/src/about/about.partial.html @@ -11,7 +11,7 @@
  _______________
-<  Tower {{version}}  >
+<  {{name}} {{version}}  >
  ---------------
         \   ^__^
          \  (oo)\_______