From 67a4613d31802f9566b3d987b2989c08be3ee903 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Fri, 17 May 2024 11:06:28 +0800 Subject: [PATCH] :art: Prompt for recovery method and retention days settings when deleting documents https://github.com/siyuan-note/siyuan/issues/11400 --- app/appearance/langs/en_US.json | 2 +- app/appearance/langs/es_ES.json | 2 +- app/appearance/langs/fr_FR.json | 2 +- app/appearance/langs/ja_JP.json | 2 +- app/appearance/langs/zh_CHT.json | 2 +- app/appearance/langs/zh_CN.json | 2 +- kernel/search/mark.go | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index f1629930a..b1362c1d6 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -1,5 +1,5 @@ { - "andSubFile": "Are you sure you want to delete ${x} and its ${y} subdocs?", + "andSubFile": "Are you sure you want to delete ${x} and its ${y} subdocs?", "confirmDeleteTip": "Are you sure to delete ${x}?", "rollbackTip": "After deletion, it can be restored in [Data History], retained ${x} days according to [Settings - Editor - History Retention Days]", "newView": "Add View", diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json index 471665dd7..5d044589f 100644 --- a/app/appearance/langs/es_ES.json +++ b/app/appearance/langs/es_ES.json @@ -1,5 +1,5 @@ { - "andSubFile": "¿Está seguro de que desea eliminar ${x} y sus subdocumentos ${y}?", + "andSubFile": "¿Está seguro de que desea eliminar ${x} y sus subdocumentos ${y}?", "confirmDeleteTip": "¿Está seguro de eliminar ${x}?", "rollbackTip": "Después de la eliminación, se puede restaurar en [Historial de datos] y se conserva ${x} días según [Configuración - Editor - Días de retención del historial]", "newView": "Agregar vista", diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json index b3a7df7f7..57d104e0a 100644 --- a/app/appearance/langs/fr_FR.json +++ b/app/appearance/langs/fr_FR.json @@ -1,5 +1,5 @@ { - "andSubFile": "Êtes-vous sûr de vouloir supprimer ${x} et ses sous-documents ${y} ?", + "andSubFile": "Êtes-vous sûr de vouloir supprimer ${x} et ses sous-documents ${y} ?", "confirmDeleteTip": "Êtes-vous sûr de supprimer ${x} ?", "rollbackTip": "Après la suppression, il peut être restauré dans [Historique des données], conservé ${x} jours selon [Paramètres - Éditeur - Jours de rétention de l'historique]", "newView": "Ajouter une vue", diff --git a/app/appearance/langs/ja_JP.json b/app/appearance/langs/ja_JP.json index 4ddb94c31..56b0d1f7d 100644 --- a/app/appearance/langs/ja_JP.json +++ b/app/appearance/langs/ja_JP.json @@ -1,5 +1,5 @@ { - "andSubFile": "${x} とそのサブドキュメント ${y} を削除してもよろしいですか?", + "andSubFile": "${x} とそのサブドキュメント ${y} を削除してもよろしいですか?", "confirmDeleteTip": "${x} を削除してもよろしいですか?", "rollbackTip": "削除後は [データ履歴] で復元でき、${x} は保持されます。 [設定 - エディター - 履歴の保存日数] による日数", "newView": "ビューを追加", diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json index 61f0184cd..baf565af4 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -1,5 +1,5 @@ { - "andSubFile": "決定刪除 ${x} 及其 ${y} 個子文件嗎？", + "andSubFile": "決定刪除 ${x} 及其 ${y} 個子文件嗎？", "confirmDeleteTip": "確定刪除${x} 嗎？", "rollbackTip": "刪除後可在 [資料歷史] 中恢復，按 [設定 - 編輯器 - 歷史保留天數] 保留 ${x} 天", "newView": "新增視圖", diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index 294e500de..3e3c5460a 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -1,5 +1,5 @@ { - "andSubFile": "确定删除 ${x} 及其 ${y} 个子文档吗？", + "andSubFile": "确定删除 ${x} 及其 ${y} 个子文档吗？", "confirmDeleteTip": "确定删除 ${x} 吗？", "rollbackTip": "删除后可在 [数据历史] 中恢复，按 [设置 - 编辑器 - 历史保留天数] 保留 ${x} 天", "newView": "添加视图", diff --git a/kernel/search/mark.go b/kernel/search/mark.go index d8fecb225..f40196a2a 100644 --- a/kernel/search/mark.go +++ b/kernel/search/mark.go @@ -114,7 +114,7 @@ func EncloseHighlighting(text string, keywords []string, openMark, closeMark str ret = text if reg, err := regexp.Compile(re); nil == err { - ret = reg.ReplaceAllStringFunc(text, func(s string) string { return openMark + s + closeMark }) + ret = reg.ReplaceAllStringFunc(text, func(s string) string { return openMark + util.EscapeHTML(s) + closeMark }) } // 搜索结果预览包含转义符问题 Search results preview contains escape character issue https://github.com/siyuan-note/siyuan/issues/9790