From ac9f335e59a6469e0d726c6ccaec3c9c3c5a87ac Mon Sep 17 00:00:00 2001 From: Kuchenpirat <24235032+Kuchenpirat@users.noreply.github.com> Date: Thu, 4 Jan 2024 11:44:04 +0000 Subject: [PATCH 1/3] update texts --- .../Domain/Recipe/RecipeOrganizerPage.vue | 17 +++++++++++++++-- frontend/lang/messages/en-US.json | 6 ++++-- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/frontend/components/Domain/Recipe/RecipeOrganizerPage.vue b/frontend/components/Domain/Recipe/RecipeOrganizerPage.vue index d724e4796e0d..7f3def84df29 100644 --- a/frontend/components/Domain/Recipe/RecipeOrganizerPage.vue +++ b/frontend/components/Domain/Recipe/RecipeOrganizerPage.vue @@ -5,12 +5,15 @@ - {{ $t("general.confirm-delete-generic-with-name", { name: deleteTarget.name }) }} + + {{ $t("general.confirm-delete-generic") }} + {{ deleteTarget.name }} + @@ -136,6 +139,15 @@ export default defineComponent({ const presets = useContextPresets(); + const translationKey = computed(() => { + const typeMap = { + "categories": "category.category", + "tags": "tag.tag", + "tools": "tool.tool" + }; + return typeMap[props.itemType] || ""; + }); + const deleteTarget = ref(null); const updateTarget = ref(null); @@ -223,6 +235,7 @@ export default defineComponent({ presets, itemsSorted, searchString, + translationKey, }; }, // Needed for useMeta diff --git a/frontend/lang/messages/en-US.json b/frontend/lang/messages/en-US.json index 5018821ad276..f5401ba22d04 100644 --- a/frontend/lang/messages/en-US.json +++ b/frontend/lang/messages/en-US.json @@ -789,7 +789,8 @@ "tags": "Tags", "untagged-count": "Untagged {count}", "create-a-tag": "Create a Tag", - "tag-name": "Tag Name" + "tag-name": "Tag Name", + "tag": "Tag" }, "tool": { "tools": "Tools", @@ -798,7 +799,8 @@ "tool-name": "Tool Name", "create-new-tool": "Create New Tool", "on-hand-checkbox-label": "Show as On Hand (Checked)", - "required-tools": "Required Tools" + "required-tools": "Required Tools", + "tool": "Tool" }, "user": { "admin": "Admin", From 71b3989eec52788c0c94c830d868df9840fdccd1 Mon Sep 17 00:00:00 2001 From: Kuchenpirat <24235032+Kuchenpirat@users.noreply.github.com> Date: Thu, 4 Jan 2024 12:00:21 +0000 Subject: [PATCH 2/3] fix manageData Label delete Prompt --- frontend/pages/group/data/labels.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frontend/pages/group/data/labels.vue b/frontend/pages/group/data/labels.vue index 71838dfd3d93..604135b05873 100644 --- a/frontend/pages/group/data/labels.vue +++ b/frontend/pages/group/data/labels.vue @@ -39,7 +39,9 @@ > {{ $t("general.confirm-delete-generic") }} - + + + From 6e8b84be80282a3574ec243b2cc0afeb7ed20b37 Mon Sep 17 00:00:00 2001 From: Kuchenpirat <24235032+Kuchenpirat@users.noreply.github.com> Date: Mon, 8 Jan 2024 10:45:37 +0100 Subject: [PATCH 3/3] include OrganizerType in delete prompt Co-authored-by: Elijah Mock <28277163+ekcom@users.noreply.github.com> --- frontend/components/Domain/Recipe/RecipeOrganizerPage.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/components/Domain/Recipe/RecipeOrganizerPage.vue b/frontend/components/Domain/Recipe/RecipeOrganizerPage.vue index 7f3def84df29..04fc10290d22 100644 --- a/frontend/components/Domain/Recipe/RecipeOrganizerPage.vue +++ b/frontend/components/Domain/Recipe/RecipeOrganizerPage.vue @@ -11,7 +11,7 @@ @confirm="deleteOne()" > - {{ $t("general.confirm-delete-generic") }} +{{ $t("general.confirm-delete-generic-with-name", { name: $t(translationKey) }) }} {{ deleteTarget.name }}
{{ deleteTarget.name }}
{{ $t("general.confirm-delete-generic-with-name", { name: $t(translationKey) }) }}