Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
llaoj committed May 16, 2024
2 parents 9845968 + 0172cad commit cb6fd5a
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 14 deletions.
8 changes: 4 additions & 4 deletions frontend/components/sync-clipboard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export default function SyncClipboard() {
let initLogs = [
{
level: Level.Warn,
message: t("logs.clickToSync"),
message: t("logs.pressToSync"),
},
];
const recommendedBrowsers = [
Expand Down Expand Up @@ -135,8 +135,8 @@ export default function SyncClipboard() {

if (browserName.includes("Safari")) {
setStatus("interrupted-r");
addLog(t("logs.clickAgain"), Level.Warn);
addLog(t("logs.clickPaste"), Level.Warn);
addLog(t("logs.pressAgain"), Level.Warn);
addLog(t("logs.pressPaste"), Level.Warn);
return;
}

Expand Down Expand Up @@ -176,7 +176,7 @@ export default function SyncClipboard() {
blob: blob,
});
setStatus("interrupted-w");
addLog(t("logs.clickAgain"), Level.Warn);
addLog(t("logs.pressAgain"), Level.Warn);
return;
}

Expand Down
6 changes: 3 additions & 3 deletions frontend/messages/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,16 +52,16 @@
"fileInputText": "Choose a file"
},
"logs": {
"clickToSync": "Click the button to sync clipboard 👉",
"pressToSync": "Press the button to sync clipboard 👉",
"fetching": "Fetching...",
"upToDate": "Already up to date.",
"readSuccess": "Read data from the clipboard successfully.",
"writeSuccess": "Written data to the clipboard successfully.",
"autoDownload": "File download should start shortly. if not, please click the file link below.",
"denyRead": "Not allowed to read clipboard!",
"fileTooLarge": "Sorry, the file cannot exceed 10mb!",
"clickAgain": "Click again due to browser security policies 👉",
"clickPaste": "If the \"Paste\" appears on the page, click it to allow reading the clipboard.",
"pressAgain": "Press again due to browser security policies 👉",
"pressPaste": "If the \"Paste\" appears, press it to allow reading the clipboard.",
"unchanged": "Clipboard unchanged.",
"uploading": "Uploading...",
"uploaded": "Uploaded {type}({index}).",
Expand Down
6 changes: 3 additions & 3 deletions frontend/messages/zh.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,16 +52,16 @@
"fileInputText": "选择一个文件"
},
"logs": {
"clickToSync": "点击按钮同步剪切板 👉",
"pressToSync": "按下按钮同步剪切板 👉",
"fetching": "正在获取...",
"upToDate": "已经是最新.",
"readSuccess": "成功读取剪切板.",
"writeSuccess": "数据成功写入剪切板.",
"autoDownload": "文件会很快自动下载. 如果没有, 点击下面的文件链接.",
"denyRead": "不允许读取剪切板!",
"fileTooLarge": "对不起, 文件大小不能超过10mb!",
"clickAgain": "因为浏览器安全策略, 请再次点击 👉",
"clickPaste": "如果页面出现\"粘贴\", 点击它以允许读取剪切板.",
"pressAgain": "因为浏览器安全策略, 请再次按下 👉",
"pressPaste": "如果出现\"粘贴\"按钮, 按下它以允许读取剪切板.",
"unchanged": "剪切板没有改变.",
"uploading": "正在上传...",
"uploaded": "已上传 {type}({index}).",
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.2.15",
"version": "1.2.16",
"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.2.15
v1.2.16

0 comments on commit cb6fd5a

Please sign in to comment.