From 1398250e581451181d643c3912a0bca374cf231a Mon Sep 17 00:00:00 2001 From: yassinedorbozgithub Date: Tue, 4 Feb 2025 14:46:53 +0100 Subject: [PATCH] fix(frontend): include minor changes --- frontend/public/locales/en/translation.json | 6 +++--- frontend/public/locales/fr/translation.json | 5 +++-- .../dialogs/confirm/ConfirmDialogBody.tsx | 14 +++++++------- .../src/components/categories/CategoryForm.tsx | 1 + 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/frontend/public/locales/en/translation.json b/frontend/public/locales/en/translation.json index f090d8af..5d2a42a6 100644 --- a/frontend/public/locales/en/translation.json +++ b/frontend/public/locales/en/translation.json @@ -43,9 +43,9 @@ "account_update_success": "Account has been updated successfully", "account_disabled": "Your account has been either disabled or is pending confirmation.", "success_invitation_sent": "Invitation to join has been successfully sent.", - "item_delete_confirm": "Are you sure you want to delete this {{0}} item?", - "items_delete_confirm": "Are you sure you want to delete those {{0}} selected items?", - "selected": "selected", + "item_delete_confirm": "Are you sure you want to delete this item?", + "item_selected_delete_confirm": "Are you sure you want to delete this selected item?", + "items_selected_delete_confirm": "Are you sure you want to delete those {{0}} selected items?", "item_delete_success": "Item has been deleted successfully", "success_save": "Changes has been saved!", "no_result_found": "No result found", diff --git a/frontend/public/locales/fr/translation.json b/frontend/public/locales/fr/translation.json index 7378a7f1..741e1168 100644 --- a/frontend/public/locales/fr/translation.json +++ b/frontend/public/locales/fr/translation.json @@ -43,8 +43,9 @@ "account_update_success": "Le compte a été mis à jour avec succès", "account_disabled": "Votre compte a été désactivé ou est en attente de confirmation.", "success_invitation_sent": "L'invitation a été envoyée avec succès.", - "item_delete_confirm": "Êtes-vous sûr de bien vouloir supprimer cet élément {{0}}?", - "items_delete_confirm": "Êtes-vous sûr de bien vouloir supprimer ces {{0}} éléments sélectionnés?", + "item_delete_confirm": "Êtes-vous sûr de bien vouloir supprimer cet élément?", + "item_selected_delete_confirm": "Êtes-vous sûr de bien vouloir supprimer cet élément sélectionné?", + "items_selected_delete_confirm": "Êtes-vous sûr de bien vouloir supprimer ces {{0}} éléments sélectionnés?", "item_delete_success": "L'élément a été supprimé avec succès", "success_save": "Les modifications ont été enregistrées!", "no_result_found": "Aucun résultat trouvé", diff --git a/frontend/src/app-components/dialogs/confirm/ConfirmDialogBody.tsx b/frontend/src/app-components/dialogs/confirm/ConfirmDialogBody.tsx index cd1a6442..fb7a353b 100644 --- a/frontend/src/app-components/dialogs/confirm/ConfirmDialogBody.tsx +++ b/frontend/src/app-components/dialogs/confirm/ConfirmDialogBody.tsx @@ -20,13 +20,13 @@ export const ConfirmDialogBody = ({ }) => { const { t } = useTranslate(); const dialogBodyText = - itemsNumber === 1 - ? t("message.item_delete_confirm", { - "0": mode === "click" ? "" : t("message.selected"), - }) - : t("message.items_delete_confirm", { - "0": itemsNumber.toString(), - }); + mode === "selection" + ? itemsNumber === 1 + ? t("message.item_selected_delete_confirm") + : t("message.items_selected_delete_confirm", { + "0": itemsNumber.toString(), + }) + : t("message.item_delete_confirm"); return ( diff --git a/frontend/src/components/categories/CategoryForm.tsx b/frontend/src/components/categories/CategoryForm.tsx index 866e5cff..108f6d4f 100644 --- a/frontend/src/components/categories/CategoryForm.tsx +++ b/frontend/src/components/categories/CategoryForm.tsx @@ -83,6 +83,7 @@ export const CategoryForm: FC> = ({ label={t("placeholder.label")} error={!!errors.label} {...register("label", validationRules.label)} + required autoFocus helperText={errors.label ? errors.label.message : null} />