Skip to content

Commit 1cc1666

Browse files
authored
Update l10n.go
1 parent b4840eb commit 1cc1666

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

service/singleton/l10n.go

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,10 @@ import (
77
"github.com/nicksnyder/go-i18n/v2/i18n"
88
"golang.org/x/text/language"
99

10+
"os"
11+
"path/filepath"
12+
1013
"github.com/xos/serverstatus/model"
11-
"github.com/xos/serverstatus/resource"
1214
)
1315

1416
var Localizer *i18n.Localizer
@@ -21,13 +23,15 @@ func InitLocalizer() {
2123
log.Println("NG>> language not exists:", Conf.Language)
2224
Conf.Language = "zh-CN"
2325
} else {
24-
_, err := bundle.LoadMessageFileFS(resource.I18nFS, "l10n/"+Conf.Language+".toml")
25-
if err != nil {
26+
langPath := filepath.Join("resource", "l10n", Conf.Language+".toml")
27+
_, err := bundle.LoadMessageFile(langPath)
28+
if err != nil && !os.IsNotExist(err) {
2629
panic(err)
2730
}
2831
}
2932

30-
if _, err := bundle.LoadMessageFileFS(resource.I18nFS, "l10n/zh-CN.toml"); err != nil {
33+
zhPath := filepath.Join("resource", "l10n", "zh-CN.toml")
34+
if _, err := bundle.LoadMessageFile(zhPath); err != nil {
3135
panic(err)
3236
}
3337
Localizer = i18n.NewLocalizer(bundle, Conf.Language)

0 commit comments

Comments
 (0)