diff --git a/awx/ui/client/features/credentials/credentials.strings.js b/awx/ui/client/features/credentials/credentials.strings.js index 64af74726e..a89015dddd 100644 --- a/awx/ui/client/features/credentials/credentials.strings.js +++ b/awx/ui/client/features/credentials/credentials.strings.js @@ -29,8 +29,7 @@ function CredentialsStrings (BaseString) { }; ns.deleteCredential = { - CONFIRM: t.s('Are you sure you want to delete this credential?'), - INVALIDATE: t.s('Doing so will invalidate the following:') + CONFIRM: t.s('The credential is currently being used by other resources. Are you sure you want to delete this credential?') }; } diff --git a/awx/ui/client/src/credentials/list/credentials-list.controller.js b/awx/ui/client/src/credentials/list/credentials-list.controller.js index da2b27858b..8a37b3f7ae 100644 --- a/awx/ui/client/src/credentials/list/credentials-list.controller.js +++ b/awx/ui/client/src/credentials/list/credentials-list.controller.js @@ -123,7 +123,7 @@ export default ['$scope', 'Rest', 'CredentialList', 'Prompt', 'ProcessErrors', ' }); if (invalidateRelatedLines && invalidateRelatedLines.length > 0) { - deleteModalBody = `
${CredentialsStrings.get('deleteCredential.CONFIRM')} ${CredentialsStrings.get('deleteCredential.INVALIDATE')}
`; + deleteModalBody = `
${CredentialsStrings.get('deleteCredential.CONFIRM')}
`; invalidateRelatedLines.forEach(invalidateRelatedLine => { deleteModalBody += invalidateRelatedLine; }); 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 ee1783fec8..d30be1272e 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 @@ -110,7 +110,7 @@ function InventoriesList($scope, }); if (invalidateRelatedLines && invalidateRelatedLines.length > 0) { - deleteModalBody = `
${InventoryHostsStrings.get('deleteInventory.CONFIRM')} ${InventoryHostsStrings.get('deleteInventory.INVALIDATE')}
`; + deleteModalBody = `
${InventoryHostsStrings.get('deleteInventory.CONFIRM')}
`; invalidateRelatedLines.forEach(invalidateRelatedLine => { deleteModalBody += invalidateRelatedLine; }); 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 b65c0433aa..c4fed3f97b 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 @@ -152,7 +152,7 @@ }); if (invalidateRelatedLines && invalidateRelatedLines.length > 0) { - deleteModalBody = `
${InventoryHostsStrings.get('deleteSource.CONFIRM')} ${InventoryHostsStrings.get('deleteSource.INVALIDATE')}
`; + deleteModalBody = `
${InventoryHostsStrings.get('deleteSource.CONFIRM')}
`; invalidateRelatedLines.forEach(invalidateRelatedLine => { deleteModalBody += invalidateRelatedLine; }); diff --git a/awx/ui/client/src/inventories-hosts/inventory-hosts.strings.js b/awx/ui/client/src/inventories-hosts/inventory-hosts.strings.js index 0744be46db..878aa7af27 100644 --- a/awx/ui/client/src/inventories-hosts/inventory-hosts.strings.js +++ b/awx/ui/client/src/inventories-hosts/inventory-hosts.strings.js @@ -5,13 +5,11 @@ function InventoryHostsStrings (BaseString) { let ns = this['inventory-hosts']; ns.deleteInventory = { - CONFIRM: t.s('Are you sure you want to delete this inventory?'), - INVALIDATE: t.s('Doing so will invalidate the following:') + CONFIRM: t.s('The inventory is currently being used by other resources. Are you sure you want to delete this inventory?') }; ns.deleteSource = { - CONFIRM: t.s('Are you sure you want to delete this inventory source?'), - INVALIDATE: t.s('Doing so will invalidate the following:') + CONFIRM: t.s('The inventory source is currently being used by other resources. Are you sure you want to delete this inventory source?') }; ns.deletegroup = { diff --git a/awx/ui/client/src/inventory-scripts/inventory-scripts.strings.js b/awx/ui/client/src/inventory-scripts/inventory-scripts.strings.js index 9b3fccd4af..4442bb9cf0 100644 --- a/awx/ui/client/src/inventory-scripts/inventory-scripts.strings.js +++ b/awx/ui/client/src/inventory-scripts/inventory-scripts.strings.js @@ -5,8 +5,7 @@ function InventoryScriptsStrings (BaseString) { let ns = this.inventory_scripts; ns.deleteInventoryScript = { - CONFIRM: t.s('Are you sure you want to delete this inventory script?'), - INVALIDATE: t.s('Doing so will invalidate the following:') + CONFIRM: t.s('The inventory script is currently being used by other resources. Are you sure you want to delete this inventory script?') }; } diff --git a/awx/ui/client/src/inventory-scripts/list/list.controller.js b/awx/ui/client/src/inventory-scripts/list/list.controller.js index b6630b7c2a..56c9525b9b 100644 --- a/awx/ui/client/src/inventory-scripts/list/list.controller.js +++ b/awx/ui/client/src/inventory-scripts/list/list.controller.js @@ -89,7 +89,7 @@ export default ['$rootScope', '$scope', 'Wait', 'InventoryScriptsList', }); if (invalidateRelatedLines && invalidateRelatedLines.length > 0) { - deleteModalBody = `
${InventoryScriptsStrings.get('deleteInventoryScript.CONFIRM')} ${InventoryScriptsStrings.get('deleteInventoryScript.INVALIDATE')}
`; + deleteModalBody = `
${InventoryScriptsStrings.get('deleteInventoryScript.CONFIRM')}
`; invalidateRelatedLines.forEach(invalidateRelatedLine => { deleteModalBody += invalidateRelatedLine; }); diff --git a/awx/ui/client/src/projects/list/projects-list.controller.js b/awx/ui/client/src/projects/list/projects-list.controller.js index 267eebe887..d61f77192e 100644 --- a/awx/ui/client/src/projects/list/projects-list.controller.js +++ b/awx/ui/client/src/projects/list/projects-list.controller.js @@ -215,7 +215,7 @@ export default ['$scope', '$rootScope', '$log', 'Rest', 'Alert', }); if (invalidateRelatedLines && invalidateRelatedLines.length > 0) { - deleteModalBody = `
${ProjectsStrings.get('deleteProject.CONFIRM')} ${ProjectsStrings.get('deleteProject.INVALIDATE')}
`; + deleteModalBody = `
${ProjectsStrings.get('deleteProject.CONFIRM')}
`; invalidateRelatedLines.forEach(invalidateRelatedLine => { deleteModalBody += invalidateRelatedLine; }); diff --git a/awx/ui/client/src/projects/projects.strings.js b/awx/ui/client/src/projects/projects.strings.js index 84566d12e7..2d8ba011ce 100644 --- a/awx/ui/client/src/projects/projects.strings.js +++ b/awx/ui/client/src/projects/projects.strings.js @@ -5,8 +5,7 @@ function ProjectsStrings (BaseString) { let ns = this.projects; ns.deleteProject = { - CONFIRM: t.s('Are you sure you want to delete this project?'), - INVALIDATE: t.s('Doing so will invalidate the following:') + CONFIRM: t.s('The project is currently being used by other resources. Are you sure you want to delete this project?') }; } diff --git a/awx/ui/client/src/templates/list/templates-list.controller.js b/awx/ui/client/src/templates/list/templates-list.controller.js index bd25143132..54deff2b9e 100644 --- a/awx/ui/client/src/templates/list/templates-list.controller.js +++ b/awx/ui/client/src/templates/list/templates-list.controller.js @@ -173,7 +173,7 @@ export default ['$scope', '$rootScope', }); if (invalidateRelatedLines && invalidateRelatedLines.length > 0) { - deleteModalBody = `
${TemplatesStrings.get('jobTemplates.deleteJobTemplate.CONFIRM')} ${TemplatesStrings.get('jobTemplates.deleteJobTemplate.INVALIDATE')}
`; + deleteModalBody = `
${TemplatesStrings.get('jobTemplates.deleteJobTemplate.CONFIRM')}
`; invalidateRelatedLines.forEach(invalidateRelatedLine => { deleteModalBody += invalidateRelatedLine; }); diff --git a/awx/ui/client/src/templates/templates.strings.js b/awx/ui/client/src/templates/templates.strings.js index 2391ea8134..3d6a8ba3bb 100644 --- a/awx/ui/client/src/templates/templates.strings.js +++ b/awx/ui/client/src/templates/templates.strings.js @@ -6,8 +6,7 @@ function TemplatesStrings (BaseString) { ns.jobTemplates = { deleteJobTemplate: { - CONFIRM: t.s('Are you sure you want to delete this job template?'), - INVALIDATE: t.s('Doing so will invalidate the following:') + CONFIRM: t.s('The job template is currently being used by other resources. Are you sure you want to delete this job template?') } };