diff options
Diffstat (limited to 'app/views/account')
| -rw-r--r-- | app/views/account/password_recovery.html.erb | 3 | ||||
| -rw-r--r-- | app/views/account/register.html.erb | 7 |
2 files changed, 8 insertions, 2 deletions
diff --git a/app/views/account/password_recovery.html.erb b/app/views/account/password_recovery.html.erb index 24da8223b..0c275b476 100644 --- a/app/views/account/password_recovery.html.erb +++ b/app/views/account/password_recovery.html.erb @@ -9,6 +9,9 @@ <label for="new_password"><%=l(:field_new_password)%> <span class="required">*</span></label> <%= password_field_tag 'new_password', nil, :size => 25 %> <em class="info"><%= l(:text_caracters_minimum, :count => Setting.password_min_length) %></em> + <% if Setting.password_required_char_classes.any? %> + <em class="info"><%= l(:text_characters_must_contain, :character_classes => Setting.password_required_char_classes.collect{|c| l("label_password_char_class_#{c}")}.join(", ")) %></em> + <% end %> </p> <p> diff --git a/app/views/account/register.html.erb b/app/views/account/register.html.erb index ade00adfc..f35e0e0cc 100644 --- a/app/views/account/register.html.erb +++ b/app/views/account/register.html.erb @@ -8,8 +8,11 @@ <p><%= f.text_field :login, :size => 25, :required => true %></p> <p><%= f.password_field :password, :size => 25, :required => true %> - <em class="info"><%= l(:text_caracters_minimum, :count => Setting.password_min_length) %></em></p> - + <em class="info"><%= l(:text_caracters_minimum, :count => Setting.password_min_length) %></em> + <% if Setting.password_required_char_classes.any? %> + <em class="info"><%= l(:text_characters_must_contain, :character_classes => Setting.password_required_char_classes.collect{|c| l("label_password_char_class_#{c}")}.join(", ")) %></em> + <% end %> + </p> <p><%= f.password_field :password_confirmation, :size => 25, :required => true %></p> <% end %> |