summaryrefslogtreecommitdiffstats
path: root/app/views/my/password.html.erb
diff options
context:
space:
mode:
Diffstat (limited to 'app/views/my/password.html.erb')
-rw-r--r--app/views/my/password.html.erb6
1 files changed, 5 insertions, 1 deletions
diff --git a/app/views/my/password.html.erb b/app/views/my/password.html.erb
index 7a411e51a..4e123db48 100644
--- a/app/views/my/password.html.erb
+++ b/app/views/my/password.html.erb
@@ -9,7 +9,11 @@
<p><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></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><label for="new_password_confirmation"><%=l(:field_password_confirmation)%> <span class="required">*</span></label>
<%= password_field_tag 'new_password_confirmation', nil, :size => 25 %></p>