From 9911244cccf84f2757b8ab6f217afb22418b25e7 Mon Sep 17 00:00:00 2001
From: zhoupzh <zhoupzh@pcl.ac.cn>
Date: Fri, 25 Nov 2022 09:28:49 +0800
Subject: [PATCH] fix issue

---
 options/locale/locale_en-US.ini   |  5 ++++-
 options/locale/locale_zh-CN.ini   |  3 +++
 templates/user/auth/activate.tmpl | 10 +++++-----
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 9d097eeb0..1e03d5cd3 100755
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -389,9 +389,12 @@ authorize_application_created_by = This application was created by %s.
 authorize_application_description = If you grant the access, it will be able to access and write to all your account information, including private repos and organisations.
 authorize_title = Authorize "%s" to access your account?
 authorization_failed = Authorization failed
-authorization_failed_desc = The authorization failed because we detected an invalid request. Please contact the maintainer of the app you've tried to authorize.
+authorization_failed_desc = The authorization failed because we detected an invalid request. Please contact the maintainer of the app you have tried to authorize.
 disable_forgot_password_mail = Account recovery is disabled. Please contact your site administrator.
 sspi_auth_failed = SSPI authentication failed
+change_email = Change email
+change_email_address = Change email address
+new_email_address = New email address
 [phone]
 format_err=The format of phone number is wrong.
 query_err=Fail to query phone number, please try again later.
diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini
index e2a4bd6c4..b01fbad01 100755
--- a/options/locale/locale_zh-CN.ini
+++ b/options/locale/locale_zh-CN.ini
@@ -396,6 +396,9 @@ authorization_failed=授权失败
 authorization_failed_desc=授权失败，这是一个无效的请求。请联系尝试授权应用的管理员。
 disable_forgot_password_mail = Account recovery is disabled. Please contact your site administrator.
 sspi_auth_failed=SSPI 认证失败
+change_email=修改邮箱
+change_email_address=修改邮箱地址
+new_email_address=新邮箱地址
 [phone]
 format_err=手机号格式错误。
 query_err=查询手机号失败，请稍后再试。
diff --git a/templates/user/auth/activate.tmpl b/templates/user/auth/activate.tmpl
index 9b0aebb4a..bbeba8242 100644
--- a/templates/user/auth/activate.tmpl
+++ b/templates/user/auth/activate.tmpl
@@ -26,7 +26,7 @@
 							<p>{{.i18n.Tr "auth.has_unconfirmed_mail" .SignedUser.Name .SignedUser.Email | Str2html}}</p>
 							<div class="ui divider"></div>
 							<div class="text right">
-								<button type="button" class="ui blue button change">修改邮箱</button>
+								<button type="button" class="ui blue button change">{{.i18n.Tr "auth.change_email"}}</button>
 								<button class="ui blue button">{{.i18n.Tr "auth.resend_mail"}}</button>
 							</div>
 						{{end}}
@@ -38,7 +38,7 @@
 	<div>
         <div class="ui modal chang-email">
             <div class="header" style="padding: 1rem;background-color: rgba(240, 240, 240, 100);">
-                <h4>修改邮箱地址</h4>
+                <h4>{{.i18n.Tr "auth.change_email_address"}}</h4>
             </div>
 			<form id="formId" action="{{AppSubUrl}}/user/update_email" method="POST" class="ui form">
 				<div class="content content-padding">
@@ -46,13 +46,13 @@
 						</div>
 						{{$.CsrfTokenHtml}}
 						<div class="inline required field">
-							<label>新邮箱地址</label>
+							<label>{{.i18n.Tr "auth.new_email_address"}}</label>
 							<input style="width: 80%;" id="label" name="NewEmail" maxlength="255" value="{{.SignedUser.Email}}">
 						</div>
 				</div>
 				<div class="center actions">
-					<button class="ui green button">确定</button>
-					<div class="ui deny button">取消</div>
+					<button class="ui green button">{{.i18n.Tr "repo.confirm_choice"}}</button>
+					<div class="ui deny button">{{.i18n.Tr "cancel"}}</div>
 				</div>
 			</form>
         </div>