From e723e85bbdacc49f85804db6162a236c90c98cf6 Mon Sep 17 00:00:00 2001 From: Michael Abashian Date: Thu, 29 Jun 2017 15:20:37 -0400 Subject: [PATCH] Marked strings for translation in the inventories-hosts directory --- .../src/inventories-hosts/hosts/host.list.js | 14 +- .../hosts/hosts.partial.html | 10 +- .../groups/hosts-related-groups.list.js | 116 +++++---- .../groups/hosts-related-groups.partial.html | 8 +- .../adhoc/adhoc-credential.route.js | 4 +- .../inventories/adhoc/adhoc.form.js | 35 ++- .../host-summary-popover.directive.js | 12 +- .../list/inventory-list.controller.js | 24 +- .../source-summary-popover.directive.js | 12 +- .../completed-jobs/completed-jobs.list.js | 2 +- .../factories/get-hosts-status-msg.factory.js | 10 +- .../inventories/related/groups/groups.form.js | 10 +- .../inventories/related/groups/groups.list.js | 194 +++++++------- .../groups/list/groups-list.partial.html | 28 +- ...up-nested-groups-disassociate.partial.html | 8 +- .../nested-groups/group-nested-groups.form.js | 10 +- .../nested-groups/group-nested-groups.list.js | 215 ++++++++------- .../group-nested-groups.route.js | 3 +- ...oup-nested-hosts-disassociate.partial.html | 8 +- .../nested-hosts/group-nested-hosts.form.js | 1 - .../nested-hosts/group-nested-hosts.list.js | 30 +-- .../hosts/list/host-list.controller.js | 6 +- .../relatedGroupsLabelsList.directive.js | 5 +- .../relatedGroupsLabelsList.partial.html | 4 +- .../related/hosts/related-host.form.js | 2 - .../related/hosts/related-host.list.js | 35 +-- ...st-nested-groups-disassociate.partial.html | 8 +- .../nested-groups/host-nested-groups.list.js | 191 +++++++------- .../nested-groups/host-nested-groups.route.js | 3 +- .../factories/get-sync-status-msg.factory.js | 26 +- .../sources/list/sources-list.controller.js | 10 +- .../sources/list/sources-list.partial.html | 30 +-- .../related/sources/sources.form.js | 67 +++-- .../related/sources/sources.list.js | 245 +++++++++--------- .../host-filter-modal.partial.html | 6 +- .../smart-inventory/smart-inventory.form.js | 2 +- .../ansible-facts/ansible-facts.partial.html | 2 +- .../associate-groups.partial.html | 6 +- .../associate-hosts.partial.html | 6 +- .../factories/set-enabled-msg.factory.js | 9 +- .../shared/factories/set-status.factory.js | 21 +- 41 files changed, 707 insertions(+), 731 deletions(-) diff --git a/awx/ui/client/src/inventories-hosts/hosts/host.list.js b/awx/ui/client/src/inventories-hosts/hosts/host.list.js index 865d3eb108..747294c31c 100644 --- a/awx/ui/client/src/inventories-hosts/hosts/host.list.js +++ b/awx/ui/client/src/inventories-hosts/hosts/host.list.js @@ -79,17 +79,15 @@ export default ['i18n', function(i18n) { columnClass: 'col-lg-6 col-md-4 col-sm-4 col-xs-5 text-right', edit: { - //label: 'Edit', ngClick: "editHost(host.id)", icon: 'icon-edit', - awToolTip: 'Edit host', + awToolTip: i18n._('Edit host'), dataPlacement: 'top', ngShow: 'host.summary_fields.user_capabilities.edit' }, view: { - //label: 'Edit', ngClick: "editHost(host.id)", - awToolTip: 'View host', + awToolTip: i18n._('View host'), dataPlacement: 'top', ngShow: '!host.summary_fields.user_capabilities.edit' } @@ -98,18 +96,18 @@ export default ['i18n', function(i18n) { actions: { refresh: { mode: 'all', - awToolTip: "Refresh the page", + awToolTip: i18n._("Refresh the page"), ngClick: "refreshGroups()", ngShow: "socketStatus == 'error'", actionClass: 'btn List-buttonDefault', - buttonContent: 'REFRESH' + buttonContent: i18n._('REFRESH') }, smart_inventory: { mode: 'all', ngClick: "smartInventory()", - awToolTip: "Create a new Smart Inventory from search results.", + awToolTip: i18n._("Create a new Smart Inventory from search results."), actionClass: 'btn List-buttonDefault', - buttonContent: 'SMART INVENTORY', + buttonContent: i18n._('SMART INVENTORY'), ngShow: 'canAdd && (hosts.length > 0 || !(searchTags | isEmpty))', dataPlacement: "top", ngDisabled: '!enableSmartInventoryButton' diff --git a/awx/ui/client/src/inventories-hosts/hosts/hosts.partial.html b/awx/ui/client/src/inventories-hosts/hosts/hosts.partial.html index 1f11db98bb..cedb83b6bd 100644 --- a/awx/ui/client/src/inventories-hosts/hosts/hosts.partial.html +++ b/awx/ui/client/src/inventories-hosts/hosts/hosts.partial.html @@ -33,9 +33,9 @@
-
No records matched your search.
+
No records matched your search.
-
PLEASE ADD ITEMS TO THIS LIST
+
PLEASE ADD ITEMS TO THIS LIST
@@ -44,15 +44,15 @@ - +
ActionsActions
- - + +
diff --git a/awx/ui/client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.list.js b/awx/ui/client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.list.js index 103eeca93f..cbfc11a083 100644 --- a/awx/ui/client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.list.js +++ b/awx/ui/client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.list.js @@ -4,66 +4,68 @@ * All Rights Reserved *************************************************/ -export default { - name: 'groups', - iterator: 'group', - editTitle: '{{ host.name }}', - well: true, - wellOverride: true, - index: false, - hover: true, - trackBy: 'group.id', - basePath: 'api/v2/hosts/{{$stateParams.host_id}}/groups/', +export default ['i18n', function(i18n) { + return { + name: 'groups', + iterator: 'group', + editTitle: '{{ host.name }}', + well: true, + wellOverride: true, + index: false, + hover: true, + trackBy: 'group.id', + basePath: 'api/v2/hosts/{{$stateParams.host_id}}/groups/', - fields: { - failed_hosts: { - label: '', - nosort: true, - mode: 'all', - iconOnly: true, - awToolTip: "{{ group.hosts_status_tip }}", - dataPlacement: "top", - icon: "{{ 'fa icon-job-' + group.hosts_status_class }}", - columnClass: 'status-column List-staticColumn--smallStatus' + fields: { + failed_hosts: { + label: '', + nosort: true, + mode: 'all', + iconOnly: true, + awToolTip: "{{ group.hosts_status_tip }}", + dataPlacement: "top", + icon: "{{ 'fa icon-job-' + group.hosts_status_class }}", + columnClass: 'status-column List-staticColumn--smallStatus' + }, + name: { + label: i18n._('Groups'), + key: true, + ngClick: "editGroup(group.id)", + columnClass: 'col-lg-6 col-md-6 col-sm-6 col-xs-6', + class: 'InventoryManage-breakWord', + } }, - name: { - label: 'Groups', - key: true, - ngClick: "editGroup(group.id)", - columnClass: 'col-lg-6 col-md-6 col-sm-6 col-xs-6', - class: 'InventoryManage-breakWord', - } - }, - actions: { - refresh: { - mode: 'all', - awToolTip: "Refresh the page", - ngClick: "refreshGroups()", - ngShow: "socketStatus == 'error'", - actionClass: 'btn List-buttonDefault', - buttonContent: 'REFRESH' + actions: { + refresh: { + mode: 'all', + awToolTip: i18n._("Refresh the page"), + ngClick: "refreshGroups()", + ngShow: "socketStatus == 'error'", + actionClass: 'btn List-buttonDefault', + buttonContent: i18n._('REFRESH') + }, + associate: { + mode: 'all', + ngClick: "associateGroup()", + awToolTip: i18n._("Associate this host with a new group"), + actionClass: 'btn List-buttonSubmit', + buttonContent: '+ ' + i18n._('ASSOCIATE GROUP'), + ngShow: 'canAdd', + dataPlacement: "top", + } }, - associate: { - mode: 'all', - ngClick: "associateGroup()", - awToolTip: "Associate this host with a new group", - actionClass: 'btn List-buttonSubmit', - buttonContent: '+ ASSOCIATE GROUP', - ngShow: 'canAdd', - dataPlacement: "top", - } - }, - fieldActions: { - columnClass: 'col-lg-6 col-md-6 col-sm-6 col-xs-6 text-right', - "delete": { - //label: 'Delete', - mode: 'all', - ngClick: "disassociateHost(group)", - awToolTip: 'Disassociate host', - dataPlacement: "top", - ngShow: "group.summary_fields.user_capabilities.delete" + fieldActions: { + columnClass: 'col-lg-6 col-md-6 col-sm-6 col-xs-6 text-right', + "delete": { + //label: 'Delete', + mode: 'all', + ngClick: "disassociateHost(group)", + awToolTip: i18n._('Disassociate host'), + dataPlacement: "top", + ngShow: "group.summary_fields.user_capabilities.delete" + } } - } -}; + }; +}]; diff --git a/awx/ui/client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.partial.html b/awx/ui/client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.partial.html index 35d250f4c2..d24e119967 100644 --- a/awx/ui/client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.partial.html +++ b/awx/ui/client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.partial.html @@ -3,7 +3,7 @@
- Disassociate Host + Disassociate Host
-
Are you sure you want to disassociate the host below from {{disassociateGroup.name}}?
+
Are you sure you want to disassociate the host below from {{disassociateGroup.name}}?
{{ host.name }}
- CANCEL - DISASSOCIATE + CANCEL + DISASSOCIATE
diff --git a/awx/ui/client/src/inventories-hosts/inventories/adhoc/adhoc-credential.route.js b/awx/ui/client/src/inventories-hosts/inventories/adhoc/adhoc-credential.route.js index 9ec32d6b04..173c77f445 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/adhoc/adhoc-credential.route.js +++ b/awx/ui/client/src/inventories-hosts/inventories/adhoc/adhoc-credential.route.js @@ -30,9 +30,9 @@ export default { } }, resolve: { - ListDefinition: ['CredentialList', function(CredentialList) { + ListDefinition: ['CredentialList', 'i18n', function(CredentialList, i18n) { let list = _.cloneDeep(CredentialList); - list.lookupConfirmText = 'SELECT'; + list.lookupConfirmText = i18n._('SELECT'); return list; }], Dataset: ['ListDefinition', 'QuerySet', '$stateParams', 'GetBasePath', diff --git a/awx/ui/client/src/inventories-hosts/inventories/adhoc/adhoc.form.js b/awx/ui/client/src/inventories-hosts/inventories/adhoc/adhoc.form.js index c58068deb6..3e0eeb67d6 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/adhoc/adhoc.form.js +++ b/awx/ui/client/src/inventories-hosts/inventories/adhoc/adhoc.form.js @@ -12,23 +12,22 @@ export default ['i18n', function(i18n) { return { - addTitle: 'EXECUTE COMMAND', + addTitle: i18n._('EXECUTE COMMAND'), name: 'adhoc', well: true, forceListeners: true, fields: { module_name: { - label: 'Module', + label: i18n._('Module'), excludeModal: true, type: 'select', ngOptions: 'module.label for module in adhoc_module_options' + ' track by module.value', ngChange: 'moduleChange()', required: true, - awPopOver:'

These are the modules that Tower supports ' + - 'running commands against.', - dataTitle: 'Module', + awPopOver: i18n._('These are the modules that Tower supports running commands against.'), + dataTitle: i18n._('Module'), dataPlacement: 'right', dataContainer: 'body' }, @@ -37,13 +36,13 @@ export default ['i18n', function(i18n) { type: 'text', awPopOverWatch: 'argsPopOver', awPopOver: '{{ argsPopOver }}', - dataTitle: 'Arguments', + dataTitle: i18n._('Arguments'), dataPlacement: 'right', dataContainer: 'body', autocomplete: false }, limit: { - label: 'Limit', + label: i18n._('Limit'), type: 'text', awPopOver: '

The pattern used to target hosts in the ' + @@ -53,12 +52,12 @@ export default ['i18n', function(i18n) { 'here.

', - dataTitle: 'Limit', + dataTitle: i18n._('Limit'), dataPlacement: 'right', dataContainer: 'body' }, credential: { - label: 'Machine Credential', + label: i18n._('Machine Credential'), type: 'lookup', list: 'CredentialList', basePath: 'credentials', @@ -70,7 +69,7 @@ export default ['i18n', function(i18n) { 'Choose the credential containing ' + 'the username and SSH key or password that Ansbile ' + 'will need to log into the remote hosts.

', - dataTitle: 'Credential', + dataTitle: i18n._('Credential'), dataPlacement: 'right', dataContainer: 'body', awRequiredWhen: { @@ -79,17 +78,17 @@ export default ['i18n', function(i18n) { } }, become_enabled: { - label: 'Enable Privilege Escalation', + label: i18n._('Enable Privilege Escalation'), type: 'checkbox', column: 2, awPopOver: "

If enabled, run this playbook as an administrator. This is the equivalent of passing the --become option to the ansible command.

", dataPlacement: 'right', - dataTitle: 'Become Privilege Escalation', + dataTitle: i18n._('Become Privilege Escalation'), dataContainer: "body" }, verbosity: { - label: 'Verbosity', + label: i18n._('Verbosity'), excludeModal: true, type: 'select', ngOptions: 'verbosity.label for verbosity in ' + @@ -98,13 +97,13 @@ export default ['i18n', function(i18n) { required: true, awPopOver:'

These are the verbosity levels for standard ' + 'out of the command run that are supported.', - dataTitle: 'Verbosity', + dataTitle: i18n._('Verbosity'), dataPlacement: 'right', dataContainer: 'body', "default": 1 }, forks: { - label: 'Forks', + label: i18n._('Forks'), id: 'forks-number', type: 'number', integer: true, @@ -117,7 +116,7 @@ export default ['i18n', function(i18n) { awPopOver: '

The number of parallel or simultaneous processes to use while executing the command. 0 signifies ' + 'the default value from the ansible configuration file.

', - dataTitle: 'Forks', + dataTitle: i18n._('Forks'), dataPlacement: 'right', dataContainer: "body" }, @@ -143,11 +142,11 @@ export default ['i18n', function(i18n) { reset: { ngClick: 'formReset()', ngDisabled: true, - label: 'Reset', + label: i18n._('Reset'), 'class': 'btn btn-sm Form-cancelButton' }, launch: { - label: 'Save', + label: i18n._('Save'), ngClick: 'launchJob()', ngDisabled: true, 'class': 'btn btn-sm List-buttonSubmit launchButton' diff --git a/awx/ui/client/src/inventories-hosts/inventories/list/host-summary-popover/host-summary-popover.directive.js b/awx/ui/client/src/inventories-hosts/inventories/list/host-summary-popover/host-summary-popover.directive.js index cc732bedbe..17a10e0f93 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/list/host-summary-popover/host-summary-popover.directive.js +++ b/awx/ui/client/src/inventories-hosts/inventories/list/host-summary-popover/host-summary-popover.directive.js @@ -1,5 +1,5 @@ -export default ['templateUrl', 'Wait', '$filter', '$compile', - function(templateUrl, Wait, $filter, $compile) { +export default ['templateUrl', 'Wait', '$filter', '$compile', 'i18n', + function(templateUrl, Wait, $filter, $compile, i18n) { return { restrict: 'E', replace: false, @@ -50,9 +50,9 @@ export default ['templateUrl', 'Wait', '$filter', '$compile', html = "\n"; html += "\n"; html += ""; - html += ""; - html += ""; - html += ""; + html += ""; + html += ""; + html += ""; html += "\n"; html += "\n"; html += "\n"; @@ -70,7 +70,7 @@ export default ['templateUrl', 'Wait', '$filter', '$compile', html += "
StatusFinishedName" + i18n._("Status") + "" + i18n._("Finished") + "" + i18n._("Name") + "
\n"; } else { - html = "

No recent job data available for this inventory.

\n"; + html = "

" + i18n._("No recent job data available for this inventory.") + "

\n"; } attachElem(event, html, title); }; diff --git a/awx/ui/client/src/inventories-hosts/inventories/list/inventory-list.controller.js b/awx/ui/client/src/inventories-hosts/inventories/list/inventory-list.controller.js index c74b819df5..87e89f8fed 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/list/inventory-list.controller.js +++ b/awx/ui/client/src/inventories-hosts/inventories/list/inventory-list.controller.js @@ -13,7 +13,7 @@ function InventoriesList($scope, $filter, Rest, InventoryList, Prompt, ProcessErrors, GetBasePath, Wait, $state, - Dataset, canAdd) { + Dataset, canAdd, i18n) { let list = InventoryList, defaultUrl = GetBasePath('inventory'); @@ -40,33 +40,33 @@ function InventoriesList($scope, if (inventory.has_inventory_sources) { if (inventory.inventory_sources_with_failures > 0) { inventory.syncStatus = 'error'; - inventory.syncTip = inventory.inventory_sources_with_failures + ' sources with sync failures. Click for details'; + inventory.syncTip = inventory.inventory_sources_with_failures + i18n._(' sources with sync failures. Click for details'); } else { inventory.syncStatus = 'successful'; - inventory.syncTip = 'No inventory sync failures. Click for details.'; + inventory.syncTip = i18n._('No inventory sync failures. Click for details.'); } } else { inventory.syncStatus = 'na'; - inventory.syncTip = 'Not configured for inventory sync.'; + inventory.syncTip = i18n._('Not configured for inventory sync.'); inventory.launch_class = "btn-disabled"; } if (inventory.has_active_failures) { inventory.hostsStatus = 'error'; - inventory.hostsTip = inventory.hosts_with_active_failures + ' hosts with failures. Click for details.'; + inventory.hostsTip = inventory.hosts_with_active_failures + i18n._(' hosts with failures. Click for details.'); } else if (inventory.total_hosts) { inventory.hostsStatus = 'successful'; - inventory.hostsTip = 'No hosts with failures. Click for details.'; + inventory.hostsTip = i18n._('No hosts with failures. Click for details.'); } else { inventory.hostsStatus = 'none'; - inventory.hostsTip = 'Inventory contains 0 hosts.'; + inventory.hostsTip = i18n._('Inventory contains 0 hosts.'); } - inventory.kind_label = inventory.kind === '' ? 'Inventory' : (inventory.kind === 'smart' ? 'Smart Inventory': 'Inventory'); + inventory.kind_label = inventory.kind === '' ? 'Inventory' : (inventory.kind === 'smart' ? i18n._('Smart Inventory'): i18n._('Inventory')); } $scope.editInventory = function (inventory) { @@ -97,10 +97,10 @@ function InventoriesList($scope, Prompt({ hdr: 'Delete', - body: '
Are you sure you want to delete the inventory below?
' + $filter('sanitize')(name) + '
' + - '
Note: The inventory will be in a pending status until the final delete is processed.
', + body: '
' + i18n._('Are you sure you want to delete the inventory below?') + '
' + $filter('sanitize')(name) + '
' + + '
Note: ' + i18n._('The inventory will be in a pending status until the final delete is processed.') + '
', action: action, - actionText: 'DELETE' + actionText: i18n._('DELETE') }); }; @@ -129,5 +129,5 @@ function InventoriesList($scope, export default ['$scope', '$filter', 'Rest', 'InventoryList', 'Prompt', 'ProcessErrors', 'GetBasePath', 'Wait', - '$state', 'Dataset', 'canAdd', InventoriesList + '$state', 'Dataset', 'canAdd', 'i18n', InventoriesList ]; diff --git a/awx/ui/client/src/inventories-hosts/inventories/list/source-summary-popover/source-summary-popover.directive.js b/awx/ui/client/src/inventories-hosts/inventories/list/source-summary-popover/source-summary-popover.directive.js index dcc9cad354..a42530cfde 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/list/source-summary-popover/source-summary-popover.directive.js +++ b/awx/ui/client/src/inventories-hosts/inventories/list/source-summary-popover/source-summary-popover.directive.js @@ -1,5 +1,5 @@ -export default ['templateUrl', '$compile', 'Wait', '$filter', - function(templateUrl, $compile, Wait, $filter) { +export default ['templateUrl', '$compile', 'Wait', '$filter', 'i18n', + function(templateUrl, $compile, Wait, $filter, i18n) { return { restrict: 'E', replace: false, @@ -52,16 +52,16 @@ export default ['templateUrl', '$compile', 'Wait', '$filter', html = "\n"; html += "\n"; html += ""; - html += ""; - html += ""; - html += ""; + html += ""; + html += ""; + html += ""; html += ""; html += "\n"; html += "\n"; data.results.forEach( function(row) { if (row.related.last_update) { html += ""; - html += ``; + html += ``; html += ""; html += ""; html += "\n"; diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/completed-jobs/completed-jobs.list.js b/awx/ui/client/src/inventories-hosts/inventories/related/completed-jobs/completed-jobs.list.js index c69a7889e2..f8c90fa6f9 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/related/completed-jobs/completed-jobs.list.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/completed-jobs/completed-jobs.list.js @@ -35,7 +35,7 @@ export default ['i18n', function(i18n) { nosort: true }, id: { - label: 'ID', + label: i18n._('ID'), ngClick:"viewjobResults(completed_job)", columnClass: 'col-lg-1 col-md-1 col-sm-2 col-xs-2 List-staticColumnAdjacent', awToolTip: "{{ completed_job.status_tip }}", diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/groups/factories/get-hosts-status-msg.factory.js b/awx/ui/client/src/inventories-hosts/inventories/related/groups/factories/get-hosts-status-msg.factory.js index 19a846c414..43ddedb584 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/related/groups/factories/get-hosts-status-msg.factory.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/groups/factories/get-hosts-status-msg.factory.js @@ -1,5 +1,5 @@ export default - function GetHostsStatusMsg() { + ['i18n', function(i18n) { return function(params) { var active_failures = params.active_failures, total_hosts = params.total_hosts, @@ -8,18 +8,18 @@ export default // Return values for use on host status indicator if (active_failures > 0) { - tip = total_hosts + ((total_hosts === 1) ? ' host' : ' hosts') + '. ' + active_failures + ' with failed jobs.'; + tip = total_hosts + ((total_hosts === 1) ? ' host' : ' hosts') + '. ' + active_failures + i18n._(' with failed jobs.'); html_class = 'error'; failures = true; } else { failures = false; if (total_hosts === 0) { // no hosts - tip = "Contains 0 hosts."; + tip = i18n._("Contains 0 hosts."); html_class = 'none'; } else { // many hosts with 0 failures - tip = total_hosts + ((total_hosts === 1) ? ' host' : ' hosts') + '. No job failures'; + tip = total_hosts + ((total_hosts === 1) ? ' host' : ' hosts') + '. ' + i18n._('No job failures'); html_class = 'success'; } } @@ -30,4 +30,4 @@ export default 'class': html_class }; }; - } + }]; diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/groups/groups.form.js b/awx/ui/client/src/inventories-hosts/inventories/related/groups/groups.form.js index cefa0fbff9..1e4c055741 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/related/groups/groups.form.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/groups/groups.form.js @@ -13,7 +13,7 @@ export default ['i18n', function(i18n){ return { - addTitle: 'CREATE GROUP', + addTitle: i18n._('CREATE GROUP'), editTitle: '{{ name }}', showTitle: true, name: 'group', @@ -29,26 +29,26 @@ function(i18n){ tabs: true, fields: { name: { - label: 'Name', + label: i18n._('Name'), type: 'text', ngDisabled: '!(group_obj.summary_fields.user_capabilities.edit || canAdd)', required: true, tab: 'properties' }, description: { - label: 'Description', + label: i18n._('Description'), type: 'text', ngDisabled: '!(group_obj.summary_fields.user_capabilities.edit || canAdd)', tab: 'properties' }, group_variables: { realName: 'variables', - label: 'Variables', + label: i18n._('Variables'), type: 'textarea', class: 'Form-textAreaLabel Form-formGroup--fullWidth', rows: 6, 'default': '---', - dataTitle: 'Group Variables', + dataTitle: i18n._('Group Variables'), dataPlacement: 'right', parseTypeName: 'parseType', awPopOver: "

Variables defined here apply to all child groups and hosts.

" + diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/groups/groups.list.js b/awx/ui/client/src/inventories-hosts/inventories/related/groups/groups.list.js index 07b0367d36..091f18e31d 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/related/groups/groups.list.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/groups/groups.list.js @@ -4,102 +4,104 @@ * All Rights Reserved *************************************************/ -export default { - name: 'groups', - iterator: 'group', - editTitle: '{{ inventory.name }}', - well: true, - wellOverride: true, - index: false, - hover: true, - multiSelect: true, - trackBy: 'group.id', - basePath: 'api/v2/inventories/{{$stateParams.inventory_id}}/root_groups/', + export default ['i18n', function(i18n) { + return { + name: 'groups', + iterator: 'group', + editTitle: '{{ inventory.name }}', + well: true, + wellOverride: true, + index: false, + hover: true, + multiSelect: true, + trackBy: 'group.id', + basePath: 'api/v2/inventories/{{$stateParams.inventory_id}}/root_groups/', - fields: { - failed_hosts: { - label: '', - nosort: true, - mode: 'all', - iconOnly: true, - awToolTip: "{{ group.hosts_status_tip }}", - dataPlacement: "top", - icon: "{{ 'fa icon-job-' + group.hosts_status_class }}", - columnClass: 'status-column List-staticColumn--smallStatus' + fields: { + failed_hosts: { + label: '', + nosort: true, + mode: 'all', + iconOnly: true, + awToolTip: "{{ group.hosts_status_tip }}", + dataPlacement: "top", + icon: "{{ 'fa icon-job-' + group.hosts_status_class }}", + columnClass: 'status-column List-staticColumn--smallStatus' + }, + name: { + label: i18n._('Groups'), + key: true, + ngClick: "editGroup(group.id)", + columnClass: 'col-lg-6 col-md-6 col-sm-6 col-xs-6', + class: 'InventoryManage-breakWord', + } }, - name: { - label: 'Groups', - key: true, - ngClick: "editGroup(group.id)", - columnClass: 'col-lg-6 col-md-6 col-sm-6 col-xs-6', - class: 'InventoryManage-breakWord', + + actions: { + refresh: { + mode: 'all', + awToolTip: i18n._("Refresh the page"), + ngClick: "refreshGroups()", + ngShow: "socketStatus == 'error'", + actionClass: 'btn List-buttonDefault', + buttonContent: i18n._('REFRESH') + }, + launch: { + mode: 'all', + ngDisabled: '!groupsSelected', + ngClick: 'setAdhocPattern()', + awToolTip: i18n._("Select an inventory source by clicking the check box beside it. The inventory source can be a single group or a selection of multiple groups."), + dataPlacement: 'top', + actionClass: 'btn List-buttonDefault', + buttonContent: i18n._('RUN COMMANDS'), + showTipWhenDisabled: true, + tooltipInnerClass: "Tooltip-wide", + ngShow: 'canAdhoc' + // TODO: set up a tip watcher and change text based on when + // things are selected/not selected. This is started and + // commented out in the inventory controller within the watchers. + // awToolTip: "{{ adhocButtonTipContents }}", + // dataTipWatch: "adhocButtonTipContents" + }, + create: { + mode: 'all', + ngClick: "createGroup()", + awToolTip: i18n._("Create a new group"), + actionClass: 'btn List-buttonSubmit', + buttonContent: '+ ' + i18n._('ADD GROUP'), + ngShow: 'canAdd', + dataPlacement: "top", + } + }, + + fieldActions: { + + columnClass: 'col-lg-6 col-md-6 col-sm-6 col-xs-6 text-right', + + edit: { + //label: 'Edit', + mode: 'all', + ngClick: "editGroup(group.id)", + awToolTip: i18n._('Edit group'), + dataPlacement: "top", + ngShow: "group.summary_fields.user_capabilities.edit" + }, + view: { + //label: 'Edit', + mode: 'all', + ngClick: "editGroup(group.id)", + awToolTip: i18n._('View group'), + dataPlacement: "top", + ngShow: "!group.summary_fields.user_capabilities.edit" + }, + "delete": { + //label: 'Delete', + mode: 'all', + ngClick: "deleteGroup(group)", + awToolTip: i18n._('Disassociate group'), + dataPlacement: "top", + ngShow: "group.summary_fields.user_capabilities.delete" + } } - }, - - actions: { - refresh: { - mode: 'all', - awToolTip: "Refresh the page", - ngClick: "refreshGroups()", - ngShow: "socketStatus == 'error'", - actionClass: 'btn List-buttonDefault', - buttonContent: 'REFRESH' - }, - launch: { - mode: 'all', - ngDisabled: '!groupsSelected', - ngClick: 'setAdhocPattern()', - awToolTip: "Select an inventory source by clicking the check box beside it. The inventory source can be a single group or a selection of multiple groups.", - dataPlacement: 'top', - actionClass: 'btn List-buttonDefault', - buttonContent: 'RUN COMMANDS', - showTipWhenDisabled: true, - tooltipInnerClass: "Tooltip-wide", - ngShow: 'canAdhoc' - // TODO: set up a tip watcher and change text based on when - // things are selected/not selected. This is started and - // commented out in the inventory controller within the watchers. - // awToolTip: "{{ adhocButtonTipContents }}", - // dataTipWatch: "adhocButtonTipContents" - }, - create: { - mode: 'all', - ngClick: "createGroup()", - awToolTip: "Create a new group", - actionClass: 'btn List-buttonSubmit', - buttonContent: '+ ADD GROUP', - ngShow: 'canAdd', - dataPlacement: "top", - } - }, - - fieldActions: { - - columnClass: 'col-lg-6 col-md-6 col-sm-6 col-xs-6 text-right', - - edit: { - //label: 'Edit', - mode: 'all', - ngClick: "editGroup(group.id)", - awToolTip: 'Edit group', - dataPlacement: "top", - ngShow: "group.summary_fields.user_capabilities.edit" - }, - view: { - //label: 'Edit', - mode: 'all', - ngClick: "editGroup(group.id)", - awToolTip: 'View group', - dataPlacement: "top", - ngShow: "!group.summary_fields.user_capabilities.edit" - }, - "delete": { - //label: 'Delete', - mode: 'all', - ngClick: "deleteGroup(group)", - awToolTip: 'Disassociate group', - dataPlacement: "top", - ngShow: "group.summary_fields.user_capabilities.delete" - } - } -}; + }; +}]; diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html b/awx/ui/client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html index 1a02f3a515..6b2a01a971 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html +++ b/awx/ui/client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html @@ -3,7 +3,7 @@
- Delete Group + Delete Group

Deleting group {{ toDelete.name }}. - This group contains {{ toDelete.total_groups }} groups and {{ toDelete.total_hosts }} hosts. - This group contains {{ toDelete.total_hosts }} hosts. - This group contains {{ toDelete.total_groups }} groups. - Delete or promote the group's children?

+ This group contains {{ toDelete.total_groups }} groups and {{ toDelete.total_hosts }} hosts. + This group contains {{ toDelete.total_hosts }} hosts. + This group contains {{ toDelete.total_groups }} groups. + Delete or promote the group's children?

@@ -66,12 +66,12 @@
-
Are you sure you want to permanently delete the group below from the inventory?
+
Are you sure you want to permanently delete the group below from the inventory?
{{ toDelete.name }}
- CANCEL - DELETE + CANCEL + DELETE
diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups-disassociate.partial.html b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups-disassociate.partial.html index 98a41a9bdf..951341049b 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups-disassociate.partial.html +++ b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups-disassociate.partial.html @@ -3,7 +3,7 @@
- Disassociate Group + Disassociate Group
-
Are you sure you want to disassociate the group below from {{disassociateFrom.name}}?
+
Are you sure you want to disassociate the group below from {{disassociateFrom.name}}?
{{ toDisassociate.name }}
- CANCEL - DISASSOCIATE + CANCEL + DISASSOCIATE
diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.form.js b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.form.js index 96b55daff8..adc2cab8ab 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.form.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.form.js @@ -13,7 +13,7 @@ export default ['i18n', function(i18n){ return { - addTitle: 'CREATE GROUP', + addTitle: i18n._('CREATE GROUP'), editTitle: '{{ name }}', showTitle: true, name: 'nested_group', @@ -30,26 +30,26 @@ function(i18n){ tabs: true, fields: { name: { - label: 'Name', + label: i18n._('Name'), type: 'text', ngDisabled: '!(group_obj.summary_fields.user_capabilities.edit || canAdd)', required: true, tab: 'properties' }, description: { - label: 'Description', + label: i18n._('Description'), type: 'text', ngDisabled: '!(group_obj.summary_fields.user_capabilities.edit || canAdd)', tab: 'properties' }, nested_group_variables: { realName: 'variables', - label: 'Variables', + label: i18n._('Variables'), type: 'textarea', class: 'Form-textAreaLabel Form-formGroup--fullWidth', rows: 6, 'default': '---', - dataTitle: 'Group Variables', + dataTitle: i18n._('Group Variables'), dataPlacement: 'right', parseTypeName: 'parseType', awPopOver: "

Variables defined here apply to all child groups and hosts.

" + diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.list.js b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.list.js index 24f535429c..dc7f5d6955 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.list.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.list.js @@ -4,116 +4,113 @@ * All Rights Reserved *************************************************/ -export default { - name: 'nested_groups', - iterator: 'nested_group', - editTitle: '{{ inventory.name }}', - well: true, - wellOverride: true, - index: false, - hover: true, - multiSelect: true, - trackBy: 'nested_group.id', - basePath: 'api/v2/inventories/{{$stateParams.inventory_id}}/root_groups/', + export default ['i18n', function(i18n) { + return { + name: 'nested_groups', + iterator: 'nested_group', + editTitle: '{{ inventory.name }}', + well: true, + wellOverride: true, + index: false, + hover: true, + multiSelect: true, + trackBy: 'nested_group.id', + basePath: 'api/v2/inventories/{{$stateParams.inventory_id}}/root_groups/', - fields: { - failed_hosts: { - label: '', - nosort: true, - mode: 'all', - iconOnly: true, - awToolTip: "{{ nested_group.hosts_status_tip }}", - dataPlacement: "top", - icon: "{{ 'fa icon-job-' + nested_group.hosts_status_class }}", - columnClass: 'status-column List-staticColumn--smallStatus' + fields: { + failed_hosts: { + label: '', + nosort: true, + mode: 'all', + iconOnly: true, + awToolTip: "{{ nested_group.hosts_status_tip }}", + dataPlacement: "top", + icon: "{{ 'fa icon-job-' + nested_group.hosts_status_class }}", + columnClass: 'status-column List-staticColumn--smallStatus' + }, + name: { + label: i18n._('Groups'), + key: true, + ngClick: "editGroup(nested_group.id)", + columnClass: 'col-lg-6 col-md-6 col-sm-6 col-xs-6', + class: 'InventoryManage-breakWord', + } }, - name: { - label: 'Groups', - key: true, - // ngClick: "groupSelect(group.id)", - ngClick: "editGroup(nested_group.id)", - columnClass: 'col-lg-6 col-md-6 col-sm-6 col-xs-6', - class: 'InventoryManage-breakWord', + actions: { + refresh: { + mode: 'all', + awToolTip: i18n._("Refresh the page"), + ngClick: "refreshGroups()", + ngShow: "socketStatus == 'error'", + actionClass: 'btn List-buttonDefault', + buttonContent: i18n._('REFRESH') + }, + launch: { + mode: 'all', + ngDisabled: '!groupsSelected', + ngClick: 'setAdhocPattern()', + awToolTip: i18n._("Select an inventory source by clicking the check box beside it. The inventory source can be a single group or host, a selection of multiple hosts, or a selection of multiple groups."), + dataPlacement: 'top', + actionClass: 'btn List-buttonDefault', + buttonContent: i18n._('RUN COMMANDS'), + showTipWhenDisabled: true, + tooltipInnerClass: "Tooltip-wide", + ngShow: 'canAdhoc' + // TODO: set up a tip watcher and change text based on when + // things are selected/not selected. This is started and + // commented out in the inventory controller within the watchers. + // awToolTip: "{{ adhocButtonTipContents }}", + // dataTipWatch: "adhocButtonTipContents" + }, + add: { + mode: 'all', + type: 'buttonDropdown', + awToolTip: i18n._("Add a group"), + actionClass: 'btn List-buttonSubmit', + buttonContent: '+ ' + i18n._('ADD'), + ngShow: 'canAdd', + dataPlacement: "top", + options: [ + { + optionContent: i18n._('Existing Group'), + optionSref: '.associate', + ngShow: 'canAdd' + }, + { + optionContent: i18n._('New Group'), + optionSref: '.add', + ngShow: 'canAdd' + } + ], + } + }, + + fieldActions: { + + columnClass: 'col-lg-6 col-md-6 col-sm-6 col-xs-6 text-right', + + edit: { + mode: 'all', + ngClick: "editGroup(nested_group.id)", + awToolTip: i18n._('Edit group'), + dataPlacement: "top", + ngShow: "nested_group.summary_fields.user_capabilities.edit" + }, + view: { + mode: 'all', + ngClick: "editGroup(nested_group.id)", + awToolTip: i18n._('View group'), + dataPlacement: "top", + ngShow: "!nested_group.summary_fields.user_capabilities.edit" + }, + "delete": { + mode: 'all', + ngClick: "disassociateGroup(nested_group)", + awToolTip: i18n._('Delete group'), + dataPlacement: "top", + ngShow: "nested_group.summary_fields.user_capabilities.delete" + } } - }, - - actions: { - refresh: { - mode: 'all', - awToolTip: "Refresh the page", - ngClick: "refreshGroups()", - ngShow: "socketStatus == 'error'", - actionClass: 'btn List-buttonDefault', - buttonContent: 'REFRESH' - }, - launch: { - mode: 'all', - ngDisabled: '!groupsSelected', - ngClick: 'setAdhocPattern()', - awToolTip: "Select an inventory source by clicking the check box beside it. The inventory source can be a single group or host, a selection of multiple hosts, or a selection of multiple groups.", - dataPlacement: 'top', - actionClass: 'btn List-buttonDefault', - buttonContent: 'RUN COMMANDS', - showTipWhenDisabled: true, - tooltipInnerClass: "Tooltip-wide", - ngShow: 'canAdhoc' - // TODO: set up a tip watcher and change text based on when - // things are selected/not selected. This is started and - // commented out in the inventory controller within the watchers. - // awToolTip: "{{ adhocButtonTipContents }}", - // dataTipWatch: "adhocButtonTipContents" - }, - add: { - mode: 'all', - type: 'buttonDropdown', - awToolTip: "Add a group", - actionClass: 'btn List-buttonSubmit', - buttonContent: '+ ADD', - ngShow: 'canAdd', - dataPlacement: "top", - options: [ - { - optionContent: 'Existing Group', - optionSref: '.associate', - ngShow: 'canAdd' - }, - { - optionContent: 'New Group', - optionSref: '.add', - ngShow: 'canAdd' - } - ], - } - }, - - fieldActions: { - - columnClass: 'col-lg-6 col-md-6 col-sm-6 col-xs-6 text-right', - - edit: { - //label: 'Edit', - mode: 'all', - ngClick: "editGroup(nested_group.id)", - awToolTip: 'Edit group', - dataPlacement: "top", - ngShow: "nested_group.summary_fields.user_capabilities.edit" - }, - view: { - //label: 'Edit', - mode: 'all', - ngClick: "editGroup(nested_group.id)", - awToolTip: 'View group', - dataPlacement: "top", - ngShow: "!nested_group.summary_fields.user_capabilities.edit" - }, - "delete": { - //label: 'Delete', - mode: 'all', - ngClick: "disassociateGroup(nested_group)", - awToolTip: 'Delete group', - dataPlacement: "top", - ngShow: "nested_group.summary_fields.user_capabilities.delete" - } - } -}; + }; +}]; diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.route.js b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.route.js index 10b243b1d5..66495716ac 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.route.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.route.js @@ -1,4 +1,5 @@ import {templateUrl} from '../../../../../../shared/template-url/template-url.factory'; +import { N_ } from '../../../../../../i18n'; export default { name: 'inventories.edit.groups.edit.nested_groups', @@ -15,7 +16,7 @@ export default { }, ncyBreadcrumb: { parent: "inventories.edit.groups.edit", - label: "ASSOCIATED GROUPS" + label: N_("ASSOCIATED GROUPS") }, views: { // 'related@inventories.edit.groups.edit': { diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts-disassociate.partial.html b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts-disassociate.partial.html index 35628d953e..ec9789fd02 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts-disassociate.partial.html +++ b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts-disassociate.partial.html @@ -3,7 +3,7 @@
- Disassociate Host + Disassociate Host
-
Are you sure you want to disassociate the host below from {{disassociateFrom.name}}?
+
Are you sure you want to disassociate the host below from {{disassociateFrom.name}}?
{{ toDisassociate.name }}
- CANCEL - DISASSOCIATE + CANCEL + DISASSOCIATE
diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js index f46c4e2176..ebec902f5a 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js @@ -22,7 +22,6 @@ function(i18n) { formLabelSize: 'col-lg-3', formFieldSize: 'col-lg-9', iterator: 'host', - // activeEditState: 'inventories.edit.hosts.edit', activeEditState: 'inventories.edit.groups.edit.nested_hosts.edit', stateTree: 'inventories.edit.groups.edit.nested_hosts', headerFields:{ diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.list.js b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.list.js index 63afcd758e..120bb64d1f 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.list.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.list.js @@ -55,7 +55,7 @@ export default { }, name: { key: true, - label: 'Hosts', + label: N_('Hosts'), ngClick: "editHost(nested_host.id)", ngClass: "{ 'host-disabled-label': !nested_host.enabled }", columnClass: 'col-lg-6 col-md-8 col-sm-8 col-xs-7', @@ -69,17 +69,15 @@ export default { columnClass: 'col-lg-6 col-md-4 col-sm-4 col-xs-5 text-right', edit: { - //label: 'Edit', ngClick: "editHost(nested_host.id)", icon: 'icon-edit', - awToolTip: 'Edit host', + awToolTip: N_('Edit host'), dataPlacement: 'top', ngShow: 'nested_host.summary_fields.user_capabilities.edit' }, view: { - //label: 'Edit', ngClick: "editHost(nested_host.id)", - awToolTip: 'View host', + awToolTip: N_('View host'), dataPlacement: 'top', ngShow: '!nested_host.summary_fields.user_capabilities.edit' }, @@ -87,7 +85,7 @@ export default { //label: 'Delete', ngClick: "disassociateHost(nested_host)", icon: 'icon-trash', - awToolTip: 'Disassociate host', + awToolTip: N_('Disassociate host'), dataPlacement: 'top', ngShow: 'nested_host.summary_fields.user_capabilities.delete' } @@ -98,19 +96,19 @@ export default { mode: 'all', ngDisabled: '!hostsSelected', ngClick: 'setAdhocPattern()', - awToolTip: "Select an inventory source by clicking the check box beside it. The inventory source can be a single group or host, a selection of multiple hosts, or a selection of multiple groups.", + awToolTip: N_("Select an inventory source by clicking the check box beside it. The inventory source can be a single group or host, a selection of multiple hosts, or a selection of multiple groups."), dataPlacement: 'top', actionClass: 'btn List-buttonDefault', - buttonContent: 'RUN COMMANDS', + buttonContent: N_('RUN COMMANDS'), showTipWhenDisabled: true, tooltipInnerClass: "Tooltip-wide", // TODO: we don't always want to show this ngShow: true }, system_tracking: { - buttonContent: 'System Tracking', + buttonContent: N_('System Tracking'), ngClick: 'systemTracking()', - awToolTip: "Select one or two hosts by clicking the checkbox beside the host. System tracking offers the ability to compare the results of two scan runs from different dates on one host or the same date on two hosts.", + awToolTip: N_("Select one or two hosts by clicking the checkbox beside the host. System tracking offers the ability to compare the results of two scan runs from different dates on one host or the same date on two hosts."), dataTipWatch: "systemTrackingTooltip", dataPlacement: 'top', awFeature: 'system_tracking', @@ -122,28 +120,28 @@ export default { }, refresh: { mode: 'all', - awToolTip: "Refresh the page", + awToolTip: N_("Refresh the page"), ngClick: "refreshGroups()", ngShow: "socketStatus == 'error'", actionClass: 'btn List-buttonDefault', - buttonContent: 'REFRESH' + buttonContent: N_('REFRESH') }, add: { mode: 'all', type: 'buttonDropdown', - awToolTip: "Add a host", + awToolTip: N_("Add a host"), actionClass: 'btn List-buttonSubmit', - buttonContent: '+ ADD', + buttonContent: '+ ' + N_('ADD'), ngShow: 'canAdd', dataPlacement: "top", options: [ { - optionContent: 'Existing Host', + optionContent: N_('Existing Host'), optionSref: '.associate', ngShow: 'canAdd' }, { - optionContent: 'New Host', + optionContent: N_('New Host'), optionSref: '.add', ngShow: 'canAdd' } diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/hosts/list/host-list.controller.js b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/list/host-list.controller.js index 0f95cbd452..d1dfbbaac1 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/related/hosts/list/host-list.controller.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/list/host-list.controller.js @@ -7,10 +7,10 @@ // import HostsService from './../hosts/host.service'; export default ['$scope', 'ListDefinition', '$rootScope', 'GetBasePath', 'rbacUiControlService', 'Dataset', '$state', '$filter', 'Prompt', 'Wait', - 'HostsService', 'SetStatus', 'canAdd', + 'HostsService', 'SetStatus', 'canAdd', 'i18n', function($scope, ListDefinition, $rootScope, GetBasePath, rbacUiControlService, Dataset, $state, $filter, Prompt, Wait, - HostsService, SetStatus, canAdd) { + HostsService, SetStatus, canAdd, i18n) { let list = ListDefinition; @@ -90,7 +90,7 @@ export default ['$scope', 'ListDefinition', '$rootScope', 'GetBasePath', $state.go('inventories.edit.hosts.edit.insights', {inventory_id: host.inventory_id, host_id:host.id}); }; $scope.deleteHost = function(id, name){ - var body = '
Are you sure you want to permanently delete the host below from the inventory?
' + $filter('sanitize')(name) + '
'; + var body = '
' + i18n._('Are you sure you want to permanently delete the host below from the inventory?') + '
' + $filter('sanitize')(name) + '
'; var action = function(){ delete $rootScope.promptActionBtnClass; Wait('start'); diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related-groups-labels/relatedGroupsLabelsList.directive.js b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related-groups-labels/relatedGroupsLabelsList.directive.js index e189d9e1a6..4d3ff076a8 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related-groups-labels/relatedGroupsLabelsList.directive.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related-groups-labels/relatedGroupsLabelsList.directive.js @@ -9,7 +9,8 @@ export default '$q', '$filter', '$state', - function(templateUrl, Wait, Rest, GetBasePath, ProcessErrors, Prompt, $q, $filter, $state) { + 'i18n', + function(templateUrl, Wait, Rest, GetBasePath, ProcessErrors, Prompt, $q, $filter, $state, i18n) { return { restrict: 'E', scope: false, @@ -78,7 +79,7 @@ export default Prompt({ hdr: 'Remove host from ' + group.name , - body: '
Confirm the removal of the ' + $filter('sanitize')(host.name) + ' from the ' + $filter('sanitize')(group.name) + ' group.
', + body: '
' + i18n._('Confirm the removal of the') + ' ' + $filter('sanitize')(host.name) + ' ' + i18n._('from the') + ' ' + $filter('sanitize')(group.name) + ' ' + i18n._('group') + '.
', action: action, actionText: 'REMOVE' }); diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related-groups-labels/relatedGroupsLabelsList.partial.html b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related-groups-labels/relatedGroupsLabelsList.partial.html index ae6448212b..d8e42dfc01 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related-groups-labels/relatedGroupsLabelsList.partial.html +++ b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related-groups-labels/relatedGroupsLabelsList.partial.html @@ -9,6 +9,6 @@
View More
+ ng-click="seeMore()" translate>View More
View Less
+ ng-click="seeLess()" translate>View Less
diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related-host.form.js b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related-host.form.js index 8ddc10a5a4..9c7d8fea24 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related-host.form.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related-host.form.js @@ -22,8 +22,6 @@ function(i18n) { formLabelSize: 'col-lg-3', formFieldSize: 'col-lg-9', iterator: 'host', - // activeEditState: 'inventories.edit.hosts.edit', - // activeEditState: 'inventories.edit.groups.edit.nested_hosts.edit', stateTree: 'inventories.edit.hosts', headerFields:{ enabled: { diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related-host.list.js b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related-host.list.js index 851327e90e..389cdd606b 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related-host.list.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related-host.list.js @@ -14,7 +14,6 @@ export default ['i18n', function(i18n) { wellOverride: true, index: false, hover: true, - // hasChildren: true, multiSelect: true, trackBy: 'host.id', basePath: 'api/v2/inventories/{{$stateParams.inventory_id}}/hosts/', @@ -54,7 +53,7 @@ export default ['i18n', function(i18n) { }, name: { key: true, - label: 'Hosts', + label: i18n._('Hosts'), ngClick: "editHost(host)", ngClass: "{ 'host-disabled-label': !host.enabled }", columnClass: 'col-lg-6 col-md-8 col-sm-8 col-xs-7', @@ -63,18 +62,11 @@ export default ['i18n', function(i18n) { class: 'InventoryManage-breakWord' }, groups: { - label: "Related Groups", + label: i18n._("Related Groups"), type: 'related_groups', nosort: true, showDelete: true, columnClass: 'RelatedGroupsLabelsCell List-tableCell col-lg-2 col-md-3 hidden-sm hidden-xs' - // ngBind: 'host.summary_fields.groups', - // ngClass: "{ 'host-disabled-label': !host.enabled }", - // columnClass: 'col-lg-6 col-md-8 col-sm-8 col-xs-7', - // dataHostId: "{{ host.id }}", - // dataType: "host", - // class: 'InventoryManage-breakWord' - } }, @@ -84,30 +76,27 @@ export default ['i18n', function(i18n) { insights: { ngClick: "goToInsights(host)", icon: 'fa-info', - awToolTip: 'View Insights Data', + awToolTip: i18n._('View Insights Data'), dataPlacement: 'top', ngShow: 'host.insights_system_id' }, edit: { - //label: 'Edit', ngClick: "editHost(host)", icon: 'icon-edit', - awToolTip: 'Edit host', + awToolTip: i18n._('Edit host'), dataPlacement: 'top', ngShow: 'host.summary_fields.user_capabilities.edit' }, view: { - //label: 'Edit', ngClick: "editHost(host)", - awToolTip: 'View host', + awToolTip: i18n._('View host'), dataPlacement: 'top', ngShow: '!host.summary_fields.user_capabilities.edit' }, "delete": { - //label: 'Delete', ngClick: "deleteHost(host.id, host.name)", icon: 'icon-trash', - awToolTip: 'Delete host', + awToolTip: i18n._('Delete host'), dataPlacement: 'top', ngShow: 'host.summary_fields.user_capabilities.delete' } @@ -118,19 +107,19 @@ export default ['i18n', function(i18n) { mode: 'all', ngDisabled: '!hostsSelected', ngClick: 'setAdhocPattern()', - awToolTip: "Select an inventory source by clicking the check box beside it. The inventory source can be a single host or a selection of multiple hosts.", + awToolTip: i18n._("Select an inventory source by clicking the check box beside it. The inventory source can be a single host or a selection of multiple hosts."), dataPlacement: 'top', actionClass: 'btn List-buttonDefault', - buttonContent: 'RUN COMMANDS', + buttonContent: i18n._('RUN COMMANDS'), showTipWhenDisabled: true, tooltipInnerClass: "Tooltip-wide", // TODO: we don't always want to show this ngShow: true }, system_tracking: { - buttonContent: 'System Tracking', + buttonContent: i18n._('System Tracking'), ngClick: 'systemTracking()', - awToolTip: "Select one or two hosts by clicking the checkbox beside the host. System tracking offers the ability to compare the results of two scan runs from different dates on one host or the same date on two hosts.", + awToolTip: i18n._("Select one or two hosts by clicking the checkbox beside the host. System tracking offers the ability to compare the results of two scan runs from different dates on one host or the same date on two hosts."), dataTipWatch: "systemTrackingTooltip", dataPlacement: 'top', awFeature: 'system_tracking', @@ -143,9 +132,9 @@ export default ['i18n', function(i18n) { create: { mode: 'all', ngClick: "createHost()", - awToolTip: "Create a new host", + awToolTip: i18n._("Create a new host"), actionClass: 'btn List-buttonSubmit', - buttonContent: '+ ADD HOST', + buttonContent: '+ ' + i18n._('ADD HOST'), ngShow: 'canAdd', dataPlacement: "top", } diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups-disassociate.partial.html b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups-disassociate.partial.html index 81fae5230c..9403ea1168 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups-disassociate.partial.html +++ b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups-disassociate.partial.html @@ -3,7 +3,7 @@
- Disassociate Group + Disassociate Group
-
Are you sure you want to disassociate the host below from {{disassociateFrom.name}}?
+
Are you sure you want to disassociate the host below from {{disassociateFrom.name}}?
{{ toDisassociate.name }}
- CANCEL - DISASSOCIATE + CANCEL + DISASSOCIATE
diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups.list.js b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups.list.js index 1c818d5fe3..a2da2035a3 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups.list.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups.list.js @@ -4,104 +4,101 @@ * All Rights Reserved *************************************************/ -export default { - name: 'nested_groups', - iterator: 'nested_group', - editTitle: '{{ inventory.name }}', - well: true, - wellOverride: true, - index: false, - hover: true, - multiSelect: true, - trackBy: 'nested_group.id', - basePath: 'api/v2/inventories/{{$stateParams.inventory_id}}/root_groups/', + export default ['i18n', function(i18n) { + return { + name: 'nested_groups', + iterator: 'nested_group', + editTitle: '{{ inventory.name }}', + well: true, + wellOverride: true, + index: false, + hover: true, + multiSelect: true, + trackBy: 'nested_group.id', + basePath: 'api/v2/inventories/{{$stateParams.inventory_id}}/root_groups/', - fields: { - failed_hosts: { - label: '', - nosort: true, - mode: 'all', - iconOnly: true, - awToolTip: "{{ nested_group.hosts_status_tip }}", - dataPlacement: "top", - icon: "{{ 'fa icon-job-' + nested_group.hosts_status_class }}", - columnClass: 'status-column List-staticColumn--smallStatus' + fields: { + failed_hosts: { + label: '', + nosort: true, + mode: 'all', + iconOnly: true, + awToolTip: "{{ nested_group.hosts_status_tip }}", + dataPlacement: "top", + icon: "{{ 'fa icon-job-' + nested_group.hosts_status_class }}", + columnClass: 'status-column List-staticColumn--smallStatus' + }, + name: { + label: i18n._('Groups'), + key: true, + ngClick: "editGroup(nested_group.id)", + columnClass: 'col-lg-6 col-md-6 col-sm-6 col-xs-6', + class: 'InventoryManage-breakWord', + } }, - name: { - label: 'Groups', - key: true, - // ngClick: "groupSelect(group.id)", - ngClick: "editGroup(nested_group.id)", - columnClass: 'col-lg-6 col-md-6 col-sm-6 col-xs-6', - class: 'InventoryManage-breakWord', + actions: { + refresh: { + mode: 'all', + awToolTip: i18n._("Refresh the page"), + ngClick: "refreshGroups()", + ngShow: "socketStatus == 'error'", + actionClass: 'btn List-buttonDefault', + buttonContent: i18n._('REFRESH') + }, + launch: { + mode: 'all', + ngDisabled: '!groupsSelected', + ngClick: 'setAdhocPattern()', + awToolTip: i18n._("Select an inventory source by clicking the check box beside it. The inventory source can be a single group or host, a selection of multiple hosts, or a selection of multiple groups."), + dataPlacement: 'top', + actionClass: 'btn List-buttonDefault', + buttonContent: i18n._('RUN COMMANDS'), + showTipWhenDisabled: true, + tooltipInnerClass: "Tooltip-wide", + ngShow: 'canAdhoc' + // TODO: set up a tip watcher and change text based on when + // things are selected/not selected. This is started and + // commented out in the inventory controller within the watchers. + // awToolTip: "{{ adhocButtonTipContents }}", + // dataTipWatch: "adhocButtonTipContents" + }, + associate: { + mode: 'all', + ngClick: 'associateGroup()', + awToolTip: i18n._("Associate an existing group"), + actionClass: 'btn List-buttonSubmit', + buttonContent: '+ ' + i18n._('ASSOCIATE GROUP'), + ngShow: 'canAdd', + dataPlacement: "top", + } + }, + + fieldActions: { + + columnClass: 'col-lg-6 col-md-6 col-sm-6 col-xs-6 text-right', + + edit: { + mode: 'all', + ngClick: "editGroup(nested_group.id)", + awToolTip: i18n._('Edit group'), + dataPlacement: "top", + ngShow: "nested_group.summary_fields.user_capabilities.edit" + }, + view: { + mode: 'all', + ngClick: "editGroup(nested_group.id)", + awToolTip: i18n._('View group'), + dataPlacement: "top", + ngShow: "!nested_group.summary_fields.user_capabilities.edit" + }, + "delete": { + mode: 'all', + ngClick: "disassociateGroup(nested_group)", + awToolTip: i18n._('Disassociate group'), + dataPlacement: "top", + ngShow: "nested_group.summary_fields.user_capabilities.delete" + } } - }, - - actions: { - refresh: { - mode: 'all', - awToolTip: "Refresh the page", - ngClick: "refreshGroups()", - ngShow: "socketStatus == 'error'", - actionClass: 'btn List-buttonDefault', - buttonContent: 'REFRESH' - }, - launch: { - mode: 'all', - ngDisabled: '!groupsSelected', - ngClick: 'setAdhocPattern()', - awToolTip: "Select an inventory source by clicking the check box beside it. The inventory source can be a single group or host, a selection of multiple hosts, or a selection of multiple groups.", - dataPlacement: 'top', - actionClass: 'btn List-buttonDefault', - buttonContent: 'RUN COMMANDS', - showTipWhenDisabled: true, - tooltipInnerClass: "Tooltip-wide", - ngShow: 'canAdhoc' - // TODO: set up a tip watcher and change text based on when - // things are selected/not selected. This is started and - // commented out in the inventory controller within the watchers. - // awToolTip: "{{ adhocButtonTipContents }}", - // dataTipWatch: "adhocButtonTipContents" - }, - associate: { - mode: 'all', - ngClick: 'associateGroup()', - awToolTip: "Associate an existing group", - actionClass: 'btn List-buttonSubmit', - buttonContent: '+ ASSOCIATE GROUP', - ngShow: 'canAdd', - dataPlacement: "top", - } - }, - - fieldActions: { - - columnClass: 'col-lg-6 col-md-6 col-sm-6 col-xs-6 text-right', - - edit: { - //label: 'Edit', - mode: 'all', - ngClick: "editGroup(nested_group.id)", - awToolTip: 'Edit group', - dataPlacement: "top", - ngShow: "nested_group.summary_fields.user_capabilities.edit" - }, - view: { - //label: 'Edit', - mode: 'all', - ngClick: "editGroup(nested_group.id)", - awToolTip: 'View group', - dataPlacement: "top", - ngShow: "!nested_group.summary_fields.user_capabilities.edit" - }, - "delete": { - //label: 'Delete', - mode: 'all', - ngClick: "disassociateGroup(nested_group)", - awToolTip: 'Disassociate group', - dataPlacement: "top", - ngShow: "nested_group.summary_fields.user_capabilities.delete" - } - } -}; + }; +}]; diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups.route.js b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups.route.js index b715097b8a..4600eecb63 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups.route.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups.route.js @@ -1,4 +1,5 @@ import {templateUrl} from '../../../../../../shared/template-url/template-url.factory'; +import { N_ } from '../../../../../../i18n'; export default { name: 'inventories.edit.hosts.edit.nested_groups', @@ -15,7 +16,7 @@ export default { }, ncyBreadcrumb: { parent: "inventories.edit.hosts.edit", - label: "ASSOCIATED GROUPS" + label: N_("ASSOCIATED GROUPS") }, views: { // 'related@inventories.edit.groups.edit': { diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/sources/factories/get-sync-status-msg.factory.js b/awx/ui/client/src/inventories-hosts/inventories/related/sources/factories/get-sync-status-msg.factory.js index efb393caf8..fc866a706d 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/related/sources/factories/get-sync-status-msg.factory.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/sources/factories/get-sync-status-msg.factory.js @@ -1,10 +1,10 @@ export default - function GetSyncStatusMsg() { + function GetSyncStatusMsg(i18n) { return function(params) { var status = params.status, launch_class = '', - launch_tip = 'Start sync process', - schedule_tip = 'Schedule future inventory syncs', + launch_tip = i18n._('Start sync process'), + schedule_tip = i18n._('Schedule future inventory syncs'), stat, stat_class, status_tip; stat = status; @@ -14,7 +14,7 @@ export default case 'never updated': stat = 'never'; stat_class = 'na'; - status_tip = 'Sync not performed. Click to start it now.'; + status_tip = i18n._('Sync not performed. Click') + ' ' + i18n._('to start it now.'); break; case 'none': case 'ok': @@ -22,28 +22,28 @@ export default launch_class = 'btn-disabled'; stat = 'n/a'; stat_class = 'na'; - status_tip = 'Cloud source not configured. Click to update.'; - launch_tip = 'Cloud source not configured.'; + status_tip = i18n._('Cloud source not configured. Click') + ' ' + i18n._('to update.'); + launch_tip = i18n._('Cloud source not configured.'); break; case 'canceled': - status_tip = 'Sync canceled. Click to view log.'; + status_tip = i18n._('Sync canceled. Click to view log.'); break; case 'failed': - status_tip = 'Sync failed. Click to view log.'; + status_tip = i18n._('Sync failed. Click to view log.'); break; case 'successful': - status_tip = 'Sync completed. Click to view log.'; + status_tip = i18n._('Sync completed. Click to view log.'); break; case 'pending': - status_tip = 'Sync pending.'; + status_tip = i18n._('Sync pending.'); launch_class = "btn-disabled"; launch_tip = "Sync pending"; break; case 'updating': case 'running': launch_class = "btn-disabled"; - launch_tip = "Sync running"; - status_tip = "Sync running. Click to view log."; + launch_tip = i18n._("Sync running"); + status_tip = i18n._("Sync running. Click to view log."); break; } @@ -58,4 +58,4 @@ export default }; } -GetSyncStatusMsg.$inject = []; +GetSyncStatusMsg.$inject = ['i18n']; diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js b/awx/ui/client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js index 981d002753..6561fe6fc9 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js @@ -9,12 +9,12 @@ 'ViewUpdateStatus', 'rbacUiControlService', 'GetBasePath', 'GetSyncStatusMsg', 'Dataset', 'Find', 'QuerySet', 'inventoryData', '$filter', 'Prompt', 'Wait', 'SourcesService', 'inventorySourceOptions', - 'canAdd', 'hasSyncableSources', + 'canAdd', 'hasSyncableSources', 'i18n', function($scope, $rootScope, $state, $stateParams, SourcesListDefinition, InventoryUpdate, CancelSourceUpdate, ViewUpdateStatus, rbacUiControlService, GetBasePath, GetSyncStatusMsg, Dataset, Find, qs, inventoryData, $filter, Prompt, - Wait, SourcesService, inventorySourceOptions, canAdd, hasSyncableSources){ + Wait, SourcesService, inventorySourceOptions, canAdd, hasSyncableSources, i18n){ let list = SourcesListDefinition; var inventory_source; @@ -117,7 +117,7 @@ $state.go('inventories.edit.inventory_sources.edit', {inventory_source_id: id}); }; $scope.deleteSource = function(inventory_source){ - var body = '
Are you sure you want to permanently delete the inventory source below from the inventory?
' + $filter('sanitize')(inventory_source.name) + '
'; + var body = '
' + i18n._('Are you sure you want to permanently delete the inventory source below from the inventory?') + '
' + $filter('sanitize')(inventory_source.name) + '
'; var action = function(){ delete $rootScope.promptActionBtnClass; Wait('start'); @@ -139,10 +139,10 @@ }; // Prompt depends on having $rootScope.promptActionBtnClass available... Prompt({ - hdr: 'Delete Source', + hdr: i18n._('Delete Source'), body: body, action: action, - actionText: 'DELETE', + actionText: i18n._('DELETE'), }); $rootScope.promptActionBtnClass = 'Modal-errorButton'; }; diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/sources/list/sources-list.partial.html b/awx/ui/client/src/inventories-hosts/inventories/related/sources/list/sources-list.partial.html index 03cc6ab1fd..7a6ef41a07 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/related/sources/list/sources-list.partial.html +++ b/awx/ui/client/src/inventories-hosts/inventories/related/sources/list/sources-list.partial.html @@ -3,7 +3,7 @@
- Delete Group + Delete Group
-

Deleting group {{ toDelete.name }}. - This group contains {{ toDelete.total_groups }} groups and {{ toDelete.total_hosts }} hosts. - This group contains {{ toDelete.total_hosts }} hosts. - This group contains {{ toDelete.total_groups }} groups. - Delete or promote the group's children?

+

Deleting group {{ toDelete.name }}. + This group contains {{ toDelete.total_groups }} groups and {{ toDelete.total_hosts }} hosts. + This group contains {{ toDelete.total_hosts }} hosts. + This group contains {{ toDelete.total_groups }} groups. + Delete or promote the group's children?

@@ -66,12 +66,12 @@
-
Are you sure you want to permanently delete the inventory source below from the inventory?
+
Are you sure you want to permanently delete the inventory source below from the inventory?
{{ toDelete.name }}
- CANCEL - DELETE + CANCEL + DELETE
diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/sources/sources.form.js b/awx/ui/client/src/inventories-hosts/inventories/related/sources/sources.form.js index 1dda910277..8f7923e2d5 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/related/sources/sources.form.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/sources/sources.form.js @@ -29,7 +29,7 @@ export default ['NotificationsList', 'i18n', function(NotificationsList, i18n){ let clone = _.clone(NotificationsList); notifications_object = angular.extend(clone, notifications_object); return { - addTitle: 'CREATE SOURCE', + addTitle: i18n._('CREATE SOURCE'), editTitle: '{{ name }}', showTitle: true, name: 'inventory_source', @@ -45,20 +45,20 @@ return { well: false, fields: { name: { - label: 'Name', + label: i18n._('Name'), type: 'text', ngDisabled: '!(inventory_source_obj.summary_fields.user_capabilities.edit || canAdd)', required: true, tab: 'properties' }, description: { - label: 'Description', + label: i18n._('Description'), type: 'text', ngDisabled: '!(inventory_source_obj.summary_fields.user_capabilities.edit || canAdd)', tab: 'properties' }, source: { - label: 'Source', + label: i18n._('Source'), type: 'select', ngOptions: 'source.label for source in source_type_options track by source.value', ngChange: 'sourceChange(source)', @@ -66,7 +66,7 @@ return { ngModel: 'source' }, credential: { - label: 'Credential', + label: i18n._('Credential'), type: 'lookup', list: 'CredentialList', basePath: 'credentials', @@ -84,7 +84,7 @@ return { project: { // initializes a default value for this search param // search params with default values set will not generate user-interactable search tags - label: 'Project', + label: i18n._('Project'), type: 'lookup', list: 'ProjectList', basePath: 'projects', @@ -118,23 +118,20 @@ return { includeInventoryFileNotFoundError: true }, source_regions: { - label: 'Regions', + label: i18n._('Regions'), type: 'select', ngOptions: 'source.label for source in source_region_choices track by source.value', multiSelect: true, ngShow: "source && (source.value == 'rax' || source.value == 'ec2' || source.value == 'gce' || source.value == 'azure' || source.value == 'azure_rm')", - - - dataTitle: 'Source Regions', + dataTitle: i18n._('Source Regions'), dataPlacement: 'right', - awPopOver: "

Click on the regions field to see a list of regions for your cloud provider. You can select multiple regions, " + - "or choose All to include all regions. Tower will only be updated with Hosts associated with the selected regions." + - "

", + awPopOver: "

" + i18n._("Click on the regions field to see a list of regions for your cloud provider. You can select multiple regions, or choose") + + "" + i18n._("All") + " " + i18n._("to include all regions. Tower will only be updated with Hosts associated with the selected regions.") + "

", dataContainer: 'body', ngDisabled: '!(inventory_source_obj.summary_fields.user_capabilities.edit || canAdd)' }, instance_filters: { - label: 'Instance Filters', + label: i18n._('Instance Filters'), type: 'text', ngShow: "source && source.value == 'ec2'", dataTitle: 'Instance Filters', @@ -153,7 +150,7 @@ return { ngDisabled: '!(inventory_source_obj.summary_fields.user_capabilities.edit || canAdd)' }, group_by: { - label: 'Only Group By', + label: i18n._('Only Group By'), type: 'select', ngShow: "source && source.value == 'ec2'", ngOptions: 'source.label for source in group_by_choices track by source.value', @@ -177,7 +174,7 @@ return { ngDisabled: '!(inventory_source_obj.summary_fields.user_capabilities.edit || canAdd)' }, inventory_script: { - label : "Custom Inventory Script", + label : i18n._("Custom Inventory Script"), type: 'lookup', basePath: 'inventory_scripts', list: 'InventoryScriptsList', @@ -192,14 +189,14 @@ return { }, custom_variables: { id: 'custom_variables', - label: 'Environment Variables', //"{{vars_label}}" , + label: i18n._('Environment Variables'), //"{{vars_label}}" , ngShow: "source && source.value=='custom' || source.value === 'scm'", type: 'textarea', class: 'Form-textAreaLabel Form-formGroup--fullWidth', rows: 6, 'default': '---', parseTypeName: 'envParseType', - dataTitle: "Environment Variables", + dataTitle: i18n._("Environment Variables"), dataPlacement: 'right', awPopOver: "

Provide environment variables to pass to the custom inventory script.

" + "

Enter variables using either JSON or YAML syntax. Use the radio button to toggle between the two.

" + @@ -213,14 +210,14 @@ return { }, ec2_variables: { id: 'ec2_variables', - label: 'Source Variables', //"{{vars_label}}" , + label: i18n._('Source Variables'), //"{{vars_label}}" , ngShow: "source && source.value == 'ec2'", type: 'textarea', class: 'Form-textAreaLabel Form-formGroup--fullWidth', rows: 6, 'default': '---', parseTypeName: 'envParseType', - dataTitle: "Source Variables", + dataTitle: i18n._("Source Variables"), dataPlacement: 'right', awPopOver: "

Override variables found in ec2.ini and used by the inventory update script. For a detailed description of these variables " + "" + @@ -236,7 +233,7 @@ return { }, vmware_variables: { id: 'vmware_variables', - label: 'Source Variables', //"{{vars_label}}" , + label: i18n._('Source Variables'), //"{{vars_label}}" , ngShow: "source && source.value == 'vmware'", type: 'textarea', class: 'Form-textAreaLabel Form-formGroup--fullWidth', @@ -259,7 +256,7 @@ return { }, openstack_variables: { id: 'openstack_variables', - label: 'Source Variables', //"{{vars_label}}" , + label: i18n._('Source Variables'), //"{{vars_label}}" , ngShow: "source && source.value == 'openstack'", type: 'textarea', class: 'Form-textAreaLabel Form-formGroup--fullWidth', @@ -295,60 +292,56 @@ return { ngDisabled: '!(inventory_source_obj.summary_fields.user_capabilities.edit || canAdd)', }, checkbox_group: { - label: 'Update Options', + label: i18n._('Update Options'), type: 'checkbox_group', ngShow: "source && (source.value !== '' && source.value !== null)", class: 'Form-checkbox--stacked', fields: [{ name: 'overwrite', - label: 'Overwrite', + label: i18n._('Overwrite'), type: 'checkbox', ngShow: "source.value !== '' && source.value !== null", - - awPopOver: '

If checked, all child groups and hosts not found on the external source will be deleted from ' + 'the local inventory.

When not checked, local child hosts and groups not found on the external source will ' + 'remain untouched by the inventory update process.

', - dataTitle: 'Overwrite', + dataTitle: i18n._('Overwrite'), dataContainer: 'body', dataPlacement: 'right', labelClass: 'checkbox-options', ngDisabled: "(!(inventory_source_obj.summary_fields.user_capabilities.edit || canAdd))" }, { name: 'overwrite_vars', - label: 'Overwrite Variables', + label: i18n._('Overwrite Variables'), type: 'checkbox', ngShow: "source.value !== '' && source.value !== null", - - awPopOver: '

If checked, all variables for child groups and hosts will be removed and replaced by those ' + 'found on the external source.

When not checked, a merge will be performed, combining local variables with ' + 'those found on the external source.

', - dataTitle: 'Overwrite Variables', + dataTitle: i18n._('Overwrite Variables'), dataContainer: 'body', dataPlacement: 'right', labelClass: 'checkbox-options', ngDisabled: "(!(inventory_source_obj.summary_fields.user_capabilities.edit || canAdd) || source.value === 'scm')" }, { name: 'update_on_launch', - label: 'Update on Launch', + label: i18n._('Update on Launch'), type: 'checkbox', ngShow: "source.value !== '' && source.value !== null", awPopOver: '

Each time a job runs using this inventory, refresh the inventory from the selected source before ' + 'executing job tasks.

', - dataTitle: 'Update on Launch', + dataTitle: i18n._('Update on Launch'), dataContainer: 'body', dataPlacement: 'right', labelClass: 'checkbox-options', ngDisabled: '!(inventory_source_obj.summary_fields.user_capabilities.edit || canAdd)' }, { name: 'update_on_project_update', - label: 'Update on Project Update', + label: i18n._('Update on Project Update'), type: 'checkbox', ngShow: "source.value === 'scm'", awPopOver: '

Each time the selected project is updated, refresh the inventory from the selected source before ' + 'executing job tasks.

', - dataTitle: 'Update on Project Update', + dataTitle: i18n._('Update on Project Update'), dataContainer: 'body', dataPlacement: 'right', labelClass: 'checkbox-options', @@ -356,7 +349,7 @@ return { }] }, update_cache_timeout: { - label: "Cache Timeout (seconds)", + label: i18n._("Cache Timeout") + " " + i18n._("(seconds)") + "", id: 'source-cache-timeout', type: 'number', ngDisabled: '!(inventory_source_obj.summary_fields.user_capabilities.edit || canAdd)', @@ -368,7 +361,7 @@ return { awPopOver: '

Time in seconds to consider an inventory sync to be current. During job runs and callbacks the task system will ' + 'evaluate the timestamp of the latest sync. If it is older than Cache Timeout, it is not considered current, ' + 'and a new inventory sync will be performed.

', - dataTitle: 'Cache Timeout', + dataTitle: i18n._('Cache Timeout'), dataPlacement: 'right', dataContainer: "body" } diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/sources/sources.list.js b/awx/ui/client/src/inventories-hosts/inventories/related/sources/sources.list.js index a857fa4c30..5e23b595da 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/related/sources/sources.list.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/sources/sources.list.js @@ -4,131 +4,128 @@ * All Rights Reserved *************************************************/ -export default { - name: 'inventory_sources', - iterator: 'inventory_source', - editTitle: '{{ inventory_source.name }}', - well: true, - wellOverride: true, - index: false, - hover: true, - trackBy: 'inventory_source.id', - basePath: 'api/v2/inventories/{{$stateParams.inventory_id}}/inventory_sources/', + export default ['i18n', function(i18n) { + return { + name: 'inventory_sources', + iterator: 'inventory_source', + editTitle: '{{ inventory_source.name }}', + well: true, + wellOverride: true, + index: false, + hover: true, + trackBy: 'inventory_source.id', + basePath: 'api/v2/inventories/{{$stateParams.inventory_id}}/inventory_sources/', - fields: { - sync_status: { - label: '', - nosort: true, - mode: 'all', - iconOnly: true, - ngClick: 'viewUpdateStatus(inventory_source.id)', - awToolTip: "{{ inventory_source.status_tooltip }}", - dataTipWatch: "inventory_source.status_tooltip", - icon: "{{ 'fa icon-cloud-' + inventory_source.status_class }}", - ngClass: "inventory_source.status_class", - dataPlacement: "top", - columnClass: 'status-column List-staticColumn--smallStatus' + fields: { + sync_status: { + label: '', + nosort: true, + mode: 'all', + iconOnly: true, + ngClick: 'viewUpdateStatus(inventory_source.id)', + awToolTip: "{{ inventory_source.status_tooltip }}", + dataTipWatch: "inventory_source.status_tooltip", + icon: "{{ 'fa icon-cloud-' + inventory_source.status_class }}", + ngClass: "inventory_source.status_class", + dataPlacement: "top", + columnClass: 'status-column List-staticColumn--smallStatus' + }, + name: { + label: i18n._('Sources'), + key: true, + ngClick: "editSource(inventory_source.id)", + columnClass: 'col-lg-4 col-md-4 col-sm-4 col-xs-4', + class: 'InventoryManage-breakWord', + }, + source: { + label: i18n._('Type'), + ngBind: 'inventory_source.source_label', + columnClass: 'col-lg-4 col-md-4 col-sm-4 col-xs-4' + } }, - name: { - label: 'Sources', - key: true, - ngClick: "editSource(inventory_source.id)", - columnClass: 'col-lg-4 col-md-4 col-sm-4 col-xs-4', - class: 'InventoryManage-breakWord', + + actions: { + refresh: { + mode: 'all', + awToolTip: i18n._("Refresh the page"), + ngClick: "refreshGroups()", + ngShow: "socketStatus == 'error'", + actionClass: 'btn List-buttonDefault', + buttonContent: i18n._('REFRESH') + }, + sync_all: { + mode: 'all', + awToolTip: i18n._("Sync all inventory sources"), + ngClick: "syncAllSources()", + ngShow: "showSyncAll", + actionClass: 'btn List-buttonDefault', + buttonContent: i18n._('SYNC ALL'), + dataPlacement: "top" + }, + create: { + mode: 'all', + ngClick: "createSource()", + awToolTip: i18n._("Create a new source"), + actionClass: 'btn List-buttonSubmit', + buttonContent: '+ ' + i18n._('ADD SOURCE'), + ngShow: 'canAdd', + dataPlacement: "top", + } }, - source: { - label: 'Type', - ngBind: 'inventory_source.source_label', - columnClass: 'col-lg-4 col-md-4 col-sm-4 col-xs-4' + + fieldActions: { + + columnClass: 'col-lg-4 col-md-4 col-sm-4 col-xs-4 text-right', + + source_update: { + mode: 'all', + ngClick: 'updateSource(inventory_source)', + awToolTip: "{{ inventory_source.launch_tooltip }}", + dataTipWatch: "inventory_source.launch_tooltip", + ngShow: "(inventory_source.status !== 'running' && inventory_source.status " + + "!== 'pending' && inventory_source.status !== 'updating') && inventory_source.summary_fields.user_capabilities.start", + ngClass: "inventory_source.launch_class", + dataPlacement: "top", + }, + cancel: { + mode: 'all', + ngClick: "cancelUpdate(inventory_source.id)", + awToolTip: i18n._("Cancel sync process"), + 'class': 'red-txt', + ngShow: "(inventory_source.status == 'running' || inventory_source.status == 'pending' " + + "|| inventory_source.status == 'updating') && inventory_source.summary_fields.user_capabilities.start", + dataPlacement: "top", + iconClass: "fa fa-minus-circle" + }, + schedule: { + mode: 'all', + ngClick: "scheduleSource(inventory_source.id)", + awToolTip: "{{ inventory_source.group_schedule_tooltip }}", + ngClass: "inventory_source.scm_type_class", + dataPlacement: 'top', + ngShow: "!(inventory_source.summary_fields.inventory_source.source === '') && inventory_source.summary_fields.user_capabilities.schedule" + }, + edit: { + mode: 'all', + ngClick: "editSource(inventory_source.id)", + awToolTip: i18n._('Edit source'), + dataPlacement: "top", + ngShow: "inventory_source.summary_fields.user_capabilities.edit" + }, + view: { + mode: 'all', + ngClick: "editSource(inventory_source.id)", + awToolTip: i18n._('View source'), + dataPlacement: "top", + ngShow: "!inventory_source.summary_fields.user_capabilities.edit" + }, + "delete": { + mode: 'all', + ngClick: "deleteSource(inventory_source)", + awToolTip: i18n._('Delete source'), + dataPlacement: "top", + ngShow: "inventory_source.summary_fields.user_capabilities.delete" + } } - }, - - actions: { - refresh: { - mode: 'all', - awToolTip: "Refresh the page", - ngClick: "refreshGroups()", - ngShow: "socketStatus == 'error'", - actionClass: 'btn List-buttonDefault', - buttonContent: 'REFRESH' - }, - sync_all: { - mode: 'all', - awToolTip: "Sync all inventory sources", - ngClick: "syncAllSources()", - ngShow: "showSyncAll", - actionClass: 'btn List-buttonDefault', - buttonContent: 'SYNC ALL', - dataPlacement: "top" - }, - create: { - mode: 'all', - ngClick: "createSource()", - awToolTip: "Create a new source", - actionClass: 'btn List-buttonSubmit', - buttonContent: '+ ADD SOURCE', - ngShow: 'canAdd', - dataPlacement: "top", - } - }, - - fieldActions: { - - columnClass: 'col-lg-4 col-md-4 col-sm-4 col-xs-4 text-right', - - source_update: { - //label: 'Sync', - mode: 'all', - ngClick: 'updateSource(inventory_source)', - awToolTip: "{{ inventory_source.launch_tooltip }}", - dataTipWatch: "inventory_source.launch_tooltip", - ngShow: "(inventory_source.status !== 'running' && inventory_source.status " + - "!== 'pending' && inventory_source.status !== 'updating') && inventory_source.summary_fields.user_capabilities.start", - ngClass: "inventory_source.launch_class", - dataPlacement: "top", - }, - cancel: { - //label: 'Cancel', - mode: 'all', - ngClick: "cancelUpdate(inventory_source.id)", - awToolTip: "Cancel sync process", - 'class': 'red-txt', - ngShow: "(inventory_source.status == 'running' || inventory_source.status == 'pending' " + - "|| inventory_source.status == 'updating') && inventory_source.summary_fields.user_capabilities.start", - dataPlacement: "top", - iconClass: "fa fa-minus-circle" - }, - schedule: { - mode: 'all', - ngClick: "scheduleSource(inventory_source.id)", - awToolTip: "{{ inventory_source.group_schedule_tooltip }}", - ngClass: "inventory_source.scm_type_class", - dataPlacement: 'top', - ngShow: "!(inventory_source.summary_fields.inventory_source.source === '') && inventory_source.summary_fields.user_capabilities.schedule" - }, - edit: { - //label: 'Edit', - mode: 'all', - ngClick: "editSource(inventory_source.id)", - awToolTip: 'Edit source', - dataPlacement: "top", - ngShow: "inventory_source.summary_fields.user_capabilities.edit" - }, - view: { - //label: 'Edit', - mode: 'all', - ngClick: "editSource(inventory_source.id)", - awToolTip: 'View source', - dataPlacement: "top", - ngShow: "!inventory_source.summary_fields.user_capabilities.edit" - }, - "delete": { - //label: 'Delete', - mode: 'all', - ngClick: "deleteSource(inventory_source)", - awToolTip: 'Delete source', - dataPlacement: "top", - ngShow: "inventory_source.summary_fields.user_capabilities.delete" - } - } -}; + }; +}]; diff --git a/awx/ui/client/src/inventories-hosts/inventories/smart-inventory/smart-inventory-host-filter/host-filter-modal/host-filter-modal.partial.html b/awx/ui/client/src/inventories-hosts/inventories/smart-inventory/smart-inventory-host-filter/host-filter-modal/host-filter-modal.partial.html index fd29edc1fc..e0b6d7fef2 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/smart-inventory/smart-inventory-host-filter/host-filter-modal/host-filter-modal.partial.html +++ b/awx/ui/client/src/inventories-hosts/inventories/smart-inventory/smart-inventory-host-filter/host-filter-modal/host-filter-modal.partial.html @@ -2,7 +2,7 @@
-
DYNAMIC HOSTS
+
DYNAMIC HOSTS
@@ -13,8 +13,8 @@
- - + +
diff --git a/awx/ui/client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js b/awx/ui/client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js index 0e864fc4a1..bdd08384ab 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js +++ b/awx/ui/client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js @@ -29,7 +29,7 @@ export default ['i18n', 'InventoryCompletedJobsList', function(i18n, InventoryCo editTitle: '{{ name }}', name: 'smartinventory', basePath: 'inventory', - breadcrumbName: 'SMART INVENTORY', + breadcrumbName: i18n._('SMART INVENTORY'), stateTree: 'inventories', activeEditState: 'inventories.editSmartInventory', detailsClick: "$state.go('inventories.editSmartInventory')", diff --git a/awx/ui/client/src/inventories-hosts/shared/ansible-facts/ansible-facts.partial.html b/awx/ui/client/src/inventories-hosts/shared/ansible-facts/ansible-facts.partial.html index 3a8cbce18b..a9785e8251 100644 --- a/awx/ui/client/src/inventories-hosts/shared/ansible-facts/ansible-facts.partial.html +++ b/awx/ui/client/src/inventories-hosts/shared/ansible-facts/ansible-facts.partial.html @@ -1,7 +1,7 @@
diff --git a/awx/ui/client/src/inventories-hosts/shared/associate-groups/associate-groups.partial.html b/awx/ui/client/src/inventories-hosts/shared/associate-groups/associate-groups.partial.html index 02a493af8c..2d9218f855 100644 --- a/awx/ui/client/src/inventories-hosts/shared/associate-groups/associate-groups.partial.html +++ b/awx/ui/client/src/inventories-hosts/shared/associate-groups/associate-groups.partial.html @@ -3,7 +3,7 @@
-
SELECT GROUP
+
SELECT GROUP
- - + +
diff --git a/awx/ui/client/src/inventories-hosts/shared/associate-hosts/associate-hosts.partial.html b/awx/ui/client/src/inventories-hosts/shared/associate-hosts/associate-hosts.partial.html index db40496a63..15b8fa7d7a 100644 --- a/awx/ui/client/src/inventories-hosts/shared/associate-hosts/associate-hosts.partial.html +++ b/awx/ui/client/src/inventories-hosts/shared/associate-hosts/associate-hosts.partial.html @@ -3,7 +3,7 @@
-
SELECT HOST
+
SELECT HOST
- - + +
diff --git a/awx/ui/client/src/inventories-hosts/shared/factories/set-enabled-msg.factory.js b/awx/ui/client/src/inventories-hosts/shared/factories/set-enabled-msg.factory.js index 7c60174611..a31b8f73fa 100644 --- a/awx/ui/client/src/inventories-hosts/shared/factories/set-enabled-msg.factory.js +++ b/awx/ui/client/src/inventories-hosts/shared/factories/set-enabled-msg.factory.js @@ -1,13 +1,16 @@ export default - function SetEnabledMsg() { + function SetEnabledMsg(i18n) { return function(host) { if (host.has_inventory_sources) { // Inventory sync managed, so not clickable - host.enabledToolTip = (host.enabled) ? 'Host is available' : 'Host is not available'; + host.enabledToolTip = (host.enabled) ? i18n._('Host is available') : i18n._('Host is not available'); } else { // Clickable - host.enabledToolTip = (host.enabled) ? 'Host is available. Click to toggle.' : 'Host is not available. Click to toggle.'; + host.enabledToolTip = (host.enabled) ? i18n._('Host is available. Click to toggle.') : i18n._('Host is not available. Click to toggle.'); } }; } + +SetEnabledMsg.$inject = + [ 'i18n', ]; diff --git a/awx/ui/client/src/inventories-hosts/shared/factories/set-status.factory.js b/awx/ui/client/src/inventories-hosts/shared/factories/set-status.factory.js index c03468ee1f..3e7b76fb4a 100644 --- a/awx/ui/client/src/inventories-hosts/shared/factories/set-status.factory.js +++ b/awx/ui/client/src/inventories-hosts/shared/factories/set-status.factory.js @@ -1,5 +1,5 @@ export default - function SetStatus($filter, SetEnabledMsg, Empty) { + function SetStatus($filter, SetEnabledMsg, Empty, i18n) { return function(params) { var scope = params.scope, host = params.host, @@ -13,8 +13,8 @@ export default } function noRecentJobs() { - title = 'No job data'; - html = "

No recent job data available for this host.

\n"; + title = i18n._('No job data'); + html = "

" + i18n._("No recent job data available for this host.") + "

\n"; } function setMsg(host) { @@ -22,11 +22,11 @@ export default if (host.has_active_failures === true || (host.has_active_failures === false && host.last_job !== null)) { if (host.has_active_failures === true) { - host.badgeToolTip = 'Most recent job failed. Click to view jobs.'; + host.badgeToolTip = i18n._('Most recent job failed. Click to view jobs.'); host.active_failures = 'error'; } else { - host.badgeToolTip = "Most recent job successful. Click to view jobs."; + host.badgeToolTip = i18n._("Most recent job successful. Click to view jobs."); host.active_failures = 'successful'; } if (host.summary_fields.recent_jobs.length > 0) { @@ -40,9 +40,9 @@ export default html = "
StatusLast SyncSource" + i18n._("Status") + "" + i18n._("Last Sync") + "" + i18n._("Source") + "
" + ($filter('longDate')(row.last_updated)) + "" + $filter('sanitize')(ellipsis(row.name)) + "
\n"; html += "\n"; html += "\n"; - html += "\n"; - html += "\n"; - html += "\n"; + html += "\n"; + html += "\n"; + html += "\n"; html += "\n"; html += "\n"; html += "\n"; @@ -72,7 +72,7 @@ export default } } else if (host.has_active_failures === false && host.last_job === null) { - host.badgeToolTip = "No job data available."; + host.badgeToolTip = i18n._("No job data available."); host.active_failures = 'none'; noRecentJobs(); } @@ -98,5 +98,6 @@ export default SetStatus.$inject = [ '$filter', 'SetEnabledMsg', - 'Empty' + 'Empty', + 'i18n' ];
StatusFinishedName" + i18n._("Status") + "" + i18n._("Finished") + "" + i18n._("Name") + "