Fix i18n issue for submit label in delete resource modal

openshift · Jul 6, 2021 · 838b972 · 838b972
1 parent 8135af4
commit 838b972
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/frontend/packages/console-shared/src/components/modals/DeleteResourceModal.tsx b/frontend/packages/console-shared/src/components/modals/DeleteResourceModal.tsx
@@ -16,7 +16,8 @@ import { YellowExclamationTriangleIcon } from '../status';
 type DeleteResourceModalProps = {
   resourceName: string;
   resourceType: string;
-  actionLabelKey?: string;
+  actionLabel?: string; // Used to send translated strings as action label.
+  actionLabelKey?: string; // Used to send translation key for action label.
   redirect?: string;
   onSubmit: (values: FormikValues) => Promise<K8sResourceKind[]>;
   cancel?: () => void;
@@ -32,6 +33,7 @@ const DeleteResourceForm: React.FC<FormikProps<FormikValues> & DeleteResourceMod
   handleSubmit,
   resourceName,
   resourceType,
+  actionLabel,
   // t('console-shared~Delete')
   actionLabelKey = 'console-shared~Delete',
   isSubmitting,
@@ -41,7 +43,7 @@ const DeleteResourceForm: React.FC<FormikProps<FormikValues> & DeleteResourceMod
 }) => {
   const { t } = useTranslation();
   const isValid = values.resourceName === resourceName;
-  const submitLabel = t(actionLabelKey);
+  const submitLabel = actionLabel || t(actionLabelKey);
   return (
     <form onSubmit={handleSubmit} className="modal-content modal-content--no-inner-scroll">
       <ModalTitle>

diff --git a/frontend/packages/helm-plugin/src/actions/creators.ts b/frontend/packages/helm-plugin/src/actions/creators.ts
@@ -15,7 +15,7 @@ export const getHelmDeleteAction = (
       blocking: true,
       resourceName: releaseName,
       resourceType: 'Helm Release',
-      actionLabelKey: t('helm-plugin~Uninstall'),
+      actionLabel: t('helm-plugin~Uninstall'),
       redirect,
       onSubmit: () => {
         return coFetchJSON.delete(