Bug 1171963: account/email/confirm-new.html.tmpl should describe the current password complexity setting to new user just like the forgotten password form

1 files changed, 11 insertions, 1 deletions

diff --git a/template/en/default/account/email/confirm-new.html.tmpl b/template/en/default/account/email/confirm-new.html.tmpl
index a677db796..3241030e8 100644
--- a/template/en/default/account/email/confirm-new.html.tmpl
+++ b/template/en/default/account/email/confirm-new.html.tmpl
@@ -24,6 +24,8 @@
            title = title
            onload = "document.forms['confirm_account_form'].realname.focus();" %]
 
+[% password_complexity = Param('password_complexity') %]
+
 <p>
   To create your account, you must enter a password in the form below.
   Your email address and Real Name (if provided) will be shown with
@@ -46,7 +48,15 @@
       <th align="right"><label for="passwd1">Type your password</label>:</th>
       <td>
         <input type="password" id="passwd1" name="passwd1" value="">
-        (minimum [% constants.USER_PASSWORD_MIN_LENGTH FILTER none %] characters)
+        (Password should be a minimum of [% constants.USER_PASSWORD_MIN_LENGTH FILTER none %] characters long
+        [% IF password_complexity == "mixed_letters" %]
+          and must contain at least one UPPER and one lowercase letter
+        [% ELSIF password_complexity == "letters_numbers" %]
+          and must contain at least one UPPER and one lowercase letter and a number
+        [% ELSIF password_complexity == "letters_numbers_specialchars" %]
+          and must contain at least one letter, a number and a special character
+        [% END ~%]
+        .)
       </td>
     </tr>
     <tr>