From 638c8ded10fbaf6421c1e7c2763ea5c83a31868a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=96stanb=C3=A4ck?= <jonas.ostanback@gmail.com>
Date: Wed, 22 Mar 2017 11:27:12 +0100
Subject: [PATCH] Changed text when password reset disabled. Fixes #1340

---
 options/locale/locale_en-US.ini        | 1 +
 templates/user/auth/forgot_passwd.tmpl | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 829c460619660..631184d203a83 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -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
diff --git a/templates/user/auth/forgot_passwd.tmpl b/templates/user/auth/forgot_passwd.tmpl
index 77de5fceeac1b..86a98fcf1068c 100644
--- a/templates/user/auth/forgot_passwd.tmpl
+++ b/templates/user/auth/forgot_passwd.tmpl
@@ -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}}