Skip to content

Changed text when password reset disabled. #1364

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 22, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions options/locale/locale_en-US.ini
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,7 @@ openid_connect_desc = The entered OpenID URIs is not know by the system, here yo
openid_register_title = Create new account
openid_register_desc = The entered OpenID URIs is not know by the system, here you can associate it to a new account.
openid_signin_desc = Example URIs: https://anne.me, bob.openid.org.cn, gnusocial.net/carry
disable_forgot_password_mail = Sorry, password reset has been disabled. Please contact the site administrator.

[mail]
activate_account = Please activate your account
Expand Down
2 changes: 1 addition & 1 deletion templates/user/auth/forgot_passwd.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<button class="ui blue button">{{.i18n.Tr "auth.send_reset_mail"}}</button>
</div>
{{else if .IsResetDisable}}
<p class="center">{{.i18n.Tr "auth.disable_register_mail"}}</p>
<p class="center">{{.i18n.Tr "auth.disable_forgot_password_mail"}}</p>
{{else if .ResendLimited}}
<p class="center">{{.i18n.Tr "auth.resent_limit_prompt"}}</p>
{{end}}
Expand Down