Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
llaoj committed Dec 25, 2024
2 parents 5af5f7f + 698bfd8 commit fdd87bc
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 6 deletions.
2 changes: 0 additions & 2 deletions frontend/app/[locale]/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,12 @@ import SyncClipboard from "@/components/sync-clipboard";
import Notice from "@/components/notice";
import Footer from "@/components/footer";
import { NextIntlClientProvider, useMessages } from "next-intl";
import moment from "moment/min/moment-with-locales";

export default function Home({
params: { locale },
}: {
params: { locale: string };
}) {
moment.locale(locale == "zh" ? "zh-cn" : "en");
const messages = useMessages();
return (
<div className="min-h-screen flex flex-col items-center justify-between mx-auto max-w-5xl">
Expand Down
4 changes: 4 additions & 0 deletions frontend/components/history-item.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import { Log, LogLevel } from "@/lib/log";
import { clipboardWriteBlob, clipboardWriteBlobPromise } from "@/lib/clipboard";
import { browserName } from "react-device-detect";
import { FileInfo } from "@/lib/clipboard";
import { useLocale } from "next-intl";

export default function HistoryItem({
item,
Expand All @@ -22,6 +23,9 @@ export default function HistoryItem({
addLog: (log: Log) => void;
updateFileLink: (fileInfo: FileInfo) => void;
}) {
const locale = useLocale();
moment.locale(locale == "zh" ? "zh-cn" : "en");

const t = useTranslations("SyncClipboard");
const ulRef = useRef<HTMLUListElement>(null);

Expand Down
4 changes: 2 additions & 2 deletions frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion frontend/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "gcopy",
"version": "1.4.5",
"version": "1.4.6",
"private": true,
"scripts": {
"dev": "next dev -p 3375 --experimental-https",
Expand Down
2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v1.4.5
v1.4.6

0 comments on commit fdd87bc

Please sign in to comment.