diff --git a/app/changelogs/v0.1.0-v2.8.3.md b/app/changelogs/v0.1.0-v2.8.3/v0.1.0-v2.8.3.md similarity index 100% rename from app/changelogs/v0.1.0-v2.8.3.md rename to app/changelogs/v0.1.0-v2.8.3/v0.1.0-v2.8.3.md diff --git a/app/changelogs/v2.8.10/v2.8.10.md b/app/changelogs/v2.8.10/v2.8.10.md new file mode 100644 index 000000000..60a449d50 --- /dev/null +++ b/app/changelogs/v2.8.10/v2.8.10.md @@ -0,0 +1,11 @@ +## Overview + +TODO + +## Changelogs + +Below are the detailed changes in this version. + +### Enhancement + + diff --git a/app/changelogs/v2.8.10/v2.8.10_zh_CHT.md b/app/changelogs/v2.8.10/v2.8.10_zh_CHT.md new file mode 100644 index 000000000..916e89bd1 --- /dev/null +++ b/app/changelogs/v2.8.10/v2.8.10_zh_CHT.md @@ -0,0 +1,11 @@ +## 概述 + +TODO + +## 變更記錄 + +以下是此版本中的詳細變更。 + +### 改進功能 + + diff --git a/app/changelogs/v2.8.10/v2.8.10_zh_CN.md b/app/changelogs/v2.8.10/v2.8.10_zh_CN.md new file mode 100644 index 000000000..8afa48916 --- /dev/null +++ b/app/changelogs/v2.8.10/v2.8.10_zh_CN.md @@ -0,0 +1,11 @@ +## 概述 + +TODO + +## 变更记录 + +以下是此版本中的详细变更。 + +### 改进功能 + + diff --git a/app/changelogs/v2.8.4.md b/app/changelogs/v2.8.4/v2.8.4.md similarity index 100% rename from app/changelogs/v2.8.4.md rename to app/changelogs/v2.8.4/v2.8.4.md diff --git a/app/changelogs/v2.8.4_zh_CN.md b/app/changelogs/v2.8.4/v2.8.4_zh_CN.md similarity index 100% rename from app/changelogs/v2.8.4_zh_CN.md rename to app/changelogs/v2.8.4/v2.8.4_zh_CN.md diff --git a/app/changelogs/v2.8.5.md b/app/changelogs/v2.8.5/v2.8.5.md similarity index 100% rename from app/changelogs/v2.8.5.md rename to app/changelogs/v2.8.5/v2.8.5.md diff --git a/app/changelogs/v2.8.5_zh_CN.md b/app/changelogs/v2.8.5/v2.8.5_zh_CN.md similarity index 100% rename from app/changelogs/v2.8.5_zh_CN.md rename to app/changelogs/v2.8.5/v2.8.5_zh_CN.md diff --git a/app/changelogs/v2.8.6.md b/app/changelogs/v2.8.6/v2.8.6.md similarity index 100% rename from app/changelogs/v2.8.6.md rename to app/changelogs/v2.8.6/v2.8.6.md diff --git a/app/changelogs/v2.8.6_zh_CN.md b/app/changelogs/v2.8.6/v2.8.6_zh_CN.md similarity index 100% rename from app/changelogs/v2.8.6_zh_CN.md rename to app/changelogs/v2.8.6/v2.8.6_zh_CN.md diff --git a/app/changelogs/v2.8.7.md b/app/changelogs/v2.8.7/v2.8.7.md similarity index 100% rename from app/changelogs/v2.8.7.md rename to app/changelogs/v2.8.7/v2.8.7.md diff --git a/app/changelogs/v2.8.7_zh_CN.md b/app/changelogs/v2.8.7/v2.8.7_zh_CN.md similarity index 100% rename from app/changelogs/v2.8.7_zh_CN.md rename to app/changelogs/v2.8.7/v2.8.7_zh_CN.md diff --git a/app/changelogs/v2.8.8.md b/app/changelogs/v2.8.8/v2.8.8.md similarity index 100% rename from app/changelogs/v2.8.8.md rename to app/changelogs/v2.8.8/v2.8.8.md diff --git a/app/changelogs/v2.8.8_zh_CN.md b/app/changelogs/v2.8.8/v2.8.8_zh_CN.md similarity index 100% rename from app/changelogs/v2.8.8_zh_CN.md rename to app/changelogs/v2.8.8/v2.8.8_zh_CN.md diff --git a/app/changelogs/v2.8.9.md b/app/changelogs/v2.8.9/v2.8.9.md similarity index 100% rename from app/changelogs/v2.8.9.md rename to app/changelogs/v2.8.9/v2.8.9.md diff --git a/app/changelogs/v2.8.9_zh_CN.md b/app/changelogs/v2.8.9/v2.8.9_zh_CN.md similarity index 100% rename from app/changelogs/v2.8.9_zh_CN.md rename to app/changelogs/v2.8.9/v2.8.9_zh_CN.md diff --git a/app/src/boot/openChangelog.ts b/app/src/boot/openChangelog.ts index 79131d2e3..5ebb74f1b 100644 --- a/app/src/boot/openChangelog.ts +++ b/app/src/boot/openChangelog.ts @@ -9,7 +9,7 @@ export const openChangelog = () => { return; } const dialog = new Dialog({ - title: `✨ ${window.siyuan.languages.whatsNewInSiYuan}`, + title: `✨ ${window.siyuan.languages.whatsNewInSiYuan} v${window.siyuan.config.system.kernelVersion}`, width: isMobile() ? "92vw" : "768px", height: isMobile() ? "80vh" : "70vh", content: `
${response.data.html}
` diff --git a/kernel/api/system.go b/kernel/api/system.go index 03adb8363..6c88e3185 100644 --- a/kernel/api/system.go +++ b/kernel/api/system.go @@ -49,7 +49,7 @@ func getChangelog(c *gin.Context) { return } - changelogPath := filepath.Join(changelogsDir, "v"+util.Ver+"_"+model.Conf.Lang+".md") + changelogPath := filepath.Join(changelogsDir, "v"+util.Ver, "v"+util.Ver+"_"+model.Conf.Lang+".md") if !gulu.File.IsExist(changelogPath) { changelogPath = filepath.Join(changelogsDir, "v"+util.Ver+".md") if !gulu.File.IsExist(changelogPath) { diff --git a/kernel/bazaar/package.go b/kernel/bazaar/package.go index b45eb3f84..44f5a10cf 100644 --- a/kernel/bazaar/package.go +++ b/kernel/bazaar/package.go @@ -135,6 +135,10 @@ func getPreferredReadme(readme *Readme) string { if "" != readme.ZhCN { ret = readme.ZhCN } + case "zh_CHT": + if "" != readme.ZhCN { + ret = readme.ZhCN + } case "en_US": if "" != readme.EnUS { ret = readme.EnUS @@ -158,6 +162,10 @@ func getPreferredName(pkg *Package) string { if "" != pkg.DisplayName.ZhCN { ret = pkg.DisplayName.ZhCN } + case "zh_CHT": + if "" != pkg.DisplayName.ZhCN { + ret = pkg.DisplayName.ZhCN + } case "en_US": if "" != pkg.DisplayName.EnUS { ret = pkg.DisplayName.EnUS @@ -181,6 +189,10 @@ func getPreferredDesc(desc *Description) string { if "" != desc.ZhCN { ret = desc.ZhCN } + case "zh_CHT": + if "" != desc.ZhCN { + ret = desc.ZhCN + } case "en_US": if "" != desc.EnUS { ret = desc.EnUS diff --git a/kernel/model/plugin.go b/kernel/model/plugin.go index 3c249fe12..3c8cbe087 100644 --- a/kernel/model/plugin.go +++ b/kernel/model/plugin.go @@ -136,6 +136,10 @@ func loadCode(petal *Petal) { if !foundPreferredLang { if foundEnUS { preferredLang = "en_US.json" + if "zh_CHT" == Conf.Lang && foundZhCN { + // Improve marketplace package for traditional Chinese https://github.com/siyuan-note/siyuan/issues/8342 + preferredLang = "zh_CN.json" + } } else if foundZhCN { preferredLang = "zh_CN.json" } else {