From 64f62d6755acea76b442e5e335e3f9bc41a4e266 Mon Sep 17 00:00:00 2001 From: Alex Corey Date: Tue, 9 Aug 2022 15:29:37 -0400 Subject: [PATCH] fixes translation issue --- .../WorkflowApprovalListItem.js | 14 +++----------- .../shared/WorkflowApprovalButton.js | 3 +-- .../shared/WorkflowApprovalUtils.js | 4 ++-- .../WorkflowApproval/shared/WorkflowDenyButton.js | 5 +---- 4 files changed, 7 insertions(+), 19 deletions(-) diff --git a/awx/ui/src/screens/WorkflowApproval/WorkflowApprovalList/WorkflowApprovalListItem.js b/awx/ui/src/screens/WorkflowApproval/WorkflowApprovalList/WorkflowApprovalListItem.js index c369747c6a..eab27f14d5 100644 --- a/awx/ui/src/screens/WorkflowApproval/WorkflowApprovalList/WorkflowApprovalListItem.js +++ b/awx/ui/src/screens/WorkflowApproval/WorkflowApprovalList/WorkflowApprovalListItem.js @@ -79,20 +79,14 @@ function WorkflowApprovalListItem({ @@ -107,9 +101,7 @@ function WorkflowApprovalListItem({ buttonText={t`Cancel Workflow`} isDisabled={hasBeenActedOn} tooltip={ - hasBeenActedOn - ? t`This workflow has already been ${status}` - : t`Cancel` + hasBeenActedOn ? t`This has already been acted on` : t`Cancel` } cancelationMessage={t`This will cancel all subsequent nodes in this workflow `} diff --git a/awx/ui/src/screens/WorkflowApproval/shared/WorkflowApprovalButton.js b/awx/ui/src/screens/WorkflowApproval/shared/WorkflowApprovalButton.js index 21559fda5f..5ec6a3a8c0 100644 --- a/awx/ui/src/screens/WorkflowApproval/shared/WorkflowApprovalButton.js +++ b/awx/ui/src/screens/WorkflowApproval/shared/WorkflowApprovalButton.js @@ -7,7 +7,6 @@ import useRequest, { useDismissableError } from 'hooks/useRequest'; import AlertModal from 'components/AlertModal'; import ErrorDetail from 'components/ErrorDetail'; -import { getStatus } from './WorkflowApprovalUtils'; function WorkflowApprovalButton({ isDetailView, @@ -41,7 +40,7 @@ function WorkflowApprovalButton({ onClick={() => handleApprove()} aria-label={ hasBeenActedOn - ? t`This workflow has already been ${getStatus(workflowApproval)}` + ? t`This workflow has already been acted on` : t`Approve` } > diff --git a/awx/ui/src/screens/WorkflowApproval/shared/WorkflowApprovalUtils.js b/awx/ui/src/screens/WorkflowApproval/shared/WorkflowApprovalUtils.js index 110481e607..d8f155c2d0 100644 --- a/awx/ui/src/screens/WorkflowApproval/shared/WorkflowApprovalUtils.js +++ b/awx/ui/src/screens/WorkflowApproval/shared/WorkflowApprovalUtils.js @@ -31,10 +31,10 @@ export function getStatus(workflowApproval) { } if (workflowApproval.canceled_on) { - return 'canceled'; + return t`canceled`; } if (workflowApproval.status === 'failed' && workflowApproval.failed) { - return 'denied'; + return t`denied`; } if (workflowApproval.status === 'successful') { return 'approved'; diff --git a/awx/ui/src/screens/WorkflowApproval/shared/WorkflowDenyButton.js b/awx/ui/src/screens/WorkflowApproval/shared/WorkflowDenyButton.js index 3399ec624d..8604e7434e 100644 --- a/awx/ui/src/screens/WorkflowApproval/shared/WorkflowDenyButton.js +++ b/awx/ui/src/screens/WorkflowApproval/shared/WorkflowDenyButton.js @@ -7,7 +7,6 @@ import useRequest, { useDismissableError } from 'hooks/useRequest'; import AlertModal from 'components/AlertModal'; import ErrorDetail from 'components/ErrorDetail'; -import { getStatus } from './WorkflowApprovalUtils'; function WorkflowDenyButton({ isDetailView, workflowApproval, onHandleToast }) { const hasBeenActedOn = @@ -33,9 +32,7 @@ function WorkflowDenyButton({ isDetailView, workflowApproval, onHandleToast }) { <>