diff --git a/web/controller/server.go b/web/controller/server.go index 5cc8087c..d59b3400 100644 --- a/web/controller/server.go +++ b/web/controller/server.go @@ -68,7 +68,7 @@ func (a *ServerController) getXrayVersion(c *gin.Context) { versions, err := a.serverService.GetXrayVersions() if err != nil { - jsonMsg(c, "获取版本", err) + jsonMsg(c, I18n(c , "getVersion"), err) return } @@ -81,5 +81,5 @@ func (a *ServerController) getXrayVersion(c *gin.Context) { func (a *ServerController) installXray(c *gin.Context) { version := c.Param("version") err := a.serverService.UpdateXray(version) - jsonMsg(c, "安装 xray", err) + jsonMsg(c, I18n(c , "install") + " xray", err) } diff --git a/web/controller/setting.go b/web/controller/setting.go index 6e9aaff1..f500c76d 100644 --- a/web/controller/setting.go +++ b/web/controller/setting.go @@ -40,7 +40,7 @@ func (a *SettingController) initRouter(g *gin.RouterGroup) { func (a *SettingController) getAllSetting(c *gin.Context) { allSetting, err := a.settingService.GetAllSetting() if err != nil { - jsonMsg(c, "获取设置", err) + jsonMsg(c, I18n(c , "pages.setting.toasts.getSetting"), err) return } jsonObj(c, allSetting, nil) @@ -50,27 +50,27 @@ func (a *SettingController) updateSetting(c *gin.Context) { allSetting := &entity.AllSetting{} err := c.ShouldBind(allSetting) if err != nil { - jsonMsg(c, "修改设置", err) + jsonMsg(c, I18n(c , "pages.setting.toasts.modifySetting"), err) return } err = a.settingService.UpdateAllSetting(allSetting) - jsonMsg(c, "修改设置", err) + jsonMsg(c, I18n(c , "pages.setting.toasts.modifySetting"), err) } func (a *SettingController) updateUser(c *gin.Context) { form := &updateUserForm{} err := c.ShouldBind(form) if err != nil { - jsonMsg(c, "修改用户", err) + jsonMsg(c, I18n(c , "pages.setting.toasts.modifySetting"), err) return } user := session.GetLoginUser(c) if user.Username != form.OldUsername || user.Password != form.OldPassword { - jsonMsg(c, "修改用户", errors.New("原用户名或原密码错误")) + jsonMsg(c, I18n(c , "pages.setting.toasts.modifyUser"), errors.New(I18n(c , "pages.setting.toasts.originalUserPassIncorrect"))) return } if form.NewUsername == "" || form.NewPassword == "" { - jsonMsg(c, "修改用户", errors.New("新用户名和新密码不能为空")) + jsonMsg(c,I18n(c , "pages.setting.toasts.modifyUser"), errors.New(I18n(c , "pages.setting.toasts.userPassMustBeNotEmpty"))) return } err = a.userService.UpdateUser(user.Id, form.NewUsername, form.NewPassword) @@ -79,10 +79,10 @@ func (a *SettingController) updateUser(c *gin.Context) { user.Password = form.NewPassword session.SetLoginUser(c, user) } - jsonMsg(c, "修改用户", err) + jsonMsg(c, I18n(c , "pages.setting.toasts.modifyUser"), err) } func (a *SettingController) restartPanel(c *gin.Context) { err := a.panelService.RestartPanel(time.Second * 3) - jsonMsg(c, "重启面板", err) + jsonMsg(c, I18n(c , "pages.setting.restartPanel"), err) } diff --git a/web/translation/translate.en_US.toml b/web/translation/translate.en_US.toml index 06d40756..637a6377 100644 --- a/web/translation/translate.en_US.toml +++ b/web/translation/translate.en_US.toml @@ -39,8 +39,8 @@ "certificate" = "certificat" "fail" = "fail" "success" = "success" - - +"getVersion" = "get version" +"install" = "install" [menu] "dashboard" = "System Status" @@ -164,5 +164,9 @@ "timeZonee" = "Time Zone" "timeZoneDesc" = "The scheduled task runs according to the time in the time zone, and restarts the panel to take effect" - - +[pages.setting.toasts] +"modifySetting" = "modify setting" +"getSetting" = "get setting" +"modifyUser" = "modify user" +"originalUserPassIncorrect" = "The original user name or original password is incorrect" +"userPassMustBeNotEmpty" = "New username and new password cannot be empty" \ No newline at end of file diff --git a/web/translation/translate.zh_Hans.toml b/web/translation/translate.zh_Hans.toml index a4e52f5b..bf0f2e19 100644 --- a/web/translation/translate.zh_Hans.toml +++ b/web/translation/translate.zh_Hans.toml @@ -37,8 +37,10 @@ "additional" = "额外" "monitor" = "监听" "certificate" = "证书" -"fail" : "失败" +"fail" = "失败" "success" = "成功" +"getVersion" = "获取版本" +"install" = "安装" [menu] "dashboard" = "系统状态" @@ -160,4 +162,12 @@ "telegramNotifyTime" = "电报机器人通知时间" "telegramNotifyTimeDesc" = "采用Crontab定时格式,重启面板生效" "timeZonee" = "时区" -"timeZoneDesc" = "定时任务按照该时区的时间运行,重启面板生效" \ No newline at end of file +"timeZoneDesc" = "定时任务按照该时区的时间运行,重启面板生效" + +[pages.setting.toasts] +"modifySetting" = "修改设置" +"getSetting" = "获取设置" +"modifyUser" = "修改用户" +"originalUserPassIncorrect" = "原用户名或原密码错误" +"userPassMustBeNotEmpty" = "新用户名和新密码不能为空" +