summaryrefslogtreecommitdiffstats
path: root/template/en/default
diff options
context:
space:
mode:
Diffstat (limited to 'template/en/default')
-rw-r--r--template/en/default/admin/params/auth.html.tmpl8
-rw-r--r--template/en/default/global/user-error.html.tmpl16
2 files changed, 15 insertions, 9 deletions
diff --git a/template/en/default/admin/params/auth.html.tmpl b/template/en/default/admin/params/auth.html.tmpl
index 7a8d34791..85d707706 100644
--- a/template/en/default/admin/params/auth.html.tmpl
+++ b/template/en/default/admin/params/auth.html.tmpl
@@ -143,5 +143,11 @@
"lower case letter and a number.</li>" _
"<li>letters_numbers_specialchars - Passwords must contain at least one " _
"UPPER or one lower case letter, a number and a special character.</li></ul>"
- }
+ },
+
+ password_check_on_login =>
+ "If set, $terms.Bugzilla will check that the password meets the current " _
+ "complexity rules and minimum length requirements when the user logs " _
+ "into the $terms.Bugzilla web interface. If it doesn't, the user would " _
+ "not be able to log in, and recieve a message to reset their password."
%]
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index 938c4d44d..250ab0e1d 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -1412,18 +1412,14 @@
[% title = "Passwords Don't Match" %]
The two passwords you entered did not match.
- [% ELSIF error == "password_current_too_short" %]
- [% title = "New Password Required" %]
- Your password is currently less than
- [%+ constants.USER_PASSWORD_MIN_LENGTH FILTER html %] characters long,
- which is the new minimum length required for passwords.
- You must <a href="token.cgi?a=reqpw&amp;loginname=[% locked_user.email FILTER uri %]">
- request a new password</a> in order to log in again.
-
[% ELSIF error == "password_too_short" %]
[% title = "Password Too Short" %]
The password must be at least
[%+ constants.USER_PASSWORD_MIN_LENGTH FILTER html %] characters long.
+ [% IF locked_user %]
+ You must <a href="token.cgi?a=reqpw&amp;loginname=[% locked_user.email FILTER uri %]&amp;token=[% issue_hash_token(['reqpw']) FILTER uri %]">
+ request a new password</a> in order to log in again.
+ [% END %]
[% ELSIF error == "password_not_complex" %]
[% title = "Password Fails Requirements" %]
@@ -1441,6 +1437,10 @@
<li>digit</li>
[% END %]
</ul>
+ [% IF locked_user %]
+ You must <a href="token.cgi?a=reqpw&amp;loginname=[% locked_user.email FILTER uri %]&amp;token=[% issue_hash_token(['reqpw']) FILTER uri %]">
+ request a new password</a> in order to log in again.
+ [% END %]
[% ELSIF error == "password_not_complex" %]
[% title = "Password Fails Requirements" %]