github/siyuan
4
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-05-03 14:20:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

🎨 Improve petal loading https://github.com/siyuan-note/bazaar/pull/1546

Browse Source
This commit is contained in:
Daniel 2025-04-01 14:34:12 +08:00
parent d0ad863651
commit 10c3d10145
No known key found for this signature in database
GPG Key ID: 86211BA83DF03017
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
kernel/model/plugin.go
View File

@ -134,7 +134,7 @@ func loadCode(petal *Petal) {
langJSONs, readErr := os.ReadDir(i18nDir) langJSONs, readErr := os.ReadDir(i18nDir)
if nil != readErr { if nil != readErr {
logging.LogErrorf("read plugin [%s] i18n failed: %s", petal.Name, readErr) logging.LogErrorf("read plugin [%s] i18n failed: %s", petal.Name, readErr)
} else { } else if 0 < len(langJSONs) {
preferredLang := Conf.Lang + ".json" preferredLang := Conf.Lang + ".json"
foundPreferredLang := false foundPreferredLang := false
foundEnUS := false foundEnUS := false
@ -166,13 +166,15 @@ func loadCode(petal *Petal) {
} }
} }
data, err = filelock.ReadFile(filepath.Join(i18nDir, preferredLang)) if langFilePath := filepath.Join(i18nDir, preferredLang); gulu.File.IsExist(langFilePath) {
if err != nil { data, err = filelock.ReadFile(langFilePath)
logging.LogErrorf("read plugin [%s] i18n failed: %s", petal.Name, err) if err != nil {
} else { logging.LogErrorf("read plugin [%s] i18n failed: %s", petal.Name, err)
petal.I18n = map[string]interface{}{} } else {
if err = gulu.JSON.UnmarshalJSON(data, &petal.I18n); err != nil { petal.I18n = map[string]interface{}{}
logging.LogErrorf("unmarshal plugin [%s] i18n failed: %s", petal.Name, err) if err = gulu.JSON.UnmarshalJSON(data, &petal.I18n); err != nil {
logging.LogErrorf("unmarshal plugin [%s] i18n failed: %s", petal.Name, err)
}
} }
} }
} }