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

This commit is contained in:
Vanessa 2024-09-28 17:15:05 +08:00
commit 33919d1a02
2 changed files with 3 additions and 3 deletions

View file

@ -1770,7 +1770,7 @@ func RenameDoc(boxID, p, title string) (err error) {
return
}
if "" == title {
title = Conf.language(105)
title = Conf.language(16)
}
title = strings.ReplaceAll(title, "/", "")
@ -1808,7 +1808,7 @@ func createDoc(boxID, p, title, dom string) (tree *parse.Tree, err error) {
title = strings.ReplaceAll(title, "/", "")
title = strings.TrimSpace(title)
if "" == title {
title = Conf.Language(105)
title = Conf.Language(16)
}
baseName := strings.TrimSpace(path.Base(p))

View file

@ -812,7 +812,7 @@ func indexHistoryDir(name string, luteEngine *lute.Lute) {
title := tree.Root.IALAttr("title")
if "" == title {
title = Conf.language(105)
title = Conf.language(16)
}
content := tree.Root.Content()
p := strings.TrimPrefix(doc, util.HistoryDir)