From 26913cee0717b63ddc350241370b0f49c82a36c9 Mon Sep 17 00:00:00 2001
From: Sunil Joshi <joshi_sunil@in.com>
Date: Fri, 2 May 2014 13:26:19 +0100
Subject: Bug 927452 - When creating a new user account, the requirements for
 the password should be displayed. r=gerv, a=justdave.

---
 template/en/default/account/email/confirm-new.html.tmpl | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'template/en/default')

diff --git a/template/en/default/account/email/confirm-new.html.tmpl b/template/en/default/account/email/confirm-new.html.tmpl
index 095097698..3b9866004 100644
--- a/template/en/default/account/email/confirm-new.html.tmpl
+++ b/template/en/default/account/email/confirm-new.html.tmpl
@@ -17,6 +17,8 @@
            title = title
 %]
 
+[% 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
@@ -39,7 +41,15 @@
       <th><label for="passwd1">Type your password</label>:</th>
       <td>
         <input type="password" id="passwd1" name="passwd1" value="" required>
-        (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>
-- 
cgit v1.2.3-24-g4f1b