diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index d0e8cc74f..4816e8d35 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -1182,7 +1182,7 @@ "109": "Remove reminder completed [%s]", "110": "Renaming...", "111": "Saving document [%s]...", - "112": "Do not include Markdown syntax marker", + "112": "Do not include Markdown syntax marker [%s]", "113": "Completing data writing...", "114": "Tag cannot be empty", "115": "Please configure [Settings - Export - Pandoc executable path] first", diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json index 8617a9cdf..0fda16619 100644 --- a/app/appearance/langs/es_ES.json +++ b/app/appearance/langs/es_ES.json @@ -1182,7 +1182,7 @@ "109": "Eliminación de recordatorios completada [%s]", "110": "Renombrar...", "111": "Guardando documento [%s]...", - "112": "No incluir marcador de sintaxis Markdown", + "112": "No incluir marcador de sintaxis Markdown [%s]", "113": "Completando la escritura de datos...", "114": "La etiqueta no puede estar vacía", "115": "Por favor, configure primero [Configuración - Exportación - Ruta ejecutable de Pandoc]", diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json index e6ed51585..88e88c3b6 100644 --- a/app/appearance/langs/fr_FR.json +++ b/app/appearance/langs/fr_FR.json @@ -1182,7 +1182,7 @@ "109": "Supprimer le rappel terminé [%s]", "110": "Renommer...", "111": "Enregistrement du document [%s]...", - "112": "Ne pas inclure les balises de syntaxe Markdown", + "112": "Ne pas inclure les balises de syntaxe Markdown [%s]", "113": "Fin de l'écriture des données...", "114": "La balise ne peut pas être vide", "115": "Veuillez d'abord configurer [Paramètres - Exporter - Chemin de l'exécutable Pandoc]", diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json index a8e57dfbd..e5a9efd82 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -1182,7 +1182,7 @@ "109": "移除提醒完畢 [%s]", "110": "正在重命名...", "111": "正在保存文檔 [%s]...", - "112": "請勿包含 Markdown 語法標記符", + "112": "請勿包含 Markdown 語法標記符 [%s]", "113": "正在完成資料寫入...", "114": "標籤不能為空", "115": "請先配置 [設置 - 導出 - Pandoc 可執行文件路徑]", diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index 1ae7f285c..b7b58e9f7 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -1182,7 +1182,7 @@ "109": "移除提醒完毕 [%s]", "110": "正在重命名...", "111": "正在保存文档 [%s]...", - "112": "请勿包含 Markdown 语法标记符", + "112": "请勿包含 Markdown 语法标记符 [%s]", "113": "正在完成数据写入...", "114": "标签不能为空", "115": "请先配置 [设置 - 导出 - Pandoc 可执行文件路径]", diff --git a/kernel/model/bookmark.go b/kernel/model/bookmark.go index b6a98428b..16d7306cd 100644 --- a/kernel/model/bookmark.go +++ b/kernel/model/bookmark.go @@ -75,8 +75,8 @@ func RemoveBookmark(bookmark string) (err error) { } func RenameBookmark(oldBookmark, newBookmark string) (err error) { - if treenode.ContainsMarker(newBookmark) { - return errors.New(Conf.Language(112)) + if invalidChar := treenode.ContainsMarker(newBookmark); "" != invalidChar { + return errors.New(fmt.Sprintf(Conf.Language(112), invalidChar)) } newBookmark = strings.TrimSpace(newBookmark) diff --git a/kernel/model/tag.go b/kernel/model/tag.go index 1ffcf32d9..744d3f1d4 100644 --- a/kernel/model/tag.go +++ b/kernel/model/tag.go @@ -105,8 +105,8 @@ func RemoveTag(label string) (err error) { } func RenameTag(oldLabel, newLabel string) (err error) { - if treenode.ContainsMarker(newLabel) { - return errors.New(Conf.Language(112)) + if invalidChar := treenode.ContainsMarker(newLabel); "" != invalidChar { + return errors.New(fmt.Sprintf(Conf.Language(112), invalidChar)) } newLabel = strings.TrimSpace(newLabel) diff --git a/kernel/treenode/marker.go b/kernel/treenode/marker.go index 41844b6d4..727f69702 100644 --- a/kernel/treenode/marker.go +++ b/kernel/treenode/marker.go @@ -21,17 +21,17 @@ import ( "github.com/88250/lute/lex" ) -func ContainsMarker(str string) bool { +func ContainsMarker(str string) (ret string) { if !gulu.Str.IsASCII(str) { - return false + return } for _, token := range str { if IsMarker(byte(token)) { - return true + return string(token) } } - return false + return } func IsMarker(token byte) bool {