From df7682384e71d6b521edbeb48f2118df5617cf6f Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Tue, 23 May 2023 20:55:05 +0800 Subject: [PATCH] :art: Improve marketplace package for traditional Chinese https://github.com/siyuan-note/siyuan/issues/8342 --- kernel/bazaar/package.go | 12 ++++++++++++ kernel/model/plugin.go | 4 ++++ 2 files changed, 16 insertions(+) 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 {