chaos/VaultUI
1
0
Fork 0
Code Issues Activity

Remove pageState in formatDistance.ts.

Browse source
This commit is contained in:
Kitteh 2021-05-15 10:58:54 +01:00
parent 89bedc8be5
commit 4e390d3e96
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/formatDistance.ts
View file

@ -1,8 +1,7 @@
import { de, enGB, fr, it, nl, ru } from "date-fns/locale"; import { de, enGB, fr, it, nl, ru } from "date-fns/locale";
import { formatDistance as formatDistanceReal } from "date-fns"; import { formatDistance as formatDistanceReal } from "date-fns";
import { pageState } from "./globalPageState";
function getLocale(): Locale { function getLocale(language: string): Locale {
return { return {
en: enGB, en: enGB,
fr: fr, fr: fr,
@ -10,9 +9,9 @@ function getLocale(): Locale {
ru: ru, ru: ru,
de: de, de: de,
it: it, it: it,
}[pageState.language]; }[language];
} }
export function formatDistance(d1: Date, d2: Date): string { export function formatDistance(d1: Date, d2: Date, language: string): string {
return formatDistanceReal(d1, d2, { locale: getLocale() }); return formatDistanceReal(d1, d2, { locale: getLocale(language) });
} }

2
src/main.ts
View file

@ -118,7 +118,7 @@ document.addEventListener(
interpolation: { interpolation: {
format: function (value: unknown, format, _): string { format: function (value: unknown, format, _): string {
if (format === "until_date" && value instanceof Date) if (format === "until_date" && value instanceof Date)
return formatDistance(new Date(), new Date(value)); return formatDistance(new Date(), new Date(value), pageState.language);
return value as string; return value as string;
}, },
}, },