From 018870a06324b8ebc19c0d5ab3a209f872768306 Mon Sep 17 00:00:00 2001
From: INOUE Daisuke <inoue.daisuke@gmail.com>
Date: Mon, 28 Apr 2025 20:53:27 +0900
Subject: Fix some i18next call, which concatted translation and some string
 without i18next parameter

---
 src/routes/event.ts    | 14 +++++++-------
 src/util/validation.ts |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/routes/event.ts b/src/routes/event.ts
index ca333c5..8972169 100644
--- a/src/routes/event.ts
+++ b/src/routes/event.ts
@@ -414,10 +414,10 @@ router.put(
                 "<p>" + i18next.t("routes.event.difftext") + "</p><ul>";
             let displayDate;
             if (event.name !== updatedEvent.name) {
-                diffText += `<li>` + i18next.t("routes.event.namechanged") + updatedEvent.name + `</li>`;
+                diffText += `<li>` + i18next.t("routes.event.namechanged", { eventname: updatedEvent.name} ) + `</li>`;
             }
             if (event.location !== updatedEvent.location) {
-                diffText += `<li>` + i18next.t("routes.event.locationchanged") + updatedEvent.location + `</li>`;
+                diffText += `<li>` + i18next.t("routes.event.locationchanged", { location: updatedEvent.location} ) + `</li>`;
             }
             if (
                 event.start.toISOString() !== updatedEvent.start.toISOString()
@@ -425,19 +425,19 @@ router.put(
                 displayDate = moment
                     .tz(updatedEvent.start, updatedEvent.timezone)
                     .format(i18next.t("common.datetimeformat"));
-                diffText += `<li>` + i18next.t("routes.event.starttimechanged") + displayDate + `</li>`;
+                diffText += `<li>` + i18next.t("routes.event.starttimechanged", { starttime: displayDate }) + `</li>`;
             }
             if (event.end.toISOString() !== updatedEvent.end.toISOString()) {
                 displayDate = moment
                     .tz(updatedEvent.end, updatedEvent.timezone)
                     .format(i18next.t("common.datetimeformat"));
-                diffText += `<li>` + i18next.t("routes.event.endtimechanged") + displayDate + `</li>`;
+                diffText += `<li>` + i18next.t("routes.event.endtimechanged", { endtime: displayDate }) + `</li>`;
             }
             if (event.timezone !== updatedEvent.timezone) {
-                diffText += `<li>` + i18next.t("routes.event.timezonechanged") + updatedEvent.timezone + `</li>`;
+                diffText += `<li>` + i18next.t("routes.event.timezonechanged", { timezone: updatedEvent.timezone }) + `</li>`;
             }
             if (event.description !== updatedEvent.description) {
-                diffText += `<li>` + i18next.t("routes.event.descriptionchanged") + `</li>`;
+                diffText += `<li>` + i18next.t("routes.event.descriptionchanged", { description: updatedEvent.description }) + `</li>`;
             }
             diffText += `</ul>`;
             const updatedEventObject = await Event.findOneAndUpdate(
@@ -502,7 +502,7 @@ router.put(
                     sendEmailFromTemplate(
                         config.general.email,
                         attendeeEmails.join(","),
-                        `${event.name} ` + i18next.t("routes.event.editedsubject"),
+                        i18next.t("routes.event.editedsubject", { eventname: event.name}),
                         "editEvent",
                         {
                             diffText,
diff --git a/src/util/validation.ts b/src/util/validation.ts
index 4ead7df..ccfc8d5 100644
--- a/src/util/validation.ts
+++ b/src/util/validation.ts
@@ -131,7 +131,7 @@ export const validateEventData = (
     const errors: Error[] = [];
     if (!validatedData.eventName) {
         errors.push({
-            message: i18next.t('validation.eventdata.eventname'),
+            message: i18next.t('util.validation.eventdata.eventname'),
             field: "eventName",
         });
     }
-- 
cgit v1.2.3