From d6470e371449240789905fa24b72136d0aa04ad1 Mon Sep 17 00:00:00 2001 From: Sheldan <5037282+Sheldan@users.noreply.github.com> Date: Thu, 30 Nov 2023 19:55:47 +0100 Subject: [PATCH] [SIS-xxx] changing meetup time display to include week day name --- .../cancelMeetup/meetup_cancel_notification_embed_en_US.ftl | 2 +- .../changeMeetupTime_confirmation_embed_en_US.ftl | 2 +- .../changeMeetupTime_notification_embed_en_US.ftl | 4 ++-- .../createMeetup/createMeetup_confirmation_embed_en_US.ftl | 2 +- .../commands/listMeetups/listMeetups_response_embed_en_US.ftl | 2 +- .../resources/en_US/general/meetup_display_embed_en_US.ftl | 2 +- .../general/meetup_reminder_notification_embed_en_US.ftl | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/templates/sissi-templates/module-templates/meetup-templates/src/main/resources/en_US/commands/cancelMeetup/meetup_cancel_notification_embed_en_US.ftl b/templates/sissi-templates/module-templates/meetup-templates/src/main/resources/en_US/commands/cancelMeetup/meetup_cancel_notification_embed_en_US.ftl index d7547efc..ec057154 100644 --- a/templates/sissi-templates/module-templates/meetup-templates/src/main/resources/en_US/commands/cancelMeetup/meetup_cancel_notification_embed_en_US.ftl +++ b/templates/sissi-templates/module-templates/meetup-templates/src/main/resources/en_US/commands/cancelMeetup/meetup_cancel_notification_embed_en_US.ftl @@ -3,7 +3,7 @@ "embeds": [ { <#include "abstracto_color">, - <#assign time><@format_instant_date_time instant=meetupTime/> + <#assign time><@format_instant_long_date_time instant=meetupTime/> <#assign topicText>${topic?json_string} "description": "<#include "meetup_cancel_notification_description">" } diff --git a/templates/sissi-templates/module-templates/meetup-templates/src/main/resources/en_US/commands/changeMeetupTime/changeMeetupTime_confirmation_embed_en_US.ftl b/templates/sissi-templates/module-templates/meetup-templates/src/main/resources/en_US/commands/changeMeetupTime/changeMeetupTime_confirmation_embed_en_US.ftl index 0fd68d02..e5a370b9 100644 --- a/templates/sissi-templates/module-templates/meetup-templates/src/main/resources/en_US/commands/changeMeetupTime/changeMeetupTime_confirmation_embed_en_US.ftl +++ b/templates/sissi-templates/module-templates/meetup-templates/src/main/resources/en_US/commands/changeMeetupTime/changeMeetupTime_confirmation_embed_en_US.ftl @@ -6,7 +6,7 @@ "title": { "title": "${topic?json_string}" }, - "description": "<@format_instant_date_time instant=meetupTime/> + "description": "<@format_instant_long_date_time instant=meetupTime/> ${description?json_string}" } ], diff --git a/templates/sissi-templates/module-templates/meetup-templates/src/main/resources/en_US/commands/changeMeetupTime/changeMeetupTime_notification_embed_en_US.ftl b/templates/sissi-templates/module-templates/meetup-templates/src/main/resources/en_US/commands/changeMeetupTime/changeMeetupTime_notification_embed_en_US.ftl index 2353a078..c95adc42 100644 --- a/templates/sissi-templates/module-templates/meetup-templates/src/main/resources/en_US/commands/changeMeetupTime/changeMeetupTime_notification_embed_en_US.ftl +++ b/templates/sissi-templates/module-templates/meetup-templates/src/main/resources/en_US/commands/changeMeetupTime/changeMeetupTime_notification_embed_en_US.ftl @@ -4,8 +4,8 @@ { <#include "abstracto_color">, <#assign topicText=meetupTopic> - <#assign oldTime><@format_instant_date_time instant=oldDate/> - <#assign newTime><@format_instant_date_time instant=newDate/> + <#assign oldTime><@format_instant_long_date_time instant=oldDate/> + <#assign newTime><@format_instant_long_date_time instant=newDate/> <#assign messageLink=meetupMessage.jumpUrl> "description": "<@safe_include "changeMeetupTime_notification_text"/>" } diff --git a/templates/sissi-templates/module-templates/meetup-templates/src/main/resources/en_US/commands/createMeetup/createMeetup_confirmation_embed_en_US.ftl b/templates/sissi-templates/module-templates/meetup-templates/src/main/resources/en_US/commands/createMeetup/createMeetup_confirmation_embed_en_US.ftl index 91a77064..c55cda11 100644 --- a/templates/sissi-templates/module-templates/meetup-templates/src/main/resources/en_US/commands/createMeetup/createMeetup_confirmation_embed_en_US.ftl +++ b/templates/sissi-templates/module-templates/meetup-templates/src/main/resources/en_US/commands/createMeetup/createMeetup_confirmation_embed_en_US.ftl @@ -6,7 +6,7 @@ "title": { "title": "${topic?json_string}" }, - "description": "<@format_instant_date_time instant=meetupTime/> + "description": "<@format_instant_long_date_time instant=meetupTime/> ${description?json_string}" <#if location?? && location != "%22%22">, "fields": [ diff --git a/templates/sissi-templates/module-templates/meetup-templates/src/main/resources/en_US/commands/listMeetups/listMeetups_response_embed_en_US.ftl b/templates/sissi-templates/module-templates/meetup-templates/src/main/resources/en_US/commands/listMeetups/listMeetups_response_embed_en_US.ftl index 3dee56b7..78c2e9a6 100644 --- a/templates/sissi-templates/module-templates/meetup-templates/src/main/resources/en_US/commands/listMeetups/listMeetups_response_embed_en_US.ftl +++ b/templates/sissi-templates/module-templates/meetup-templates/src/main/resources/en_US/commands/listMeetups/listMeetups_response_embed_en_US.ftl @@ -3,7 +3,7 @@ "embeds": [ { <#include "abstracto_color">, - "description": "<#list meetups as meetup><#assign meetup=meetup><#assign topic=meetup.topic><#assign time><@format_instant_date_time instant=meetup.meetupTime/><#assign timeRelative><@format_instant_relative instant=meetup.meetupTime/><#assign link=meetup.meetupMessage.jumpUrl><#include "meetup_list_meetup_display"> + "description": "<#list meetups as meetup><#assign meetup=meetup><#assign topic=meetup.topic><#assign time><@format_instant_long_date_time instant=meetup.meetupTime/><#assign timeRelative><@format_instant_relative instant=meetup.meetupTime/><#assign link=meetup.meetupMessage.jumpUrl><#include "meetup_list_meetup_display"> <#else><#include "meetup_list_no_meetups">" } ] diff --git a/templates/sissi-templates/module-templates/meetup-templates/src/main/resources/en_US/general/meetup_display_embed_en_US.ftl b/templates/sissi-templates/module-templates/meetup-templates/src/main/resources/en_US/general/meetup_display_embed_en_US.ftl index c43dbb29..75e247c3 100644 --- a/templates/sissi-templates/module-templates/meetup-templates/src/main/resources/en_US/general/meetup_display_embed_en_US.ftl +++ b/templates/sissi-templates/module-templates/meetup-templates/src/main/resources/en_US/general/meetup_display_embed_en_US.ftl @@ -8,7 +8,7 @@ "title": { "title": "${topic?json_string} - <@safe_include "meetup_message_id_display"/>" }, - <#assign time><@format_instant_date_time instant=meetupTime/> + <#assign time><@format_instant_long_date_time instant=meetupTime/> <#assign timeRelative><@format_instant_relative instant=meetupTime/> <#assign organizerText>${organizer.memberMention} <#assign meetupId=meetupId/> diff --git a/templates/sissi-templates/module-templates/meetup-templates/src/main/resources/en_US/general/meetup_reminder_notification_embed_en_US.ftl b/templates/sissi-templates/module-templates/meetup-templates/src/main/resources/en_US/general/meetup_reminder_notification_embed_en_US.ftl index f7a24bd0..e9918fc0 100644 --- a/templates/sissi-templates/module-templates/meetup-templates/src/main/resources/en_US/general/meetup_reminder_notification_embed_en_US.ftl +++ b/templates/sissi-templates/module-templates/meetup-templates/src/main/resources/en_US/general/meetup_reminder_notification_embed_en_US.ftl @@ -3,7 +3,7 @@ "embeds": [ { <#include "abstracto_color">, - <#assign time><@format_instant_date_time instant=meetupTime/> + <#assign time><@format_instant_long_date_time instant=meetupTime/> <#assign topicText>${topic?json_string} "description": "<#include "meetup_reminder_notification_description">" }