From b8ecdca238744552db04acb5450ce078d9760a4c Mon Sep 17 00:00:00 2001 From: Simon Green Date: Thu, 11 Sep 2014 09:45:23 +1000 Subject: Bug 1009013 - Require a user to change their password if they log in and their current password does not meet the password complexity rules r=glob, a=sgreen --- template/en/default/global/user-error.html.tmpl | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'template/en/default/global') diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl index 48cbcad47..055bde3d4 100644 --- a/template/en/default/global/user-error.html.tmpl +++ b/template/en/default/global/user-error.html.tmpl @@ -1459,18 +1459,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 - request a new password 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 + request a new password in order to log in again. + [% END %] [% ELSIF error == "password_not_complex" %] [% title = "Password Fails Requirements" %] @@ -1488,6 +1484,10 @@
  • digit
    • [% END %] + [% IF locked_user %] + You must + request a new password in order to log in again. + [% END %] [% ELSIF error == "product_access_denied" %] [% title = "Product Access Denied" %] -- cgit v1.2.3-24-g4f1b