diff --git a/client/components/Message.vue b/client/components/Message.vue index 1693b68f..20aef6f5 100644 --- a/client/components/Message.vue +++ b/client/components/Message.vue @@ -100,12 +100,19 @@ export default { isPreviousSource: Boolean, }, computed: { - messageTime() { - const format = this.$store.state.settings.showSeconds - ? constants.timeFormats.msgWithSeconds - : constants.timeFormats.msgDefault; + timeFormat() { + let format; - return dayjs(this.message.time).format(format); + if (this.$store.state.settings.use12hClock) { + format = this.$store.state.settings.showSeconds ? "msg12hWithSeconds" : "msg12h"; + } else { + format = this.$store.state.settings.showSeconds ? "msgWithSeconds" : "msgDefault"; + } + + return constants.timeFormats[format]; + }, + messageTime() { + return dayjs(this.message.time).format(this.timeFormat); }, messageTimeLocale() { return localetime(this.message.time); diff --git a/client/components/Windows/Settings.vue b/client/components/Windows/Settings.vue index d07ac25a..c609e8d3 100644 --- a/client/components/Windows/Settings.vue +++ b/client/components/Windows/Settings.vue @@ -88,6 +88,16 @@ Show seconds in timestamp +