Merged r3341 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/0.9-stable@3345 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/views/account/password_recovery.rhtml b/app/views/account/password_recovery.rhtml
index 7fdd2b2fd9ff756389fe22de0df3ba84a3e13ec7..e265ca8fc2ac47ce18eaef079389097312d16202 100644 (file)
--- a/app/views/account/password_recovery.rhtml
+++ b/app/views/account/password_recovery.rhtml
@@ -6,7 +6,7 @@
 <div class="box tabular">
 <p><label for="new_password"><%=l(:field_new_password)%> <span class="required">*</span></label>
 <%= password_field_tag 'new_password', nil, :size => 25 %><br />
-<em><%= l(:text_caracters_minimum, 4) %></em></p>
+<em><%= l(:text_caracters_minimum, :count => Setting.password_min_length) %></em></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>