Merge pull request #8652 from glekner/fix-1942858

Bug 1942858: [RFE]Confusing detach volume UX
openshift · Apr 14, 2021 · 0b315d1 · 0b315d1
2 parents 134f106 + 2777c16
commit 0b315d1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/frontend/packages/kubevirt-plugin/locales/en/kubevirt-plugin.json b/frontend/packages/kubevirt-plugin/locales/en/kubevirt-plugin.json
@@ -409,10 +409,11 @@
   "new VM name": "new VM name",
   "Start virtual machine on clone": "Start virtual machine on clone",
   "Configuration": "Configuration",
-  "Delete {{diskName}} disk": "Delete {{diskName}} disk",
-  "Are you sure you want to delete <1>{{diskName}}</1> disk?": "Are you sure you want to delete <1>{{diskName}}</1> disk?",
+  "Detach {{diskName}} disk": "Detach {{diskName}} disk",
+  "Are you sure you want to detach <1>{{diskName}}</1> disk?": "Are you sure you want to detach <1>{{diskName}}</1> disk?",
   "Delete {{ownedResourceName}} {{ownedResourceLabel}} and PVC": "Delete {{ownedResourceName}} {{ownedResourceLabel}} and PVC",
   "Delete {{ownedResourceName}} {{ownedResourceLabel}}": "Delete {{ownedResourceName}} {{ownedResourceLabel}}",
+  "Detach": "Detach",
   "Delete {{nicName}} NIC": "Delete {{nicName}} NIC",
   "Are you sure you want to delete <1>{{nicName}}</1> network interface?": "Are you sure you want to delete <1>{{nicName}}</1> network interface?",
   "Delete source": "Delete source",

diff --git a/...nd/packages/kubevirt-plugin/src/components/modals/delete-disk-modal/delete-disk-modal.tsx b/...nd/packages/kubevirt-plugin/src/components/modals/delete-disk-modal/delete-disk-modal.tsx
@@ -71,11 +71,11 @@ export const DeleteDiskModal = withHandlePromise((props: DeleteDiskModalProps) =
     <form onSubmit={submit} className="modal-content">
       <ModalTitle>
         <YellowExclamationTriangleIcon className="co-icon-space-r" />{' '}
-        {t('kubevirt-plugin~Delete {{diskName}} disk', { diskName })}
+        {t('kubevirt-plugin~Detach {{diskName}} disk', { diskName })}
       </ModalTitle>
       <ModalBody>
         <Trans t={t} ns="kubevirt-plugin">
-          Are you sure you want to delete <strong className="co-break-word">{{ diskName }}</strong>{' '}
+          Are you sure you want to detach <strong className="co-break-word">{{ diskName }}</strong>{' '}
           disk?
         </Trans>
         {ownedResource && (
@@ -103,7 +103,7 @@ export const DeleteDiskModal = withHandlePromise((props: DeleteDiskModalProps) =
         errorMessage={errorMessage}
         submitDisabled={isInProgress}
         inProgress={isInProgress}
-        submitText={t('kubevirt-plugin~Delete')}
+        submitText={t('kubevirt-plugin~Detach')}
         submitDanger
         cancel={cancel}
       />