From 3d2d1161007bae45d30dc31e18faac35b67eff82 Mon Sep 17 00:00:00 2001
From: naiba <hi@nai.ba>
Date: Thu, 28 Apr 2022 10:17:38 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=8C=90=20i18n=20config=20file=20[skip=20c?=
 =?UTF-8?q?i]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cmd/playground/main.go                             |  1 +
 resource/template/common/footer.html               |  2 +-
 resource/template/dashboard/setting.html           |  2 +-
 resource/template/theme-daynight/home.html         |  4 ++--
 resource/template/theme-daynight/service.html      |  2 +-
 resource/template/theme-daynight/viewpassword.html |  2 +-
 resource/template/theme-hotaru/home.html           |  2 +-
 resource/template/theme-mdui/footer.html           |  2 +-
 service/singleton/l10n.go                          | 11 +++++++++--
 service/singleton/singleton.go                     |  2 +-
 10 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/cmd/playground/main.go b/cmd/playground/main.go
index a989b7f..246a667 100644
--- a/cmd/playground/main.go
+++ b/cmd/playground/main.go
@@ -17,6 +17,7 @@ func htmlTemplateTranslateFn(id string, data interface{}, count interface{}) str
 }
 
 func main() {
+	singleton.InitConfigFromPath("data/config.yaml")
 	singleton.InitLocalizer()
 	fmt.Println(singleton.Localizer.MustLocalize(&i18n.LocalizeConfig{
 		MessageID: "nezhaMonitor",
diff --git a/resource/template/common/footer.html b/resource/template/common/footer.html
index 4c6a8e8..b52fd65 100644
--- a/resource/template/common/footer.html
+++ b/resource/template/common/footer.html
@@ -2,7 +2,7 @@
 <div class="ui inverted vertical footer segment">
     <div class="ui center aligned is-size-7 container">
         <b>&copy; <a style="color: white;" href="/">{{.Conf.Site.Brand}}</a></b> | <small>Powered by <a href="https://github.com/naiba/nezha"
-                style="color: white;" target="_blank">{{tr "nezhaMonitor" nil nil}}</a> {{.Version}}</small>
+                style="color: white;" target="_blank">{{tr "nezhaMonitor"}}</a> {{.Version}}</small>
     </div>
 </div>
 <script src="https://lf6-cdn-tos.bytecdntp.com/cdn/expire-1-M/jquery/3.4.1/jquery.min.js"></script>
diff --git a/resource/template/dashboard/setting.html b/resource/template/dashboard/setting.html
index 3c5f157..77aa0b2 100644
--- a/resource/template/dashboard/setting.html
+++ b/resource/template/dashboard/setting.html
@@ -6,7 +6,7 @@
         <form id="settingForm" class="ui large form" onsubmit="return false;">
             <div class="field">
                 <label>站点标题</label>
-                <input type="text" name="Title" placeholder="{{tr "nezhaMonitor" nil nil}}" value="{{.Conf.Site.Brand}}">
+                <input type="text" name="Title" placeholder="{{tr "nezhaMonitor"}}" value="{{.Conf.Site.Brand}}">
             </div>
             <div class="field">
                 <label>管理员列表</label>
diff --git a/resource/template/theme-daynight/home.html b/resource/template/theme-daynight/home.html
index 8e3d73c..8056095 100644
--- a/resource/template/theme-daynight/home.html
+++ b/resource/template/theme-daynight/home.html
@@ -23,7 +23,7 @@
         <section class="nav-bar clearfix">
             <figure class="logo">
                 <a href="/">
-                    <img src="/static/logo.svg?v20210804" alt="{{tr "nezhaMonitor" nil nil}}" width="50" height="50">
+                    <img src="/static/logo.svg?v20210804" alt="{{tr "nezhaMonitor"}}" width="50" height="50">
                 </a>
                 <a href="/">{{.Conf.Site.Brand}}</a>
             </figure>
@@ -155,7 +155,7 @@
 
     <footer>
         <div class="footer-container">
-            <div><a href="https://github.com/naiba/nezha" target="_blank">Powered by {{tr "nezhaMonitor" nil nil}} · {{.Version}}</a>
+            <div><a href="https://github.com/naiba/nezha" target="_blank">Powered by {{tr "nezhaMonitor"}} · {{.Version}}</a>
                 <p>&copy; <span id="copyright-date">
                         <script>document.getElementById('copyright-date').appendChild(document.createTextNode(new Date().getFullYear()))</script>
                     </span> · <a href="https://blog.jackiesung.com" target="_blank">Theme designed by Jackie Sung</a>
diff --git a/resource/template/theme-daynight/service.html b/resource/template/theme-daynight/service.html
index c5d8466..157566a 100644
--- a/resource/template/theme-daynight/service.html
+++ b/resource/template/theme-daynight/service.html
@@ -118,7 +118,7 @@
       <footer>
         <div class="footer-container">
           <div>
-            <a href="https://github.com/naiba/nezha" target="_blank">Powered by {{tr "nezhaMonitor" nil nil}} · {{.Version}}</a>
+            <a href="https://github.com/naiba/nezha" target="_blank">Powered by {{tr "nezhaMonitor"}} · {{.Version}}</a>
             <p>
               &copy;
               <span id="copyright-date"
diff --git a/resource/template/theme-daynight/viewpassword.html b/resource/template/theme-daynight/viewpassword.html
index 5718f74..edc7c69 100644
--- a/resource/template/theme-daynight/viewpassword.html
+++ b/resource/template/theme-daynight/viewpassword.html
@@ -42,7 +42,7 @@
     <footer>
       <div class="footer-container">
         <div>
-          <a href="https://github.com/naiba/nezha" target="_blank">Powered by {{tr "nezhaMonitor" nil nil}} · {{.Version}}</a>
+          <a href="https://github.com/naiba/nezha" target="_blank">Powered by {{tr "nezhaMonitor"}} · {{.Version}}</a>
           <p>
             &copy;<span id="copyright-date"
               ><script>
diff --git a/resource/template/theme-hotaru/home.html b/resource/template/theme-hotaru/home.html
index 5f75408..fb11ef3 100644
--- a/resource/template/theme-hotaru/home.html
+++ b/resource/template/theme-hotaru/home.html
@@ -140,7 +140,7 @@
         </ul>
     </div>
     <footer>
-        <p style="text-align:center;padding: 15px;">Powered by <a href="https://github.com/naiba/nezha">{{tr "nezhaMonitor" nil nil}}</a> build ·
+        <p style="text-align:center;padding: 15px;">Powered by <a href="https://github.com/naiba/nezha">{{tr "nezhaMonitor"}}</a> build ·
             {{.Version}}
             <a href="/service">服务状态</a>
             <a href="/server">管理后台</a>
diff --git a/resource/template/theme-mdui/footer.html b/resource/template/theme-mdui/footer.html
index cbe7d16..097a0d3 100644
--- a/resource/template/theme-mdui/footer.html
+++ b/resource/template/theme-mdui/footer.html
@@ -5,7 +5,7 @@
     <center>
       <p>
         <a href="/"><at>{{.Title}}</at></a>
-        Powered by <a href="https://github.com/naiba/nezha"><st>{{tr "nezhaMonitor" nil nil}}&lt;{{.Version}}&gt;</st></a>&nbsp;| Theme designed by Mikoy Chinese
+        Powered by <a href="https://github.com/naiba/nezha"><st>{{tr "nezhaMonitor"}}&lt;{{.Version}}&gt;</st></a>&nbsp;| Theme designed by Mikoy Chinese
       </p>
     </center>
     </div>
diff --git a/service/singleton/l10n.go b/service/singleton/l10n.go
index c667804..26f8d42 100644
--- a/service/singleton/l10n.go
+++ b/service/singleton/l10n.go
@@ -11,6 +11,13 @@ var Localizer *i18n.Localizer
 func InitLocalizer() {
 	bundle := i18n.NewBundle(language.Chinese)
 	bundle.RegisterUnmarshalFunc("toml", toml.Unmarshal)
-	bundle.LoadMessageFile("resource/l10n/zh-CN.toml")
-	Localizer = i18n.NewLocalizer(bundle, "zh-CN")
+	_, err := bundle.LoadMessageFile("resource/l10n/" + Conf.Language + ".toml")
+	if err != nil {
+		panic(err)
+	}
+	_, err = bundle.LoadMessageFile("resource/l10n/zh-CN.toml")
+	if err != nil {
+		panic(err)
+	}
+	Localizer = i18n.NewLocalizer(bundle, Conf.Language)
 }
diff --git a/service/singleton/singleton.go b/service/singleton/singleton.go
index b6bd490..beb659c 100644
--- a/service/singleton/singleton.go
+++ b/service/singleton/singleton.go
@@ -30,7 +30,6 @@ func Init() {
 		panic(err)
 	}
 
-	Conf = &model.Config{}
 	Cache = cache.New(5*time.Minute, 10*time.Minute)
 }
 
@@ -43,6 +42,7 @@ func LoadSingleton() {
 
 // InitConfigFromPath 从给出的文件路径中加载配置
 func InitConfigFromPath(path string) {
+	Conf = &model.Config{}
 	err := Conf.Read(path)
 	if err != nil {
 		panic(err)