mirror of
https://github.com/siyuan-note/siyuan.git
synced 2026-07-03 14:09:06 +02:00
♻️ Change the lang value to comply with RFC 5646 https://github.com/siyuan-note/siyuan/issues/17855
Signed-off-by: Daniel <845765@qq.com>
This commit is contained in:
+12
-12
@@ -125,7 +125,7 @@ func getDynamicIcon(c *gin.Context) {
|
||||
if "" == lang {
|
||||
lang = util.Lang
|
||||
}
|
||||
weekdayType := c.Query("weekdayType") // 设置星期几的格式,zh_CH {1:周日,2:周天, 3:星期日,4:星期天,}, en_US {1: Mon, 2: MON,3: Monday, 4. MONDAY,}
|
||||
weekdayType := c.Query("weekdayType") // 设置星期几的格式,zh-CN {1:周日,2:周天, 3:星期日,4:星期天,}, en {1: Mon, 2: MON,3: Monday, 4. MONDAY,}
|
||||
if "" == weekdayType {
|
||||
weekdayType = "1"
|
||||
}
|
||||
@@ -194,7 +194,7 @@ func getDateInfo(dateStr string, lang string, weekdayType string) map[string]any
|
||||
var weekdays []string
|
||||
|
||||
switch lang {
|
||||
case "zh_CN":
|
||||
case "zh-CN":
|
||||
month = date.Format("1月")
|
||||
switch weekdayType {
|
||||
case "1":
|
||||
@@ -209,7 +209,7 @@ func getDateInfo(dateStr string, lang string, weekdayType string) map[string]any
|
||||
weekdays = []string{"周日", "周一", "周二", "周三", "周四", "周五", "周六"}
|
||||
}
|
||||
weekdayStr = weekdays[date.Weekday()]
|
||||
case "zh_CHT":
|
||||
case "zh-TW":
|
||||
month = date.Format("1月")
|
||||
switch weekdayType {
|
||||
case "1":
|
||||
@@ -247,9 +247,9 @@ func getDateInfo(dateStr string, lang string, weekdayType string) map[string]any
|
||||
weekNumStr := fmt.Sprintf("%dW", weekNum)
|
||||
|
||||
switch lang {
|
||||
case "zh_CN":
|
||||
case "zh-CN":
|
||||
weekNumStr = fmt.Sprintf("%d周", weekNum)
|
||||
case "zh_CHT":
|
||||
case "zh-TW":
|
||||
weekNumStr = fmt.Sprintf("%d週", weekNum)
|
||||
}
|
||||
// 判断是否是周末
|
||||
@@ -427,7 +427,7 @@ func generateTypeSixSVG(color string, lang string, weekdayType string, dateInfo
|
||||
// 动态变化字体大小
|
||||
var fontSize float64
|
||||
switch lang {
|
||||
case "zh_CN", "zh_CHT":
|
||||
case "zh-CN", "zh-TW":
|
||||
fontSize = 460 / float64(len([]rune(weekday)))
|
||||
default:
|
||||
switch weekdayType {
|
||||
@@ -472,7 +472,7 @@ func generateTypeSevenSVG(color string, lang string, dateInfo map[string]any) st
|
||||
switch {
|
||||
case diffDays == 0:
|
||||
switch lang {
|
||||
case "zh_CN", "zh_CHT":
|
||||
case "zh-CN", "zh-TW":
|
||||
tipText = "今天"
|
||||
default:
|
||||
tipText = "Today"
|
||||
@@ -480,9 +480,9 @@ func generateTypeSevenSVG(color string, lang string, dateInfo map[string]any) st
|
||||
diffDaysText = "--"
|
||||
case diffDays > 0:
|
||||
switch lang {
|
||||
case "zh_CN":
|
||||
case "zh-CN":
|
||||
tipText = "还有"
|
||||
case "zh_CHT":
|
||||
case "zh-TW":
|
||||
tipText = "還有"
|
||||
default:
|
||||
tipText = "Left"
|
||||
@@ -490,9 +490,9 @@ func generateTypeSevenSVG(color string, lang string, dateInfo map[string]any) st
|
||||
diffDaysText = fmt.Sprintf("%d", diffDays)
|
||||
default:
|
||||
switch lang {
|
||||
case "zh_CN":
|
||||
case "zh-CN":
|
||||
tipText = "已过"
|
||||
case "zh_CHT":
|
||||
case "zh-TW":
|
||||
tipText = "已過"
|
||||
default:
|
||||
tipText = "Past"
|
||||
@@ -503,7 +503,7 @@ func generateTypeSevenSVG(color string, lang string, dateInfo map[string]any) st
|
||||
|
||||
var dayStr string
|
||||
switch lang {
|
||||
case "zh_CN", "zh_CHT":
|
||||
case "zh-CN", "zh-TW":
|
||||
dayStr = "天"
|
||||
default:
|
||||
dayStr = "days"
|
||||
|
||||
@@ -611,7 +611,7 @@ func setAppearance(c *gin.Context) {
|
||||
|
||||
model.Conf.Appearance = appearance
|
||||
util.StatusBarCfg = model.Conf.Appearance.StatusBar
|
||||
model.Conf.Lang = appearance.Lang
|
||||
model.Conf.Lang = util.MigrateLang(appearance.Lang) // 兼容历史下划线值,如 zh_CN → zh-CN
|
||||
util.Lang = model.Conf.Lang
|
||||
model.Conf.Save()
|
||||
model.InitAppearance()
|
||||
|
||||
@@ -157,7 +157,7 @@ func unescapePackageDisplayStrings(pkg *Package) {
|
||||
}
|
||||
}
|
||||
|
||||
// GetPreferredLocaleString 从 LocaleStrings 中按当前语种取值,无则回退 default、en_US,再回退 fallback。
|
||||
// GetPreferredLocaleString 从 LocaleStrings 中按当前语种取值,无则回退 default、en、en_US(历史命名兼容),再回退 fallback。
|
||||
func GetPreferredLocaleString(m LocaleStrings, fallback string) string {
|
||||
if len(m) == 0 {
|
||||
return fallback
|
||||
@@ -165,9 +165,16 @@ func GetPreferredLocaleString(m LocaleStrings, fallback string) string {
|
||||
if v := strings.TrimSpace(m[util.Lang]); "" != v {
|
||||
return v
|
||||
}
|
||||
// 兼容集市 JSON 数据中历史下划线 key(zh_CN、en_US 等)
|
||||
if v := strings.TrimSpace(m[util.LangToFile(util.Lang)]); "" != v {
|
||||
return v
|
||||
}
|
||||
if v := strings.TrimSpace(m["default"]); "" != v {
|
||||
return v
|
||||
}
|
||||
if v := strings.TrimSpace(m["en"]); "" != v {
|
||||
return v
|
||||
}
|
||||
if v := strings.TrimSpace(m["en_US"]); "" != v {
|
||||
return v
|
||||
}
|
||||
|
||||
@@ -48,7 +48,7 @@ func NewAppearance() *Appearance {
|
||||
Icon: "litheness",
|
||||
CodeBlockThemeLight: "github",
|
||||
CodeBlockThemeDark: "base16/dracula",
|
||||
Lang: "en_US",
|
||||
Lang: "en",
|
||||
CloseButtonBehavior: 0,
|
||||
HideToolbar: true,
|
||||
HideStatusBar: false,
|
||||
|
||||
+32
-8
@@ -178,29 +178,40 @@ func InitConf() {
|
||||
|
||||
if userLang, err := locale.Detect(); err == nil {
|
||||
var supportLangs []language.Tag
|
||||
langStrByTag := make(map[language.Tag]string)
|
||||
for lang := range util.Langs {
|
||||
if tag, err := language.Parse(lang); err == nil {
|
||||
supportLangs = append(supportLangs, tag)
|
||||
langStrByTag[tag] = lang
|
||||
} else {
|
||||
logging.LogErrorf("load language [%s] failed: %s", lang, err)
|
||||
}
|
||||
}
|
||||
matcher := language.NewMatcher(supportLangs)
|
||||
lang, _, _ := matcher.Match(userLang)
|
||||
base, _ := lang.Base()
|
||||
region, _ := lang.Region()
|
||||
util.Lang = base.String() + "_" + region.String()
|
||||
matchedTag, _, _ := matcher.Match(userLang)
|
||||
if langStr, ok := langStrByTag[matchedTag]; ok {
|
||||
util.Lang = langStr
|
||||
} else {
|
||||
util.Lang = "en"
|
||||
}
|
||||
Conf.Lang = util.Lang
|
||||
logging.LogInfof("initialized language [%s] based on device locale", Conf.Lang)
|
||||
} else {
|
||||
logging.LogDebugf("check device locale failed [%s], using default language [en_US]", err)
|
||||
util.Lang = "en_US"
|
||||
logging.LogDebugf("check device locale failed [%s], using default language [en]", err)
|
||||
util.Lang = "en"
|
||||
Conf.Lang = util.Lang
|
||||
}
|
||||
}
|
||||
util.Lang = Conf.Lang
|
||||
}
|
||||
|
||||
// 历史下划线语言代码迁移为 BCP 47 新值(zh_CN → zh-CN 等)
|
||||
if migrated := util.MigrateLang(Conf.Lang); migrated != Conf.Lang {
|
||||
logging.LogInfof("migrate legacy lang [%s] → [%s]", Conf.Lang, migrated)
|
||||
Conf.Lang = migrated
|
||||
util.Lang = migrated
|
||||
}
|
||||
|
||||
Conf.Langs = loadLangs()
|
||||
if nil == Conf.Appearance {
|
||||
Conf.Appearance = conf.NewAppearance()
|
||||
@@ -213,10 +224,23 @@ func InitConf() {
|
||||
}
|
||||
}
|
||||
if !langOK {
|
||||
Conf.Lang = "en_US"
|
||||
Conf.Lang = "en"
|
||||
util.Lang = Conf.Lang
|
||||
}
|
||||
Conf.Appearance.Lang = Conf.Lang
|
||||
|
||||
// 历史下划线命名的 i18n 文件(zh_CN.json 等)已重命名为 BCP 47(zh-CN.json 等),
|
||||
// 清理 ConfDir/appearance/langs/ 下的旧名残留,避免僵尸文件。详见 kernel/util/lang.go
|
||||
if langsDir := filepath.Join(util.AppearancePath, "langs"); gulu.File.IsDir(langsDir) {
|
||||
for _, stem := range []string{"zh_CN", "zh_CHT", "en_US", "de_DE", "fr_FR", "es_ES", "pt_BR",
|
||||
"it_IT", "ja_JP", "ko_KR", "ru_RU", "uk_UA", "pl_PL", "nl_NL", "ar_SA", "he_IL",
|
||||
"hi_IN", "id_ID", "th_TH", "tr_TR", "sk_SK"} {
|
||||
oldPath := filepath.Join(langsDir, stem+".json")
|
||||
if gulu.File.IsExist(oldPath) {
|
||||
os.RemoveAll(oldPath)
|
||||
}
|
||||
}
|
||||
}
|
||||
if "ant" == Conf.Appearance.Icon || "material" == Conf.Appearance.Icon {
|
||||
// v3.7.0 移除了 ant/material 图标包,如果用户之前选择了这两个其中之一,升级后改为 litheness 图标包,避免图标显示异常 https://github.com/siyuan-note/siyuan/issues/7976
|
||||
Conf.Appearance.Icon = "litheness"
|
||||
@@ -1068,7 +1092,7 @@ func (conf *AppConf) language(num int) (ret string) {
|
||||
if "" != ret {
|
||||
return
|
||||
}
|
||||
ret = util.Langs["en_US"][num]
|
||||
ret = util.Langs["en"][num]
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
+12
-20
@@ -265,31 +265,23 @@ func loadCode(petal *Petal) {
|
||||
if nil != readErr {
|
||||
logging.LogErrorf("read plugin [%s] i18n failed: %s", petal.Name, readErr)
|
||||
} else if 0 < len(langJSONs) {
|
||||
// 优先:BCP 47 新名(zh-CN.json),次选:历史下划线旧名(zh_CN.json),再回退 en/en_US/zh-CN/zh_CN/首个
|
||||
preferredLang := Conf.Lang + ".json"
|
||||
foundPreferredLang := false
|
||||
foundEnUS := false
|
||||
foundZhCN := false
|
||||
legacyLang := util.LangToFile(Conf.Lang) + ".json"
|
||||
candidates := []string{preferredLang, legacyLang, "en.json", "en_US.json", "zh-CN.json", "zh_CN.json"}
|
||||
found := make(map[string]bool)
|
||||
for _, langJSON := range langJSONs {
|
||||
if langJSON.Name() == preferredLang {
|
||||
foundPreferredLang = true
|
||||
found[langJSON.Name()] = true
|
||||
}
|
||||
preferredLang = ""
|
||||
for _, c := range candidates {
|
||||
if found[c] {
|
||||
preferredLang = c
|
||||
break
|
||||
}
|
||||
if langJSON.Name() == "en_US.json" {
|
||||
foundEnUS = true
|
||||
}
|
||||
if langJSON.Name() == "zh_CN.json" {
|
||||
foundZhCN = true
|
||||
}
|
||||
}
|
||||
|
||||
if !foundPreferredLang {
|
||||
if foundEnUS {
|
||||
preferredLang = "en_US.json"
|
||||
} else if foundZhCN {
|
||||
preferredLang = "zh_CN.json"
|
||||
} else {
|
||||
preferredLang = langJSONs[0].Name()
|
||||
}
|
||||
if "" == preferredLang {
|
||||
preferredLang = langJSONs[0].Name()
|
||||
}
|
||||
|
||||
if langFilePath := filepath.Join(i18nDir, preferredLang); gulu.File.IsExist(langFilePath) {
|
||||
|
||||
@@ -288,6 +288,9 @@ func CheckUpdate(showMsg bool) {
|
||||
releaseLang := result["release"].(string)
|
||||
if releaseLangArg := result["release_"+Conf.Lang]; nil != releaseLangArg {
|
||||
releaseLang = releaseLangArg.(string)
|
||||
} else if releaseLangArg := result["release_"+util.LangToFile(Conf.Lang)]; nil != releaseLangArg {
|
||||
// 兼容云端 JSON 数据中历史下划线 key(release_zh_CN 等)
|
||||
releaseLang = releaseLangArg.(string)
|
||||
}
|
||||
|
||||
if isVersionUpToDate(ver) {
|
||||
|
||||
@@ -493,10 +493,10 @@ func serveAppearance(ginServer *gin.Engine) {
|
||||
} else if strings.Contains(c.Request.URL.Path, "/langs/") && strings.HasSuffix(c.Request.URL.Path, ".json") {
|
||||
lang := path.Base(c.Request.URL.Path)
|
||||
lang = strings.TrimSuffix(lang, ".json")
|
||||
if "zh_CN" != lang && "en_US" != lang {
|
||||
if "zh-CN" != lang && "en" != lang {
|
||||
// 多语言配置缺失项使用对应英文配置项补齐 https://github.com/siyuan-note/siyuan/issues/5322
|
||||
|
||||
enUSFilePath := filepath.Join(appearancePath, "langs", "en_US.json")
|
||||
enUSFilePath := filepath.Join(appearancePath, "langs", "en.json")
|
||||
enUSData, err := os.ReadFile(enUSFilePath)
|
||||
if err != nil {
|
||||
logging.LogErrorf("read en_US.json [%s] failed: %s", enUSFilePath, err)
|
||||
|
||||
@@ -24,7 +24,11 @@ import (
|
||||
)
|
||||
|
||||
func I18nTerm(language, key string) (ret string) {
|
||||
// 优先按入参 language 拼 .json;找不到时按 BCP 47 ↔ 历史下划线文件名兼容回退。
|
||||
p := filepath.Join(WorkingDir, "appearance", "langs", language+".json")
|
||||
if _, err := os.Stat(p); nil != err {
|
||||
p = filepath.Join(WorkingDir, "appearance", "langs", LangToFile(language)+".json")
|
||||
}
|
||||
data, err := os.ReadFile(p)
|
||||
if err != nil {
|
||||
return
|
||||
|
||||
@@ -0,0 +1,106 @@
|
||||
// SiYuan - Refactor your thinking
|
||||
// Copyright (c) 2020-present, b3log.org
|
||||
//
|
||||
// This program is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU Affero General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// This program is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU Affero General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU Affero General Public License
|
||||
// along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
package util
|
||||
|
||||
// langMigration 从旧语言代码(下划线形式)映射到 BCP 47 合规新值。
|
||||
// 历史值参考 https://github.com/siyuan-note/siyuan/issues/7098
|
||||
var langMigration = map[string]string{
|
||||
"zh_CN": "zh-CN",
|
||||
"zh_CHT": "zh-TW",
|
||||
"en_US": "en",
|
||||
"de_DE": "de",
|
||||
"fr_FR": "fr",
|
||||
"es_ES": "es",
|
||||
"pt_BR": "pt-BR",
|
||||
"it_IT": "it",
|
||||
"ja_JP": "ja",
|
||||
"ko_KR": "ko",
|
||||
"ru_RU": "ru",
|
||||
"uk_UA": "uk",
|
||||
"pl_PL": "pl",
|
||||
"nl_NL": "nl",
|
||||
"ar_SA": "ar",
|
||||
"he_IL": "he",
|
||||
"hi_IN": "hi",
|
||||
"id_ID": "id",
|
||||
"th_TH": "th",
|
||||
"tr_TR": "tr",
|
||||
"sk_SK": "sk",
|
||||
}
|
||||
|
||||
// langFileStem 从 BCP 47 新值映射到 i18n 文件名 stem(去 .json 后缀)。
|
||||
// i18n 资源文件保持历史命名(zh_CN.json 等),逻辑值与文件名通过此表衔接。
|
||||
var langFileStem = map[string]string{
|
||||
"zh-CN": "zh_CN",
|
||||
"zh-TW": "zh_CHT",
|
||||
"en": "en_US",
|
||||
"de": "de_DE",
|
||||
"fr": "fr_FR",
|
||||
"es": "es_ES",
|
||||
"pt-BR": "pt_BR",
|
||||
"it": "it_IT",
|
||||
"ja": "ja_JP",
|
||||
"ko": "ko_KR",
|
||||
"ru": "ru_RU",
|
||||
"uk": "uk_UA",
|
||||
"pl": "pl_PL",
|
||||
"nl": "nl_NL",
|
||||
"ar": "ar_SA",
|
||||
"he": "he_IL",
|
||||
"hi": "hi_IN",
|
||||
"id": "id_ID",
|
||||
"th": "th_TH",
|
||||
"tr": "tr_TR",
|
||||
"sk": "sk_SK",
|
||||
}
|
||||
|
||||
// fileStemToLang 是 langFileStem 的反向映射,由 init 自动构造。
|
||||
var fileStemToLang = func() map[string]string {
|
||||
m := make(map[string]string, len(langFileStem))
|
||||
for lang, stem := range langFileStem {
|
||||
m[stem] = lang
|
||||
}
|
||||
return m
|
||||
}()
|
||||
|
||||
// MigrateLang 把历史语言代码迁移为 BCP 47 合规新值。
|
||||
// 已是新值或未知值原样返回。
|
||||
func MigrateLang(lang string) string {
|
||||
if v, ok := langMigration[lang]; ok {
|
||||
return v
|
||||
}
|
||||
return lang
|
||||
}
|
||||
|
||||
// LangToFile 把 BCP 47 语言代码映射为 i18n 文件名 stem(不含 .json)。
|
||||
// 兼容直接传入旧文件名 stem(如 zh_CN)的情况。
|
||||
func LangToFile(lang string) string {
|
||||
if stem, ok := langFileStem[lang]; ok {
|
||||
return stem
|
||||
}
|
||||
// 兜底:若 lang 本身就是文件名 stem(zh_CN 等),原样返回
|
||||
return lang
|
||||
}
|
||||
|
||||
// FileToLang 把 i18n 文件名 stem(如 zh_CN)反向映射为 BCP 47 新值。
|
||||
// 已是新值或未知 stem 原样返回。
|
||||
func FileToLang(stem string) string {
|
||||
if lang, ok := fileStemToLang[stem]; ok {
|
||||
return lang
|
||||
}
|
||||
return stem
|
||||
}
|
||||
@@ -119,7 +119,7 @@ func Boot() {
|
||||
readOnly := flag.String("readonly", "false", "read-only mode")
|
||||
accessAuthCode := flag.String("accessAuthCode", "", "access auth code")
|
||||
ssl := flag.Bool("ssl", false, "for https and wss")
|
||||
lang := flag.String("lang", "", "ar_SA/de_DE/en_US/es_ES/fr_FR/he_IL/hi_IN/id_ID/it_IT/ja_JP/ko_KR/nl_NL/pl_PL/pt_BR/ru_RU/sk_SK/th_TH/tr_TR/uk_UA/zh_CHT/zh_CN")
|
||||
lang := flag.String("lang", "", "ar/de/en/es/fr/he/hi/id/it/ja/ko/nl/pl/pt-BR/ru/sk/th/tr/uk/zh-CN/zh-TW")
|
||||
mode := flag.String("mode", "prod", "dev/prod")
|
||||
flag.Parse()
|
||||
|
||||
@@ -131,7 +131,7 @@ func Boot() {
|
||||
lang = coalesceToEnvVar(lang, "SIYUAN_LANG")
|
||||
|
||||
if "" != *lang {
|
||||
Lang = *lang
|
||||
Lang = MigrateLang(*lang) // 兼容历史下划线值,如 zh_CN → zh-CN
|
||||
}
|
||||
Mode = *mode
|
||||
ServerPort = *port
|
||||
|
||||
Reference in New Issue
Block a user