mod

options/locale/locale_zh-CN.ini

@@ -2435,7 +2435,7 @@ future=将来
 1y=1年
 seconds=%d 秒
 minutes=%d 分钟
-hours=%d hours
+hours=%d 小时
 days=%d 天
 weeks=%d 周
 months=%d 个月

services/mailer/mail.go

@@ -59,7 +59,7 @@ func SendTestMail(email string) error {
 func SendUserMail(language string, u *models.User, tpl base.TplName, code, subject, info string) {
 	data := map[string]interface{}{
 		"DisplayName":       u.DisplayName(),
-		"ActiveCodeLives":   timeutil.MinutesToFriendly(setting.Service.ActiveCodeLives, language),
+		"ActiveCodeLives":   timeutil.MinutesToFriendly(setting.Service.ActiveCodeLives, "en-US"),
 		"ResetPwdCodeLives": timeutil.MinutesToFriendly(setting.Service.ResetPwdCodeLives, language),
 		"Code":              code,
 	}