Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-03 07:18:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Vanessa 2023-10-09 11:58:34 +08:00
commit e52037856f
7 changed files with 20 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/appearance/langs/en_US.json
View file

@ -1,4 +1,6 @@
{
"createdTime": "Created time",
"updatedTime": "Updated time",
"removeBookmark": "Remove bookmark from ${x}?",
"defaultMargin": "Default",
"noneMargin": "None",

2
app/appearance/langs/es_ES.json
View file

@ -1,4 +1,6 @@
{
"createdTime": "Hora de creación",
"updatedTime": "Hora actualizada",
"removeBookmark": "¿Eliminar marcador de ${x}?",
"lockEdit": "Hacer que el documento sea de sólo lectura",
"unlockEdit": "Hacer que el documento sea escribible",

2
app/appearance/langs/fr_FR.json
View file

@ -1,4 +1,6 @@
{
"createdTime": "Heure de création",
"updatedTime": "Heure mise à jour",
"removeBookmark": "Supprimer le signet de ${x} ?",
"lockEdit": "Rendre le document en lecture seule",
"unlockEdit": "Rendre le document accessible en écriture",

2
app/appearance/langs/zh_CHT.json
View file

@ -1,4 +1,6 @@
{
"createdTime": "建立時間",
"updatedTime": "更新時間",
"removeBookmark": "移除 ${x} 中的書籤？",
"lockEdit": "鎖定編輯",
"unlockEdit": "解除鎖定",

2
app/appearance/langs/zh_CN.json
View file

@ -1,4 +1,6 @@
{
"createdTime": "创建时间",
"updatedTime": "更新时间",
"removeBookmark": "移除 ${x} 中的书签？",
"lockEdit": "锁定编辑",
"unlockEdit": "解除锁定",

12
app/src/protyle/render/av/addCol.ts
View file

@ -257,12 +257,12 @@ export const addCol = (protyle: IProtyle, blockElement: Element) => {
});
menu.addItem({
icon: "iconClock",
label: window.siyuan.languages.creationDate,
label: window.siyuan.languages.createdTime,
click() {
const id = Lute.NewNodeID();
transaction(protyle, [{
action: "addAttrViewCol",
name: window.siyuan.languages.creationDate,
name: window.siyuan.languages.createdTime,
avID,
type: "created",
id
@ -275,19 +275,19 @@ export const addCol = (protyle: IProtyle, blockElement: Element) => {
blockElement: blockElement,
protyle: protyle,
type: "created",
name: window.siyuan.languages.creationDate,
name: window.siyuan.languages.createdTime,
id
});
}
});
menu.addItem({
icon: "iconClock",
label: window.siyuan.languages.modificationDate,
label: window.siyuan.languages.updatedTime,
click() {
const id = Lute.NewNodeID();
transaction(protyle, [{
action: "addAttrViewCol",
name: window.siyuan.languages.modificationDate,
name: window.siyuan.languages.updatedTime,
avID,
type: "updated",
id
@ -300,7 +300,7 @@ export const addCol = (protyle: IProtyle, blockElement: Element) => {
blockElement: blockElement,
protyle: protyle,
type: "updated",
name: window.siyuan.languages.modificationDate,
name: window.siyuan.languages.updatedTime,
id
});
}

8
kernel/model/attribute_view.go
View file

@ -341,20 +341,20 @@ func renderAttributeViewTable(attrView *av.AttributeView, view *av.View) (ret *a
createdStr := row.ID[:len("20060102150405")]
created, parseErr := time.Parse("20060102150405", createdStr)
if nil == parseErr {
cell.Value.Created = av.NewFormattedValueCreated(created.Unix(), 0, av.CreatedFormatNone)
cell.Value.Created = av.NewFormattedValueCreated(created.UnixMilli(), 0, av.CreatedFormatNone)
} else {
logging.LogWarnf("parse created [%s] failed: %s", createdStr, parseErr)
cell.Value.Created = av.NewFormattedValueCreated(time.Now().Unix(), 0, av.CreatedFormatNone)
cell.Value.Created = av.NewFormattedValueCreated(time.Now().UnixMilli(), 0, av.CreatedFormatNone)
}
case av.KeyTypeUpdated: // 渲染更新时间
ial := GetBlockAttrs(row.ID)
updatedStr := ial["updated"]
updated, parseErr := time.Parse("20060102150405", updatedStr)
if nil == parseErr {
cell.Value.Created = av.NewFormattedValueCreated(updated.Unix(), 0, av.CreatedFormatNone)
cell.Value.Updated = av.NewFormattedValueUpdated(updated.UnixMilli(), 0, av.UpdatedFormatNone)
} else {
logging.LogWarnf("parse updated [%s] failed: %s", updatedStr, parseErr)
cell.Value.Created = av.NewFormattedValueCreated(time.Now().Unix(), 0, av.CreatedFormatNone)
cell.Value.Updated = av.NewFormattedValueUpdated(time.Now().UnixMilli(), 0, av.UpdatedFormatNone)
}
}
}