diff options
| -rw-r--r-- | locales/en-US.json | 16 | ||||
| -rw-r--r-- | locales/en.json | 16 | ||||
| -rw-r--r-- | locales/ja.json | 14 | ||||
| -rw-r--r-- | src/routes/event.ts | 14 | ||||
| -rw-r--r-- | src/util/validation.ts | 2 |
5 files changed, 31 insertions, 31 deletions
diff --git a/locales/en-US.json b/locales/en-US.json index a6ba2e6..c44c29f 100644 --- a/locales/en-US.json +++ b/locales/en-US.json @@ -38,14 +38,14 @@ "routes.addeventcommentsubject": "New comment in {{eventName}}", "routes.deleteeventsubject": "{{ eventName }} was deleted", "routes.event.datetimeformat": "{{thedate, intlDate}}", - "routes.event.descriptionchanged": "the event description changed", + "routes.event.descriptionchanged": "the event description changed {{ description }}", "routes.event.difftext": "This event was just updated with new information.", - "routes.event.editedsubject": "was just edited", - "routes.event.endtimechanged": "the end time changed to ", - "routes.event.locationchanged": "the location changed to", - "routes.event.namechanged": "the event name changed to", - "routes.event.starttimechanged": "the end time changed to", - "routes.event.timezonechanged": "the time zone changed to", + "routes.event.editedsubject": "{{ eventname }} was just edited", + "routes.event.endtimechanged": "the end time changed to {{ endtime }}", + "routes.event.locationchanged": "the location changed to {{ location }}", + "routes.event.namechanged": "the event name changed to {{ eventname }}", + "routes.event.starttimechanged": "the start time changed to {{ starttime }}", + "routes.event.timezonechanged": "the time zone changed to {{ timezone }}", "routes.magiclink-invalid": "This magic link is invalid or has expired. Please request a new one here.", "routes.magiclink.mailsubject": "Magic link to create an event", "routes.magiclink.provideemail": "Please provide an email address.", @@ -303,4 +303,4 @@ "views.publiceventlist.pastevents": "Past events", "views.publiceventlist.upcomingevents": "Upcoming events", "views.right": "Get it right!" -}
\ No newline at end of file +} diff --git a/locales/en.json b/locales/en.json index a6ba2e6..c44c29f 100644 --- a/locales/en.json +++ b/locales/en.json @@ -38,14 +38,14 @@ "routes.addeventcommentsubject": "New comment in {{eventName}}", "routes.deleteeventsubject": "{{ eventName }} was deleted", "routes.event.datetimeformat": "{{thedate, intlDate}}", - "routes.event.descriptionchanged": "the event description changed", + "routes.event.descriptionchanged": "the event description changed {{ description }}", "routes.event.difftext": "This event was just updated with new information.", - "routes.event.editedsubject": "was just edited", - "routes.event.endtimechanged": "the end time changed to ", - "routes.event.locationchanged": "the location changed to", - "routes.event.namechanged": "the event name changed to", - "routes.event.starttimechanged": "the end time changed to", - "routes.event.timezonechanged": "the time zone changed to", + "routes.event.editedsubject": "{{ eventname }} was just edited", + "routes.event.endtimechanged": "the end time changed to {{ endtime }}", + "routes.event.locationchanged": "the location changed to {{ location }}", + "routes.event.namechanged": "the event name changed to {{ eventname }}", + "routes.event.starttimechanged": "the start time changed to {{ starttime }}", + "routes.event.timezonechanged": "the time zone changed to {{ timezone }}", "routes.magiclink-invalid": "This magic link is invalid or has expired. Please request a new one here.", "routes.magiclink.mailsubject": "Magic link to create an event", "routes.magiclink.provideemail": "Please provide an email address.", @@ -303,4 +303,4 @@ "views.publiceventlist.pastevents": "Past events", "views.publiceventlist.upcomingevents": "Upcoming events", "views.right": "Get it right!" -}
\ No newline at end of file +} diff --git a/locales/ja.json b/locales/ja.json index eda49c9..148b92e 100644 --- a/locales/ja.json +++ b/locales/ja.json @@ -38,14 +38,14 @@ "routes.addeventcommentsubject": "{{ eventName }} にコメントがきました", "routes.deleteeventsubject": "{{ eventName }} は削除されました", "routes.event.datetimeformat": "{{thedate, long}}", - "routes.event.descriptionchanged": "イベントの説明が変更 : ", + "routes.event.descriptionchanged": "イベントの説明が変更 : {{ description }}", "routes.event.difftext": "このイベントの情報の変更点です。", - "routes.event.editedsubject": "に変更があります", - "routes.event.endtimechanged": "終了時間が変更 : ", - "routes.event.locationchanged": "場所が変更 : ", - "routes.event.namechanged": "イベント名が変更 : ", - "routes.event.starttimechanged": "終了日時が変更 : ", - "routes.event.timezonechanged": "タイムゾーンが変更 ; ", + "routes.event.editedsubject": "{{ eventname }} に変更がありました", + "routes.event.endtimechanged": "終了時間が変更 : {{ endtime }}", + "routes.event.locationchanged": "場所が変更 : {{ location }}", + "routes.event.namechanged": "イベント名が変更 : {{ eventname }}", + "routes.event.starttimechanged": "開始日時が変更 : {{ starttime }}", + "routes.event.timezonechanged": "タイムゾーンが変更 : {{ timezone }}", "routes.magiclink-invalid": "このマジックリンクは無効、または期限が切れています。再度リクエストしてください。", "routes.magiclink.mailsubject": "イベント作成の「マジックリンク」", "routes.magiclink.provideemail": "メールアドレスを入力してください。", 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", }); } |