Skip to content

armgit / memos

Public Imported from GitHub
0

Memos is an open-source, self-hosted note-taking app that brings your everyday thoughts together in a personal timeline. Your data stays yours, and you choose what to keep private or share.

fix(web): update time locale when language is changed

Steven8ec4c9ab63c8
diff --git a/web/src/components/MemoView.tsx b/web/src/components/MemoView.tsx
index 1d09cc143..c7573af16 100644
--- a/web/src/components/MemoView.tsx
+++ b/web/src/components/MemoView.tsx
@@ -7,6 +7,7 @@ import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/comp
import useAsyncEffect from "@/hooks/useAsyncEffect";
import useCurrentUser from "@/hooks/useCurrentUser";
import useNavigateTo from "@/hooks/useNavigateTo";
+import i18n from "@/i18n";
import { cn } from "@/lib/utils";
import { instanceStore, memoStore, userStore } from "@/store";
import { State } from "@/types/proto/api/v1/common";
@@ -211,9 +212,9 @@ const MemoView: React.FC<Props> = observer((props: Props) => {
};
const displayTime = isArchived ? (
- memo.displayTime?.toLocaleString()
+ memo.displayTime?.toLocaleString(i18n.language)
) : (
- <relative-time datetime={memo.displayTime?.toISOString()} format={relativeTimeFormat}></relative-time>
+ <relative-time datetime={memo.displayTime?.toISOString()} lang={i18n.language} format={relativeTimeFormat}></relative-time>
);
return showEditor ? (
diff --git a/web/src/components/StatisticsView/MonthNavigator.tsx b/web/src/components/StatisticsView/MonthNavigator.tsx
index 0533fd1ce..53a776ae8 100644
--- a/web/src/components/StatisticsView/MonthNavigator.tsx
+++ b/web/src/components/StatisticsView/MonthNavigator.tsx
@@ -1,9 +1,10 @@
import dayjs from "dayjs";
import { ChevronLeftIcon, ChevronRightIcon } from "lucide-react";
+import { observer } from "mobx-react-lite";
import i18n from "@/i18n";
import type { MonthNavigatorProps } from "@/types/statistics";
-export const MonthNavigator = ({ visibleMonth, onMonthChange }: MonthNavigatorProps) => {
+export const MonthNavigator = observer(({ visibleMonth, onMonthChange }: MonthNavigatorProps) => {
const currentMonth = dayjs(visibleMonth).toDate();
const handlePrevMonth = () => {
@@ -29,4 +30,4 @@ export const MonthNavigator = ({ visibleMonth, onMonthChange }: MonthNavigatorPr
</div>
</div>
);
-};
+});