From 8423f92f0efa40112e9e82d7f86e68ad47c1493f Mon Sep 17 00:00:00 2001 From: Jeffrey Chen <78434827+TCOTC@users.noreply.github.com> Date: Fri, 5 Apr 2024 18:40:01 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[i18n]=20=E5=B0=86=E3=80=8C=E5=A4=8D?= =?UTF-8?q?=E5=88=B6=E5=9D=97=E8=B6=85=E9=93=BE=E6=8E=A5=EF=BC=88Markdown?= =?UTF-8?q?=EF=BC=89=E3=80=8D=E6=94=B9=E4=B8=BA=E3=80=8C=E5=A4=8D=E5=88=B6?= =?UTF-8?q?=E5=9D=97=20Markdown=20=E9=93=BE=E6=8E=A5=E3=80=8D=20(#10892)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 对调 av__row--header 中的 More 和 Add 按钮 * [i18n] 将「复制块超链接（Markdown）」改为「复制块 Markdown 链接」 * Revert "[i18n] 将「复制块超链接（Markdown）」改为「复制块 Markdown 链接」" This reverts commit bf2dfbd5b25870807de2b9a11e86c356305d4c70. * Reapply "[i18n] 将「复制块超链接（Markdown）」改为「复制块 Markdown 链接」" This reverts commit 736e72f7cc75dcac280ec2d9516f2d5b15fad607. * Revert "对调 av__row--header 中的 More 和 Add 按钮" This reverts commit 8a92ef305856623bbf8e98a32943979d1144bd77. * 字母小写 --- app/appearance/langs/en_US.json | 2 +- app/appearance/langs/es_ES.json | 2 +- app/appearance/langs/fr_FR.json | 2 +- app/appearance/langs/zh_CHT.json | 2 +- app/appearance/langs/zh_CN.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index 4f7c4702f..b2d1089b6 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -742,7 +742,7 @@ "moveToLeft": "Move Left", "moveToRight": "Move Right", "copyProtocol": "Copy block hyperlink", - "copyProtocolInMd": "Copy block hyperlink (Markdown)", + "copyProtocolInMd": "Copy block Markdown link", "uploadAssets2CDN": "Upload asset files to cloud", "uploadAssets2CDNConfirmTip": "Are you sure to upload the assets in this document to the cloud?", "notSupport1": "Does not support drag and drop across notebooks", diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json index f6a1645f7..5697b4d53 100644 --- a/app/appearance/langs/es_ES.json +++ b/app/appearance/langs/es_ES.json @@ -742,7 +742,7 @@ "moveToLeft": "Mover a la izquierda", "moveToRight": "Mover a la derecha", "copyProtocol": "Copiar hipervínculo de bloque", - "copyProtocolInMd": "Copiar hipervínculo de bloque (Markdown)", + "copyProtocolInMd": "Copiar enlace de bloque de Markdown", "uploadAssets2CDN": "Subir archivos de activos a la nube", "uploadAssets2CDNConfirmTip": "¿Está seguro de cargar los recursos de este documento en la nube?", "notSupport1": "No admite la función de arrastrar y soltar en los cuadernos", diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json index 9c1ac0475..b3cb1ccda 100644 --- a/app/appearance/langs/fr_FR.json +++ b/app/appearance/langs/fr_FR.json @@ -742,7 +742,7 @@ "moveToLeft": "vers la Gauche", "moveToRight": "vers la Droite", "copyProtocol": "Copier bloc d'hyperliens", - "copyProtocolInMd": "Copier bloc d'hyperliens (Markdown)", + "copyProtocolInMd": "Copier le lien Markdown du bloc", "uploadAssets2CDN": "Transférer les fichiers asset vers le Cloud", "uploadAssets2CDNConfirmTip": "Êtes-vous sûr de télécharger les ressources de ce document dans le cloud ?", "notSupport1": "Le glisser-déposer entre carnets n'est pas pris en charge", diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json index c8149ff6e..67bebe7bd 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -742,7 +742,7 @@ "moveToLeft": "向左移", "moveToRight": "向右移", "copyProtocol": "複製塊超連結", - "copyProtocolInMd": "複製塊超連結（Markdown）", + "copyProtocolInMd": "複製塊 Markdown 連結", "uploadAssets2CDN": "上傳資料檔到圖床", "uploadAssets2CDNConfirmTip": "確定將該文檔內的資源文件上傳到圖床嗎？", "notSupport1": "不支援跨筆記本進行拖拽", diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index 5ccd028ea..813a072a9 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -742,7 +742,7 @@ "moveToLeft": "向左移", "moveToRight": "向右移", "copyProtocol": "复制块超链接", - "copyProtocolInMd": "复制块超链接（Markdown）", + "copyProtocolInMd": "复制块 Markdown 链接", "uploadAssets2CDN": "上传资源文件到图床", "uploadAssets2CDNConfirmTip": "确定将该文档内的资源文件上传到图床吗？", "notSupport1": "不支持跨笔记本进行拖拽", From 984911b7d059f72b2c9f8cb9caa2a256b26662c4 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Fri, 5 Apr 2024 18:52:04 +0800 Subject: [PATCH 2/2] :art: Improve dynamic anchor text for db node https://github.com/siyuan-note/siyuan/issues/10880 --- kernel/treenode/node.go | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-) diff --git a/kernel/treenode/node.go b/kernel/treenode/node.go index f3bfbbd75..0162f28a0 100644 --- a/kernel/treenode/node.go +++ b/kernel/treenode/node.go @@ -182,7 +182,8 @@ func NodeStaticContent(node *ast.Node, excludeTypes []string, includeTextMarkATi return getAttributeViewContent(node.AttributeViewID) } - return getAttributeViewName(node.AttributeViewID) + ret, _ := av.GetAttributeViewName(node.AttributeViewID) + return ret } buf := bytes.Buffer{} @@ -566,28 +567,6 @@ func GetAttributeViewName(avID string) (name string) { return } -func getAttributeViewName(avID string) (name string) { - if "" == avID { - return - } - - attrView, err := av.ParseAttributeView(avID) - if nil != err { - logging.LogErrorf("parse attribute view [%s] failed: %s", avID, err) - return - } - - buf := bytes.Buffer{} - buf.WriteString(attrView.Name) - buf.WriteByte(' ') - for _, v := range attrView.Views { - buf.WriteString(v.Name) - buf.WriteByte(' ') - } - name = strings.TrimSpace(buf.String()) - return -} - func getAttributeViewContent(avID string) (content string) { if "" == avID { return