diff --git a/i18n/en_US.yaml b/i18n/en_US.yaml index 7ebbf9ead..6856645ed 100644 --- a/i18n/en_US.yaml +++ b/i18n/en_US.yaml @@ -1132,6 +1132,7 @@ ui: unsuspend: Unsuspend close: Close reopen: Reopen + ok: OK search: title: Search Results keywords: Keywords diff --git a/ui/src/components/Modal/Modal.tsx b/ui/src/components/Modal/Modal.tsx index 16517fcba..4efe906e6 100644 --- a/ui/src/components/Modal/Modal.tsx +++ b/ui/src/components/Modal/Modal.tsx @@ -71,7 +71,9 @@ const Index: FC = ({ }} id="ok_button" disabled={confirmBtnDisabled}> - {confirmText || t('btns.confirm')} + {confirmText === 'OK' + ? t('btns.ok') + : confirmText || t('btns.confirm')} )} diff --git a/ui/src/utils/request.ts b/ui/src/utils/request.ts index 7132099d8..ad57946f4 100644 --- a/ui/src/utils/request.ts +++ b/ui/src/utils/request.ts @@ -117,6 +117,8 @@ class Request { // default error msg will show modal Modal.confirm({ content: msg, + showCancel: false, + confirmText: 'OK', }); return Promise.reject(false); }