From 31c22bff95f8dee0cf45c4d4480e8352ea6f39d0 Mon Sep 17 00:00:00 2001 From: Camille Moussu <66134347+Eriikah@users.noreply.github.com> Date: Thu, 13 Nov 2025 10:43:06 +0100 Subject: [PATCH] [#248] added translation for event title when it's busy (#304) Co-authored-by: Camille Moussu --- src/components/Calendar/utils/calendarUtils.ts | 13 +++++++++++-- src/features/Events/EventDisplayPreview.tsx | 7 +++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/components/Calendar/utils/calendarUtils.ts b/src/components/Calendar/utils/calendarUtils.ts index 968843c..0de6426 100644 --- a/src/components/Calendar/utils/calendarUtils.ts +++ b/src/components/Calendar/utils/calendarUtils.ts @@ -54,6 +54,15 @@ export const checkIfCurrentWeekOrDay = (): boolean => { return !!nowIndicator; }; +export function formatEventChipTitle(e: CalendarEvent, t: Function) { + if (!e.title) { + return t("event.untitled"); + } + return e.title === "Busy" && e.class === "PRIVATE" + ? t("event.form.busy") + : e.title; +} + export const eventToFullCalendarFormat = ( filteredEvents: CalendarEvent[], filteredTempEvents: CalendarEvent[], @@ -66,14 +75,14 @@ export const eventToFullCalendarFormat = ( if (e.calId.split("/")[0] === userId) { return { ...e, - title: e.title ? e.title : t("event.untitled"), + title: formatEventChipTitle(e, t), colors: e.color, editable: true, }; } return { ...e, - title: e.title ? e.title : t("event.untitled"), + title: formatEventChipTitle(e, t), colors: e.color, editable: false, }; diff --git a/src/features/Events/EventDisplayPreview.tsx b/src/features/Events/EventDisplayPreview.tsx index 1091738..4790a57 100644 --- a/src/features/Events/EventDisplayPreview.tsx +++ b/src/features/Events/EventDisplayPreview.tsx @@ -29,7 +29,10 @@ import { useEffect, useState } from "react"; import { useAppDispatch, useAppSelector } from "../../app/hooks"; import { CalendarName } from "../../components/Calendar/CalendarName"; import { getTimezoneOffset } from "../../components/Calendar/TimezoneSelector"; -import { updateTempCalendar } from "../../components/Calendar/utils/calendarUtils"; +import { + formatEventChipTitle, + updateTempCalendar, +} from "../../components/Calendar/utils/calendarUtils"; import ResponsiveDialog from "../../components/Dialog/ResponsiveDialog"; import { EditModeDialog } from "../../components/Event/EditModeDialog"; import EventDuplication from "../../components/Event/EventDuplicate"; @@ -286,7 +289,7 @@ export default function EventPreviewModal({ }} gutterBottom > - {event.title ? event.title : t("event.untitled")} + {formatEventChipTitle(event, t)} {event.transp === "TRANSPARENT" && (