External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-11 10:00:01 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12637 from AlexSCorey/12636-WorkflowApprovalTranslations

Browse Source 
Fixes lack of translation on workflow approval list item actions
This commit is contained in:
Alex Corey 2022-08-09 15:47:34 -04:00 committed by GitHub
commit 7bbc256ff1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 19 deletions
Show Stats 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
visible
tooltip={
hasBeenActedOn
? t`This workflow has already been ${status}`
: t`Approve`
hasBeenActedOn ? t`This has already been acted on` : t`Approve`
}
>
<WorkflowApprovalButton workflowApproval={workflowApproval} />
</ActionItem>
<ActionItem
visible
tooltip={
hasBeenActedOn
? t`This workflow has already been ${status}`
: t`Deny`
}
tooltip={hasBeenActedOn ? t`This has already been acted on` : t`Deny`}
>
<WorkflowDenyButton workflowApproval={workflowApproval} />
</ActionItem>
@ -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
`}

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 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`
}
>

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

@ -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';

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