Browse Source

Merge pull request '#139 补充修改' (#266) from unified-mail-format into V202108

Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/266
Reviewed-by: avadesian <xuchx@pcl.ac.cn>
pull/268/head
avadesian 3 years ago
parent
commit
3e92d18e48
3 changed files with 2 additions and 2 deletions
  1. +0
    -0
      modules/timeutil/since.go
  2. +1
    -1
      options/locale/locale_zh-CN.ini
  3. +1
    -1
      services/mailer/mail.go

+ 0
- 0
modules/timeutil/since.go View File


+ 1
- 1
options/locale/locale_zh-CN.ini View File

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


+ 1
- 1
services/mailer/mail.go View File

@@ -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,
}


Loading…
Cancel
Save