External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-20 02:17:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

fixes translation issue

Browse Source
This commit is contained in:
Alex Corey
2022-08-09 15:29:37 -04:00
parent b4cfe868fb
commit 64f62d6755
4 changed files with 7 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
awx/ui/src/screens/WorkflowApproval/WorkflowApprovalList/WorkflowApprovalListItem.js
View File

@@ -79,20 +79,14 @@ function WorkflowApprovalListItem({
<ActionItem <ActionItem
visible visible
tooltip={ tooltip={
hasBeenActedOn hasBeenActedOn ? t`This has already been acted on` : t`Approve`
? t`This workflow has already been ${status}`
: t`Approve`
} }
> >
<WorkflowApprovalButton workflowApproval={workflowApproval} /> <WorkflowApprovalButton workflowApproval={workflowApproval} />
</ActionItem> </ActionItem>
<ActionItem <ActionItem
visible visible
tooltip={ tooltip={hasBeenActedOn ? t`This has already been acted on` : t`Deny`}
hasBeenActedOn
? t`This workflow has already been ${status}`
: t`Deny`
}
> >
<WorkflowDenyButton workflowApproval={workflowApproval} /> <WorkflowDenyButton workflowApproval={workflowApproval} />
</ActionItem> </ActionItem>
@@ -107,9 +101,7 @@ function WorkflowApprovalListItem({
buttonText={t`Cancel Workflow`} buttonText={t`Cancel Workflow`}
isDisabled={hasBeenActedOn} isDisabled={hasBeenActedOn}
tooltip={ tooltip={
hasBeenActedOn hasBeenActedOn ? t`This has already been acted on` : t`Cancel`
? t`This workflow has already been ${status}`
: t`Cancel`
} }
cancelationMessage={t`This will cancel all subsequent nodes in this workflow cancelationMessage={t`This will cancel all subsequent nodes in this workflow
`} `}

3
awx/ui/src/screens/WorkflowApproval/shared/WorkflowApprovalButton.js
View File

@@ -7,7 +7,6 @@ import useRequest, { useDismissableError } from 'hooks/useRequest';
import AlertModal from 'components/AlertModal'; import AlertModal from 'components/AlertModal';
import ErrorDetail from 'components/ErrorDetail'; import ErrorDetail from 'components/ErrorDetail';
import { getStatus } from './WorkflowApprovalUtils';
function WorkflowApprovalButton({ function WorkflowApprovalButton({
isDetailView, isDetailView,
@@ -41,7 +40,7 @@ function WorkflowApprovalButton({
onClick={() => handleApprove()} onClick={() => handleApprove()}
aria-label={ aria-label={
hasBeenActedOn hasBeenActedOn
? t`This workflow has already been ${getStatus(workflowApproval)}` ? t`This workflow has already been acted on`
: t`Approve` : t`Approve`
} }
> >

4
awx/ui/src/screens/WorkflowApproval/shared/WorkflowApprovalUtils.js
View File

@@ -31,10 +31,10 @@ export function getStatus(workflowApproval) {
} }
if (workflowApproval.canceled_on) { if (workflowApproval.canceled_on) {
return 'canceled'; return t`canceled`;
} }
if (workflowApproval.status === 'failed' && workflowApproval.failed) { if (workflowApproval.status === 'failed' && workflowApproval.failed) {
return 'denied'; return t`denied`;
} }
if (workflowApproval.status === 'successful') { if (workflowApproval.status === 'successful') {
return 'approved'; return 'approved';

5
awx/ui/src/screens/WorkflowApproval/shared/WorkflowDenyButton.js
View File

@@ -7,7 +7,6 @@ import useRequest, { useDismissableError } from 'hooks/useRequest';
import AlertModal from 'components/AlertModal'; import AlertModal from 'components/AlertModal';
import ErrorDetail from 'components/ErrorDetail'; import ErrorDetail from 'components/ErrorDetail';
import { getStatus } from './WorkflowApprovalUtils';
function WorkflowDenyButton({ isDetailView, workflowApproval, onHandleToast }) { function WorkflowDenyButton({ isDetailView, workflowApproval, onHandleToast }) {
const hasBeenActedOn = const hasBeenActedOn =
@@ -33,9 +32,7 @@ function WorkflowDenyButton({ isDetailView, workflowApproval, onHandleToast }) {
<> <>
<Button <Button
aria-label={ aria-label={
hasBeenActedOn hasBeenActedOn ? t`This workflow has already been acted on` : t`Deny`
? t`This workflow has already been ${getStatus(workflowApproval)}`
: t`Deny`
} }
ouiaId="workflow-deny-button" ouiaId="workflow-deny-button"
isDisabled={hasBeenActedOn} isDisabled={hasBeenActedOn}