#3298 fix-2775-v1

Merged
liuzx merged 3 commits from fix-2775-v1 into V20221130 1 year ago
  1. +1
    -0
      options/locale/locale_en-US.ini
  2. +1
    -0
      options/locale/locale_zh-CN.ini
  3. +2
    -2
      templates/user/auth/activate.tmpl

+ 1
- 0
options/locale/locale_en-US.ini View File

@@ -393,6 +393,7 @@ openid_register_desc = The chosen OpenID URI is unknown. Associate it with a new
openid_signin_desc = Enter your OpenID URI. For example: https://anne.me, bob.openid.org.cn or gnusocial.net/carry.
disable_forgot_password_mail = Account recovery is disabled. Please contact your site administrator.
email_domain_blacklisted = You cannot register with this kind of email address.
email_domain_blacklisted_change = This type of email address is not currently supported.
authorize_application = Authorize Application
authorize_redirect_notice = You will be redirected to %s if you authorize this application.
authorize_application_created_by = This application was created by %s.


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

@@ -396,6 +396,7 @@ openid_register_desc=所选的 OpenID URI 未知。在这里关联一个新帐
openid_signin_desc=输入您的 OpenID URI。例如: https://anne.me、bob.openid.org.cn 或 gnusocial.net/carry。
disable_forgot_password_mail=帐户恢复功能已被禁用。请与网站管理员联系。
email_domain_blacklisted=暂不支持此类电子邮件地址注册。
email_domain_blacklisted_change=暂不支持此类电子邮件地址。
authorize_application=应用授权
authorize_redirect_notice=如果您授权此应用,您将会被重定向到 %s。
authorize_application_created_by=此应用由%s创建。


+ 2
- 2
templates/user/auth/activate.tmpl View File

@@ -52,7 +52,7 @@
<div class="inline required field">
<label>{{.i18n.Tr "auth.new_email_address"}}</label>
<input type="email" style="width: 80%;" id="email" name="NewEmail" maxlength="255" value="{{.SignedUser.Email}}"
pattern="([a-zA-Z0-9_-])+@(163\.com|126\.com|qq\.com|yahoo\.com|sina\.com|sina\.cn|outlook\.com|pcl\.ac\.cn|foxmail\.com|ict\.ac\.cn|21cn\.com|yeah\.net|139\.com)">
pattern="([a-zA-Z0-9_-])+@(163\.com|126\.com|qq\.com|yahoo\.com|sina\.com|sina\.cn|outlook\.com|pcl\.ac\.cn|foxmail\.com|ict\.ac\.cn|21cn\.com|yeah\.net|139\.com)" required>
</div>
</div>
<div class="center actions">
@@ -72,7 +72,7 @@
$('.ui.dimmer').css({ "background-color": "rgb(136, 136, 136,0.7)" })
let emailInput=document.getElementById("email");
emailInput.oninvalid = function () {
this.setCustomValidity('{{.i18n.Tr "auth.email_domain_blacklisted"}}')
this.setCustomValidity('{{.i18n.Tr "auth.email_domain_blacklisted_change"}}')
}
emailInput.oninput = function(){
this.setCustomValidity('')


Loading…
Cancel
Save