From 17594c6f50f1eba87c64c5034f531b52b07eee0d Mon Sep 17 00:00:00 2001
From: lewis <747342561@qq.com>
Date: Tue, 17 Aug 2021 18:01:53 +0800
Subject: [PATCH] mod

---
 modules/timeutil/since.go       | 0
 options/locale/locale_zh-CN.ini | 2 +-
 services/mailer/mail.go         | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 modules/timeutil/since.go
 mode change 100644 => 100755 services/mailer/mail.go

diff --git a/modules/timeutil/since.go b/modules/timeutil/since.go
old mode 100644
new mode 100755
diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini
index 9dd2d254b..5ac54f6c8 100755
--- a/options/locale/locale_zh-CN.ini
+++ b/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 个月
diff --git a/services/mailer/mail.go b/services/mailer/mail.go
old mode 100644
new mode 100755
index dd5af445b..e4a210fd3
--- a/services/mailer/mail.go
+++ b/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,
 	}