diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index ae2f0035c..ec93e965c 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -1,5 +1,7 @@ { - "confirmDeleteTip": "确定删除 ${x} 吗?
删除后可在 [数据历史] 中恢复,按 [设置 - 编辑器 - 历史保留天数] 保留 ${y} 天", + "andSubFile": "确定删除 ${x} 及其 ${y} 个子文档吗?", + "confirmDeleteTip": "确定删除 ${x} 吗?", + "rollbackTip": "删除后可在 [数据历史] 中恢复,按 [设置 - 编辑器 - 历史保留天数] 保留 ${x} 天", "newView": "添加视图", "newCol": "添加列", "newRow": "添加条目", @@ -686,7 +688,6 @@ "customEmoji": "添加自定义表情", "customEmojiTip": "打开 Emoji 文件夹 放入图片后并点击刷新按钮", "recentEmoji": "常用表情", - "andSubFile": "及其 x 个子文档", "changeIcon": "修改图标", "addIcon": "添加图标", "includeSubFile": "\n包含 x 个子文档", diff --git a/app/src/editor/deleteFile.ts b/app/src/editor/deleteFile.ts index 1832cc5ff..a00ee4ca5 100644 --- a/app/src/editor/deleteFile.ts +++ b/app/src/editor/deleteFile.ts @@ -18,9 +18,13 @@ export const deleteFile = (notebookId: string, pathString: string) => { id: getDisplayName(pathString, true, true) }, (response) => { const fileName = escapeHtml(response.data.name); - let tip = `${window.siyuan.languages.confirmDelete} ${fileName}?`; + let tip = `${window.siyuan.languages.confirmDeleteTip.replace("${x}", fileName)} +
+
${window.siyuan.languages.rollbackTip.replace("${x}", window.siyuan.config.editor.historyRetentionDays)}
`; if (response.data.subFileCount > 0) { - tip = `${window.siyuan.languages.confirmDelete} ${fileName} ${window.siyuan.languages.andSubFile.replace("x", response.data.subFileCount)}?`; + tip = `${window.siyuan.languages.andSubFile.replace("${x}", fileName).replace("${y}", response.data.subFileCount)} +
+
${window.siyuan.languages.rollbackTip.replace("${x}", window.siyuan.config.editor.historyRetentionDays)}
`; } confirmDialog(window.siyuan.languages.deleteOpConfirm, tip, () => { fetchPost("/api/filetree/removeDoc", { @@ -40,7 +44,9 @@ export const deleteFiles = (liElements: Element[]) => { deleteFile(itemNotebookId, liElements[0].getAttribute("data-path")); } else { confirmDialog(window.siyuan.languages.deleteOpConfirm, - `${window.siyuan.languages.confirmDelete} ${Lute.EscapeHTMLStr(getNotebookName(itemNotebookId))}?`, () => { + `${window.siyuan.languages.confirmDeleteTip.replace("${x}", Lute.EscapeHTMLStr(getNotebookName(itemNotebookId)))} +
+
${window.siyuan.languages.rollbackTip.replace("${x}", window.siyuan.config.editor.historyRetentionDays)}
`, () => { fetchPost("/api/notebook/removeNotebook", { notebook: itemNotebookId, callback: Constants.CB_MOUNT_REMOVE @@ -61,7 +67,9 @@ export const deleteFiles = (liElements: Element[]) => { return; } confirmDialog(window.siyuan.languages.deleteOpConfirm, - window.siyuan.languages.confirmRemoveAll.replace("${count}", paths.length), () => { + `${window.siyuan.languages.confirmRemoveAll.replace("${count}", paths.length)} +
+
${window.siyuan.languages.rollbackTip.replace("${x}", window.siyuan.config.editor.historyRetentionDays)}
`, () => { fetchPost("/api/filetree/removeDocs", { paths });