diff options
Diffstat (limited to 'routers/web/auth')
| -rw-r--r-- | routers/web/auth/auth.go | 4 | ||||
| -rw-r--r-- | routers/web/auth/password.go | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/routers/web/auth/auth.go b/routers/web/auth/auth.go index ea5c7232a8..213b88903d 100644 --- a/routers/web/auth/auth.go +++ b/routers/web/auth/auth.go @@ -629,7 +629,7 @@ func handleUserCreated(ctx *context.Context, u *user_model.User, gothUser *goth. ctx.Data["IsSendRegisterMail"] = true ctx.Data["Email"] = u.Email - ctx.Data["ActiveCodeLives"] = timeutil.MinutesToFriendly(setting.Service.ActiveCodeLives, ctx.Locale.Language()) + ctx.Data["ActiveCodeLives"] = timeutil.MinutesToFriendly(setting.Service.ActiveCodeLives, ctx.Locale) ctx.HTML(http.StatusOK, TplActivate) if setting.CacheService.Enabled { @@ -658,7 +658,7 @@ func Activate(ctx *context.Context) { if setting.CacheService.Enabled && ctx.Cache.IsExist("MailResendLimit_"+ctx.Doer.LowerName) { ctx.Data["ResendLimited"] = true } else { - ctx.Data["ActiveCodeLives"] = timeutil.MinutesToFriendly(setting.Service.ActiveCodeLives, ctx.Locale.Language()) + ctx.Data["ActiveCodeLives"] = timeutil.MinutesToFriendly(setting.Service.ActiveCodeLives, ctx.Locale) mailer.SendActivateAccountMail(ctx.Locale, ctx.Doer) if setting.CacheService.Enabled { diff --git a/routers/web/auth/password.go b/routers/web/auth/password.go index c41c8bd1e5..c21ca9cf69 100644 --- a/routers/web/auth/password.go +++ b/routers/web/auth/password.go @@ -63,7 +63,7 @@ func ForgotPasswdPost(ctx *context.Context) { u, err := user_model.GetUserByEmail(email) if err != nil { if user_model.IsErrUserNotExist(err) { - ctx.Data["ResetPwdCodeLives"] = timeutil.MinutesToFriendly(setting.Service.ResetPwdCodeLives, ctx.Locale.Language()) + ctx.Data["ResetPwdCodeLives"] = timeutil.MinutesToFriendly(setting.Service.ResetPwdCodeLives, ctx.Locale) ctx.Data["IsResetSent"] = true ctx.HTML(http.StatusOK, tplForgotPassword) return @@ -93,7 +93,7 @@ func ForgotPasswdPost(ctx *context.Context) { } } - ctx.Data["ResetPwdCodeLives"] = timeutil.MinutesToFriendly(setting.Service.ResetPwdCodeLives, ctx.Locale.Language()) + ctx.Data["ResetPwdCodeLives"] = timeutil.MinutesToFriendly(setting.Service.ResetPwdCodeLives, ctx.Locale) ctx.Data["IsResetSent"] = true ctx.HTML(http.StatusOK, tplForgotPassword) } |