Skip to content

Commit 46c1c34

Browse files
fix: resolve i18n file loading failure issue
1 parent ba999c5 commit 46c1c34

File tree

4 files changed

+29
-17
lines changed

4 files changed

+29
-17
lines changed

agent/app/service/app.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1153,7 +1153,7 @@ func (a AppService) SyncAppListFromRemote(taskID string) (err error) {
11531153
}, nil)
11541154

11551155
go func() {
1156-
if err = syncTask.Execute(); err != nil {
1156+
if err := syncTask.Execute(); err != nil {
11571157
_ = NewISettingService().Update("AppStoreLastModified", "0")
11581158
_ = NewISettingService().Update("AppStoreSyncStatus", constant.StatusError)
11591159
}

agent/i18n/i18n.go

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,19 @@ import (
1313
"gopkg.in/yaml.v3"
1414
)
1515

16+
var langFiles = map[string]string{
17+
"zh": "lang/zh.yaml",
18+
"en": "lang/en.yaml",
19+
"zh-Hant": "lang/zh-Hant.yaml",
20+
"pt-BR": "lang/pt-BR.yaml",
21+
"ja": "lang/ja.yaml",
22+
"ru": "lang/ru.yaml",
23+
"ms": "lang/ms.yaml",
24+
"ko": "lang/ko.yaml",
25+
"tr": "lang/tr.yaml",
26+
"es-ES": "lang/es-ES.yaml",
27+
}
28+
1629
func GetMsgWithMap(key string, maps map[string]interface{}) string {
1730
var content string
1831
if maps == nil {
@@ -123,18 +136,17 @@ func UseI18n() gin.HandlerFunc {
123136
func Init() {
124137
bundle = i18n.NewBundle(language.Chinese)
125138
bundle.RegisterUnmarshalFunc("yaml", yaml.Unmarshal)
126-
_, _ = bundle.LoadMessageFileFS(fs, "lang/zh.yaml")
127-
_, _ = bundle.LoadMessageFileFS(fs, "lang/en.yaml")
128-
_, _ = bundle.LoadMessageFileFS(fs, "lang/zh-Hant.yaml")
129-
_, _ = bundle.LoadMessageFileFS(fs, "lang/fa.yaml")
130-
_, _ = bundle.LoadMessageFileFS(fs, "lang/pt.yaml")
131-
_, _ = bundle.LoadMessageFileFS(fs, "lang/pt-BR.yaml")
132-
_, _ = bundle.LoadMessageFileFS(fs, "lang/ja.yaml")
133-
_, _ = bundle.LoadMessageFileFS(fs, "lang/ru.yaml")
134-
_, _ = bundle.LoadMessageFileFS(fs, "lang/ms.yaml")
135-
_, _ = bundle.LoadMessageFileFS(fs, "lang/ko.yaml")
136-
_, _ = bundle.LoadMessageFileFS(fs, "lang/tr.yaml")
137-
_, _ = bundle.LoadMessageFileFS(fs, "lang/es-ES.yaml")
139+
isSuccess := true
140+
for _, file := range langFiles {
141+
if _, err := bundle.LoadMessageFileFS(fs, file); err != nil {
142+
global.LOG.Errorf("[i18n] load language file %s failed: %v\n", file, err)
143+
isSuccess = false
144+
}
145+
}
146+
147+
if !isSuccess {
148+
panic("[i18n] failed to init language files, See log above for details")
149+
}
138150
lang := GetLanguageFromDB()
139151
global.I18n = i18n.NewLocalizer(bundle, lang)
140152
}

agent/i18n/lang/en.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ IgnoreUploadErr: "Upload failed, error: {{ .detail }}, ignoring this error..."
254254
LoadBackupFailed: "Failed to get backup account connection, error: {{ .detail }}"
255255
InExecuting: "The current task is being executed, please do not repeat the execution!"
256256
NoSuchResource: "No backup content found in the database, skipping..."
257-
CleanLog: "Clean Log",
257+
CleanLog: "Clean Log"
258258
CleanLogByName: "Clean {{.name}} Log"
259259

260260
#toolbox

agent/i18n/lang/tr.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,14 +112,14 @@ ExportDate: "Zaman"
112112

113113
#file
114114
ErrFileCanNotRead: 'Bu dosya önizlemeyi desteklemiyor'
115-
ErrFileToLarge: 'Dosya 10M'dan büyük ve açılamıyor'
115+
ErrFileToLarge: 'Dosya 10M dan büyük ve açılamıyor'
116116
ErrPathNotFound: 'Dizin mevcut değil'
117117
ErrMovePathFailed: 'Hedef yol orijinal yolu içeremez!'
118118
ErrLinkPathNotFound: 'Hedef yol mevcut değil!'
119119
ErrFileIsExist: 'Dosya veya klasör zaten mevcut!'
120120
ErrFileUpload: '{{ .name }} dosya yükleme başarısız {{ .detail }}'
121121
ErrFileDownloadDir: 'Klasör indirme desteklenmiyor'
122-
ErrCmdNotFound: '{{ .name}} komutu mevcut değil, lütfen önce bu komutu host'a yükleyin'
122+
ErrCmdNotFound: '{{ .name}} komutu mevcut değil, lütfen önce bu komutu host a yükleyin'
123123
ErrSourcePathNotFound: 'Kaynak dizin mevcut değil'
124124
ErrFavoriteExist: 'Bu yol zaten favorilere eklendi'
125125
ErrInvalidChar: 'Yasak karakterlere izin verilmiyor'
@@ -408,7 +408,7 @@ SnapNewDB: 'Veritabanı {{ .name }} bağlantısını başlat'
408408
SnapDeleteOperationLog: 'İşlem günlüğünü sil'
409409
SnapDeleteLoginLog: 'Erişim günlüğünü sil'
410410
SnapDeleteMonitor: 'İzleme verilerini sil'
411-
SnapRemoveSystemIP: 'Sistem IP'sini kaldır'
411+
SnapRemoveSystemIP: 'Sistem IP sini kaldır'
412412
SnapBaseInfo: '1Panel temel bilgilerini yaz'
413413
SnapInstallAppImageEmpty: 'Uygulama imageı seçilmedi, atlanıyor...'
414414
SnapInstallApp: '1Panel yüklü uygulamaları yedekle'

0 commit comments

Comments
 (0)