summaryrefslogtreecommitdiffstats
path: root/template/en
diff options
context:
space:
mode:
authorDave Lawrence <dlawrence@mozilla.com>2013-08-12 20:54:59 +0200
committerDave Lawrence <dlawrence@mozilla.com>2013-08-12 20:54:59 +0200
commitfaf5ee649261c08d8e9b1c8de8cb3cb6311c8b4b (patch)
treefa7fb1a507437ff8086789ae835d6459b08ede99 /template/en
parentc3de43ee18240e8364fae0e9caeeda8cdff8f986 (diff)
parente651ee9c34ca40afdd4582902c1656ea577a4fc3 (diff)
downloadbugzilla-faf5ee649261c08d8e9b1c8de8cb3cb6311c8b4b.tar.gz
bugzilla-faf5ee649261c08d8e9b1c8de8cb3cb6311c8b4b.tar.xz
merged with bugzilla/4.2
Diffstat (limited to 'template/en')
-rw-r--r--template/en/default/global/user-error.html.tmpl30
1 files changed, 15 insertions, 15 deletions
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index ce2dd8231..e85ecaada 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -1358,21 +1358,21 @@
[%+ constants.USER_PASSWORD_MIN_LENGTH FILTER html %] characters long.
[% ELSIF error == "password_not_complex" %]
- [% title = "Password Fails Requirements" %]
- [% passregex = Param('password_complexity') %]
- The password must contain at least one:
- <ul>
- [% IF passregex.search('letters') %]
- <li>UPPERCASE letter</li>
- <li>lowercase letter</li>
- [% END %]
- [% IF passregex.search('numbers') %]
- <li>digit</li>
- [% END %]
- [% IF passregex.search('specialchars') %]
- <li>special character</li>
- [% END %]
- </ul>
+ [% title = "Password Fails Requirements" %]
+ [% passregex = Param('password_complexity') %]
+ The password must contain at least one:
+ <ul>
+ [% IF passregex == 'letters_numbers_specialchars' %]
+ <li>letter</li>
+ <li>special character</li>
+ [% ELSIF passregex.search('letters') %]
+ <li>UPPERCASE letter</li>
+ <li>lowercase letter</li>
+ [% END %]
+ [% IF passregex.search('numbers') %]
+ <li>digit</li>
+ [% END %]
+ </ul>
[% ELSIF error == "password_not_complex" %]
[% title = "Password Fails Requirements" %]