Refactor: the promptRemove.confirmRelatedResource message needs to be refactored (backport #293) (#343)

* refactor: the promptRemove.confirmRelatedResource message needs to be refactored (#293)

* feat: change dialog wordings

Signed-off-by: Yi-Ya Chen <yiya.chen@suse.com>

* refactor: update protip wording

Co-authored-by: Jillian Maroket <67180770+jillian-maroket@users.noreply.github.com>
Signed-off-by: Yiya Chen <yiya.chen@suse.com>

---------

Signed-off-by: Yi-Ya Chen <yiya.chen@suse.com>
Signed-off-by: Yiya Chen <yiya.chen@suse.com>
Co-authored-by: Jillian Maroket <67180770+jillian-maroket@users.noreply.github.com>
(cherry picked from commit 258476876a24ee7c8dd22241ddde5c69f0527897)

# Conflicts:
#	pkg/harvester/dialog/ConfirmRelatedToRemoveDialog.vue

* Resolve conflict

Signed-off-by: Andy Lee <andy.lee@suse.com>

* Fix conflict

Signed-off-by: Andy Lee <andy.lee@suse.com>

---------

Signed-off-by: Andy Lee <andy.lee@suse.com>
Co-authored-by: Yiya Chen <yiya.chen@suse.com>
Co-authored-by: Andy Lee <andy.lee@suse.com>
This commit is contained in:
mergify[bot] 2025-06-20 10:42:33 +08:00 committed by GitHub
parent ef40cf5d8d
commit 4599159bff
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 10 additions and 7 deletions

View File

@ -128,7 +128,7 @@ export default {
}, },
protip() { protip() {
return this.t('promptRemove.protip', { alternateLabel }); return this.t('dialog.promptRemove.protip', { alternateLabel });
}, },
}, },
@ -164,7 +164,7 @@ export default {
> >
<template #title> <template #title>
<h4 class="text-default-text"> <h4 class="text-default-text">
{{ t('promptRemove.title') }} {{ t(title, { type }, true) }}
</h4> </h4>
</template> </template>

View File

@ -52,6 +52,11 @@ dialog:
message: "Are you sure you want to continue stop the {type} {names}?" message: "Are you sure you want to continue stop the {type} {names}?"
pause: pause:
message: "Are you sure you want to continue pause the {type} {names}?" message: "Are you sure you want to continue pause the {type} {names}?"
promptRemove:
title: "Delete {type}"
warningMessage: "Deleting the selected {type} permanently removes all resources on {thisOrThese} {type}. This action is irreversible. Do you want to continue?"
confirmName: "Type <b>{nameToMatch}</b> to delete the {type}:"
protip: "Tip: Hold the {alternateLabel} key while clicking Delete to bypass the confirmation step."
harvester: harvester:
branding: branding:

View File

@ -67,8 +67,7 @@ export default class HciNamespace extends namespace {
promptRemove(resources = this) { promptRemove(resources = this) {
this.$dispatch('promptModal', { this.$dispatch('promptModal', {
resources, resources,
warningMessageKey: 'promptRemove.confirmRelatedResource', component: 'ConfirmRelatedToRemoveDialog'
component: 'ConfirmRelatedToRemoveDialog'
}); });
} }

View File

@ -115,8 +115,7 @@ export default class HciNode extends HarvesterResource {
promptRemove(resources = this) { promptRemove(resources = this) {
this.$dispatch('promptModal', { this.$dispatch('promptModal', {
resources, resources,
warningMessageKey: 'promptRemove.confirmRelatedResource', component: 'ConfirmRelatedToRemoveDialog'
component: 'ConfirmRelatedToRemoveDialog'
}); });
} }