potsda.mn/mobilizon
10
4
Fork 1
Code Issues 22 Pull requests 1 Projects Releases Wiki Activity

Merge branch 'fix-locale-datetime' into 'master'

Browse source 
Make sure the localized datetime follow the current MBZ locale

Closes #629

See merge request framasoft/mobilizon!848
This commit is contained in:
Thomas Citharel 2021-03-09 08:40:50 +00:00
parent 2b626d1620 6ccad5344c
commit 66af4e2edf
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
js/src/filters/datetime.ts
View file

@ -1,11 +1,12 @@
import { DateTimeFormatOptions } from "vue-i18n"; import { DateTimeFormatOptions } from "vue-i18n";
import { i18n } from "../utils/i18n";
function parseDateTime(value: string): Date { function parseDateTime(value: string): Date {
return new Date(value); return new Date(value);
} }
function formatDateString(value: string): string { function formatDateString(value: string): string {
return parseDateTime(value).toLocaleString(undefined, { return parseDateTime(value).toLocaleString(locale(), {
weekday: "long", weekday: "long",
year: "numeric", year: "numeric",
month: "long", month: "long",
@ -14,7 +15,7 @@ function formatDateString(value: string): string {
} }
function formatTimeString(value: string): string { function formatTimeString(value: string): string {
return parseDateTime(value).toLocaleTimeString(undefined, { return parseDateTime(value).toLocaleTimeString(locale(), {
hour: "numeric", hour: "numeric",
minute: "numeric", minute: "numeric",
}); });
@ -34,8 +35,10 @@ function formatDateTimeString(value: string, showTime = true): string {
options.hour = "numeric"; options.hour = "numeric";
options.minute = "numeric"; options.minute = "numeric";
} }
const format = new Intl.DateTimeFormat(undefined, options); const format = new Intl.DateTimeFormat(locale(), options);
return format.format(parseDateTime(value)); return format.format(parseDateTime(value));
} }
const locale = () => i18n.locale.replace("_", "-");
export { formatDateString, formatTimeString, formatDateTimeString }; export { formatDateString, formatTimeString, formatDateTimeString };