feat: support 12 and 24 hour formats
This commit is contained in:
parent
de6c9bb7eb
commit
eb49450756
3 changed files with 14 additions and 2 deletions
|
@ -46,7 +46,8 @@
|
||||||
<span class="message-date" :title="date.toString()">
|
<span class="message-date" :title="date.toString()">
|
||||||
<span v-if="getDayDifference(date, currentDate) === 1">Yesterday at</span>
|
<span v-if="getDayDifference(date, currentDate) === 1">Yesterday at</span>
|
||||||
<span v-else-if="getDayDifference(date, currentDate) > 1 ">{{ date.toLocaleDateString(undefined) }},</span>
|
<span v-else-if="getDayDifference(date, currentDate) > 1 ">{{ date.toLocaleDateString(undefined) }},</span>
|
||||||
{{ date.toLocaleTimeString(undefined, { timeStyle: "short" }) }}
|
|
||||||
|
{{ date.toLocaleTimeString(undefined, { hour12: props.format=="12", timeStyle: "short" }) }}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="message-text" v-html="sanitized" tabindex="0"></div>
|
<div class="message-text" v-html="sanitized" tabindex="0"></div>
|
||||||
|
|
|
@ -49,7 +49,7 @@ const me = await fetchWithApi("/me") as UserResponse;
|
||||||
const messageTimestamps = ref<Record<string, number>>({});
|
const messageTimestamps = ref<Record<string, number>>({});
|
||||||
const messagesType = ref<Record<string, "normal" | "grouped">>({});
|
const messagesType = ref<Record<string, "normal" | "grouped">>({});
|
||||||
const messageGroupingMaxDifference = useRuntimeConfig().public.messageGroupingMaxDifference
|
const messageGroupingMaxDifference = useRuntimeConfig().public.messageGroupingMaxDifference
|
||||||
const timeFormat = settingLoad("timeFormat") ?? "24"
|
const timeFormat = getPreferredTimeFormat()
|
||||||
|
|
||||||
const messagesRes: MessageResponse[] | undefined = await fetchWithApi(
|
const messagesRes: MessageResponse[] | undefined = await fetchWithApi(
|
||||||
`${props.channelUrl}/messages`,
|
`${props.channelUrl}/messages`,
|
||||||
|
|
11
utils/getPreferredTimeFormat.ts
Normal file
11
utils/getPreferredTimeFormat.ts
Normal file
|
@ -0,0 +1,11 @@
|
||||||
|
export default (): "12" | "24" => {
|
||||||
|
const format = settingLoad("timeFormat").timeFormat ?? "auto"
|
||||||
|
|
||||||
|
if (format == "12-hour") {
|
||||||
|
return "12"
|
||||||
|
} else if (format == "24-hour") {
|
||||||
|
return "24"
|
||||||
|
}
|
||||||
|
|
||||||
|
return "24"
|
||||||
|
}
|
Loading…
Add table
Add a link
Reference in a new issue