diff --git a/web/controller/index.go b/web/controller/index.go index 77c1b520..e0be6076 100644 --- a/web/controller/index.go +++ b/web/controller/index.go @@ -46,15 +46,15 @@ func (a *IndexController) login(c *gin.Context) { var form LoginForm err := c.ShouldBind(&form) if err != nil { - pureJsonMsg(c, false, "数据格式错误") + pureJsonMsg(c, false, I18n(c , "pages.login.toasts.invalidFormData")) return } if form.Username == "" { - pureJsonMsg(c, false, "请输入用户名") + pureJsonMsg(c, false, I18n(c, "pages.login.toasts.emptyUsername")) return } if form.Password == "" { - pureJsonMsg(c, false, "请输入密码") + pureJsonMsg(c, false, I18n(c , "pages.login.toasts.emptyPassword")) return } user := a.userService.CheckUser(form.Username, form.Password) @@ -62,7 +62,7 @@ func (a *IndexController) login(c *gin.Context) { if user == nil { job.NewStatsNotifyJob().UserLoginNotify(form.Username, getRemoteIp(c), timeStr, 0) logger.Infof("wrong username or password: \"%s\" \"%s\"", form.Username, form.Password) - pureJsonMsg(c, false, "用户名或密码错误") + pureJsonMsg(c, false, I18n(c , "pages.login.toasts.wrongUsernameOrPassword")) return } else { logger.Infof("%s login success,Ip Address:%s\n", form.Username, getRemoteIp(c)) @@ -71,7 +71,7 @@ func (a *IndexController) login(c *gin.Context) { err = session.SetLoginUser(c, user) logger.Info("user", user.Id, "login success") - jsonMsg(c, "登录", err) + jsonMsg(c, I18n(c , "pages.login.toasts.successLogin"), err) } func (a *IndexController) logout(c *gin.Context) { diff --git a/web/translation/translate.en_US.toml b/web/translation/translate.en_US.toml index 54537219..9d313197 100644 --- a/web/translation/translate.en_US.toml +++ b/web/translation/translate.en_US.toml @@ -21,6 +21,14 @@ [pages.login] "title" = "Login" +[pages.login.toasts] +"invalidFormData" = "Input Data Format Is Invalid" +"emptyUsername" = "please Enter Username" +"emptyPassword" = "please Enter Password" +"wrongUsernameOrPassword" = "invalid username or password" +"successLogin" = "Login" + + [pages.index] "title" = "system status" diff --git a/web/translation/translate.zh_Hans.toml b/web/translation/translate.zh_Hans.toml index e693676b..62aae635 100644 --- a/web/translation/translate.zh_Hans.toml +++ b/web/translation/translate.zh_Hans.toml @@ -21,6 +21,13 @@ [pages.login] "title" = "登录" +[pages.login.toasts] +"invalidFormData" = "数据格式错误" +"emptyUsername" = "请输入用户名" +"emptyPassword" = "请输入密码" +"wrongUsernameOrPassword" = "用户名或密码错误" +"successLogin" = "登录" + [pages.index] "title" = "系统状态" diff --git a/web/translation/translate.zh_Hant.toml b/web/translation/translate.zh_Hant.toml index df432c42..df28719f 100644 --- a/web/translation/translate.zh_Hant.toml +++ b/web/translation/translate.zh_Hant.toml @@ -21,6 +21,13 @@ [pages.login] "title" = "登錄" +[pages.login.toasts] +"invalidFormData" = "数据格式错误" +"emptyUsername" = "请输入用户名" +"emptyPassword" = "请输入密码" +"wrongUsernameOrPassword" = "用户名或密码错误" +"successLogin" = "登录" + [pages.index] "title" = "系统状态"