细化comment_type,完善时间线内容的多语言翻译逻辑

This commit is contained in:
jingrow 2026-04-23 15:04:30 +08:00
parent 377a305b9f
commit 65da1a64b1
6 changed files with 51 additions and 12 deletions

View File

@ -327,13 +327,34 @@ function buildTimelineItems() {
})
}
// 8. Info logs
// 8. Info logs Rename/Merge/Restore Info/Label/Edit 使
for (const i of info.info_logs || []) {
items.push({
creation: i.creation,
content: `<strong>${i.owner}</strong> ${i.content || ''}`,
icon: 'tabler:info-circle',
})
const isSelf = i.owner === currentUser.value
const ownerHtml = `<strong>${i.owner}</strong>`
// content <strong> old/new
const vals = [...(i.content || '').matchAll(/<strong>(.*?)<\/strong>/g)].map(m => `<strong>${m[1]}</strong>`)
let content = `${ownerHtml} ${i.content || ''}`
let icon = 'tabler:info-circle'
if (i.comment_type === 'Rename' && vals.length === 2) {
content = isSelf
? t('You renamed from {0} to {1}', vals)
: t('{0} renamed from {1} to {2}', [ownerHtml, ...vals])
icon = 'tabler:edit'
} else if (i.comment_type === 'Merge' && vals.length === 2) {
content = isSelf
? t('You merged {0} into {1}', vals)
: t('{0} merged {1} into {2}', [ownerHtml, ...vals])
icon = 'tabler:merge'
} else if (i.comment_type === 'Restore' && vals.length === 2) {
content = isSelf
? t('You restored {0} as {1}', vals)
: t('{0} restored {1} as {2}', [ownerHtml, ...vals])
icon = 'tabler:refresh'
}
items.push({ creation: i.creation, content, icon })
}
// 9. Workflow logs

View File

@ -58,7 +58,7 @@ def restore(name, alert=True):
pg.set(workflow_state_fieldname, None)
pg.insert()
pg.add_comment("Edit", _("restored {0} as {1}").format(deleted.deleted_name, pg.name))
pg.add_comment("Restore", _("restored {0} as {1}").format(deleted.deleted_name, pg.name))
deleted.new_name = pg.name
deleted.restored = 1

View File

@ -170,7 +170,7 @@ def add_comments(pg, docinfo):
docinfo.assignment_logs.append(c)
case "Attachment" | "Attachment Removed":
docinfo.attachment_logs.append(c)
case "Info" | "Edit" | "Label":
case "Info" | "Edit" | "Label" | "Rename" | "Merge" | "Restore":
docinfo.info_logs.append(c)
case "Like":
docinfo.like_logs.append(c)

View File

@ -30515,6 +30515,12 @@ msgstr "地图标记"
msgid "merged {0} into {1}"
msgstr "将{0}合并至{1}"
msgid "You merged {0} into {1}"
msgstr "您将{0}合并至{1}"
msgid "{0} merged {1} into {2}"
msgstr "{0}将{1}合并至{2}"
#: jingrow/website/pagetype/blog_post/templates/blog_post.html:25
#: jingrow/website/pagetype/blog_post/templates/blog_post_row.html:36
msgid "min read"
@ -30797,6 +30803,12 @@ msgstr "已移除{0}的行"
msgid "renamed from {0} to {1}"
msgstr "从{0}重命名为{1}"
msgid "You renamed from {0} to {1}"
msgstr "您从{0}重命名为{1}"
msgid "{0} renamed from {1} to {2}"
msgstr "{0}从{1}重命名为{2}"
#. Option for the 'Icon' (Select) field in PageType 'Workflow State'
#: jingrow/workflow/pagetype/workflow_state/workflow_state.json
msgid "repeat"
@ -30837,6 +30849,12 @@ msgstr "响应"
msgid "restored {0} as {1}"
msgstr "已恢复{0}为{1}"
msgid "You restored {0} as {1}"
msgstr "您已恢复{0}为{1}"
msgid "{0} restored {1} as {2}"
msgstr "{0}已恢复{1}为{2}"
#. Option for the 'Icon' (Select) field in PageType 'Workflow State'
#: jingrow/workflow/pagetype/workflow_state/workflow_state.json
msgid "retweet"

View File

@ -210,9 +210,9 @@ def rename_page(
rename_password(pagetype, old, new)
if merge:
new_page.add_comment("Edit", _("merged {0} into {1}").format(jingrow.bold(old), jingrow.bold(new)))
new_page.add_comment("Merge", _("merged {0} into {1}").format(jingrow.bold(old), jingrow.bold(new)))
else:
new_page.add_comment("Edit", _("renamed from {0} to {1}").format(jingrow.bold(old), jingrow.bold(new)))
new_page.add_comment("Rename", _("renamed from {0} to {1}").format(jingrow.bold(old), jingrow.bold(new)))
if merge:
jingrow.delete_page(pagetype, old)

View File

@ -210,9 +210,9 @@ def rename_pg(
rename_password(pagetype, old, new)
if merge:
new_pg.add_comment("Edit", _("merged {0} into {1}").format(jingrow.bold(old), jingrow.bold(new)))
new_pg.add_comment("Merge", _("merged {0} into {1}").format(jingrow.bold(old), jingrow.bold(new)))
else:
new_pg.add_comment("Edit", _("renamed from {0} to {1}").format(jingrow.bold(old), jingrow.bold(new)))
new_pg.add_comment("Rename", _("renamed from {0} to {1}").format(jingrow.bold(old), jingrow.bold(new)))
if merge:
jingrow.delete_pg(pagetype, old)