Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
Vanessa 2022-11-15 11:03:18 +08:00
commit da8b48bfb2
6 changed files with 7 additions and 5 deletions

View file

@ -700,7 +700,7 @@
"back": "Back",
"mount": "Open Notebook",
"newNotebook": "New Notebook",
"fileNameRule": "Not Allow /",
"fileNameRule": "Document title cannot contain / character",
"slogan": "Build Your Eternal Digital Garden",
"showInFolder": "Show in Folder",
"search": "Search",

View file

@ -700,7 +700,7 @@
"back": "Atrás",
"mount": "Abrir cuaderno de notas",
"newNotebook": "Nuevo cuaderno de notas",
"fileNameRule": "No se permite /",
"fileNameRule": "El título del documento no puede contener / caracteres",
"slogan": "Construye tu jardín digital eterno",
"showInFolder": "Mostrar en la carpeta",
"search": "Buscar",

View file

@ -700,7 +700,7 @@
"back": "Retour",
"mount": "Ouvrir le carnet de notes",
"newNotebook": "Nouveau carnet de notes",
"fileNameRule": "Non autorisé /",
"fileNameRule": "Le titre du document ne peut pas contenir de caractères /",
"slogan": "Construisez votre jardin numérique éternel",
"showInFolder": "Afficher dans le dossier",
"search": "Recherche",

View file

@ -700,7 +700,7 @@
"back": "返回上一層",
"mount": "打開筆記本",
"newNotebook": "新建筆記本",
"fileNameRule": "不能包含 / 字元",
"fileNameRule": "文檔標題不能包含 / 字符",
"slogan": "構建你永恆的數字花園",
"showInFolder": "打開文件位置",
"search": "搜索",

View file

@ -700,7 +700,7 @@
"back": "返回上一层",
"mount": "打开笔记本",
"newNotebook": "新建笔记本",
"fileNameRule": "不能包含 / 字符",
"fileNameRule": "文档标题不能包含 / 字符",
"slogan": "构建你永恒的数字花园",
"showInFolder": "打开文件位置",
"search": "搜索",

View file

@ -1293,6 +1293,7 @@ func RenameDoc(boxID, p, title string) (err error) {
if "" == title {
title = "Untitled"
}
title = strings.ReplaceAll(title, "/", "")
oldHPath := tree.HPath
tree.HPath = path.Join(path.Dir(tree.HPath), title)
@ -1398,6 +1399,7 @@ func createDoc(boxID, p, title, dom string) (err error) {
// 限制笔记本名和文档名最大长度为 `512` https://github.com/siyuan-note/siyuan/issues/6299
return errors.New(Conf.Language(106))
}
title = strings.ReplaceAll(title, "/", "")
baseName := strings.TrimSpace(path.Base(p))
if "" == strings.TrimSuffix(baseName, ".sy") {