Merge branch 'main' into guild-settings

2025-07-13 02:26:14 +00:00 · 2025-07-13 02:26:14 +00:00 · b2eb80a15f
commit b2eb80a15f
parent 6cec8e92b3 ff4e792fbb
1 changed files with 1 additions and 1 deletions
--- a/components/Message.vue
+++ b/components/Message.vue
@ -58,7 +58,7 @@
 			:data-message-id="props.messageId" :editing.sync="props.editing" :replying-to.sync="props.replyingTo">
 		<div class="left-column">
 			<span :class="{ 'invisible': dateHidden }" class="message-date side-message-date" :title="date.toString()">
-				{{ date.toLocaleTimeString(undefined, { timeStyle: "short" }) }}
+				{{ date.toLocaleTimeString(undefined, { hour12: props.format == "12", timeStyle: "short" }) }}
 			</span>
 		</div>
 		<div class="message-data">