Makes minimum password length configurable.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2678 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/models/user.rb b/app/models/user.rb
index 63393a6d537d6d81719a7818ebfe70805a166a09..3c9a1c753e065c5afe7b89d6b1827a820f01cd80 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -62,7 +62,6 @@ class User < ActiveRecord::Base
   validates_length_of :firstname, :lastname, :maximum => 30
   validates_format_of :mail, :with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i, :allow_nil => true
   validates_length_of :mail, :maximum => 60, :allow_nil => true
-  validates_length_of :password, :minimum => 4, :allow_nil => true
   validates_confirmation_of :password, :allow_nil => true
 
   def before_create
@@ -297,7 +296,17 @@ class User < ActiveRecord::Base
     anonymous_user
   end
   
-private
+  protected
+  
+  def validate
+    # Password length validation based on setting
+    if !password.nil? && password.size < Setting.password_min_length.to_i
+      errors.add(:password, :too_short, :count => Setting.password_min_length.to_i)
+    end
+  end
+  
+  private
+  
   # Return password digest
   def self.hash_password(clear_password)
     Digest::SHA1.hexdigest(clear_password || "")

diff --git a/app/views/account/register.rhtml b/app/views/account/register.rhtml
index f9f388ae4fbe54bebd8770bfc27689702a16f94d..8498d1354dd228cc9d97d5d16f4001b2467fb51d 100644 (file)
--- a/app/views/account/register.rhtml
+++ b/app/views/account/register.rhtml
@@ -11,7 +11,7 @@
 
 <p><label for="password"><%=l(:field_password)%> <span class="required">*</span></label>
 <%= password_field_tag '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="password_confirmation"><%=l(:field_password_confirmation)%> <span class="required">*</span></label>
 <%= password_field_tag 'password_confirmation', nil, :size => 25  %></p>

diff --git a/app/views/my/password.rhtml b/app/views/my/password.rhtml
index 2e9fd0fa466dee89cfdd112fa472a758b69d3ab2..cac79342c0ebaecf8b609e391ceb8403817f8534 100644 (file)
--- a/app/views/my/password.rhtml
+++ b/app/views/my/password.rhtml
@@ -9,7 +9,7 @@
 
 <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>

diff --git a/app/views/settings/_authentication.rhtml b/app/views/settings/_authentication.rhtml
index ec8a0be965603814ac95b85acd1c76bf5af059be..25d344da6a29ae9714e92f2a28d8a28465831af8 100644 (file)
--- a/app/views/settings/_authentication.rhtml
+++ b/app/views/settings/_authentication.rhtml
@@ -15,6 +15,9 @@
                            [l(:label_registration_automatic_activation), "3"]
                           ], Setting.self_registration ) %></p>
 
+<p><label><%= l(:setting_password_min_length) %></label>
+<%= text_field_tag 'settings[password_min_length]', Setting.password_min_length, :size => 6 %></p>
+
 <p><label><%= l(:label_password_lost) %></label>
 <%= check_box_tag 'settings[lost_password]', 1, Setting.lost_password? %><%= hidden_field_tag 'settings[lost_password]', 0 %></p>
 

diff --git a/app/views/users/_form.rhtml b/app/views/users/_form.rhtml
index 90d6ba577dc7b52c1464ef533962d2c100143fe4..24e0b912be492c41ad31355698aef7b779e17d02 100644 (file)
--- a/app/views/users/_form.rhtml
+++ b/app/views/users/_form.rhtml
@@ -27,7 +27,7 @@
 <div id="password_fields" style="<%= 'display:none;' if @user.auth_source %>">
 <p><label for="password"><%=l(:field_password)%><span class="required"> *</span></label>
 <%= password_field_tag '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="password_confirmation"><%=l(:field_password_confirmation)%><span class="required"> *</span></label>
 <%= password_field_tag 'password_confirmation', nil, :size => 25  %></p>
 </div>

diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 500cc5713c19fda5dab3d3683644326fcabcfd12..0426bd193dfe184a72daff7afd1888fb3d40dd9a 100644 (file)
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -788,3 +788,4 @@ bg:
   text_wiki_page_reassign_children: Reassign child pages to this parent page
   text_wiki_page_nullify_children: Keep child pages as root pages
   text_wiki_page_destroy_children: Delete child pages and all their descendants
+  setting_password_min_length: Minimum password length

diff --git a/config/locales/bs.yml b/config/locales/bs.yml
index a064372efe9c6cac3a9fb0b8051fbd7f5a8ebb1a..3a4fe13e29cbf20dcbccf5f508ad7ba71ed495de 100644 (file)
--- a/config/locales/bs.yml
+++ b/config/locales/bs.yml
@@ -821,3 +821,4 @@ bs:
   text_wiki_page_reassign_children: Reassign child pages to this parent page\r
   text_wiki_page_nullify_children: Keep child pages as root pages\r
   text_wiki_page_destroy_children: Delete child pages and all their descendants\r
+  setting_password_min_length: Minimum password length\r

diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 8d435241d315bc871c6ec29b40c283394de73fcc..75c2690806f9bbf54ecfb880cc26bd0f2647c691 100644 (file)
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -791,3 +791,4 @@ ca:
   text_wiki_page_reassign_children: Reassign child pages to this parent page
   text_wiki_page_nullify_children: Keep child pages as root pages
   text_wiki_page_destroy_children: Delete child pages and all their descendants
+  setting_password_min_length: Minimum password length

diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index ab8f27fc85cd2ae45927dfd8e51d1b66797ec713..c6cb412d1148cb0bef6f1eb93582e26587a00b44 100644 (file)
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -794,3 +794,4 @@ cs:
   text_wiki_page_reassign_children: Reassign child pages to this parent page
   text_wiki_page_nullify_children: Keep child pages as root pages
   text_wiki_page_destroy_children: Delete child pages and all their descendants
+  setting_password_min_length: Minimum password length

diff --git a/config/locales/da.yml b/config/locales/da.yml
index 704c5e4e8657b3fac5feb186030b1daa8137c042..ec4a81256f4134c832fb1ed2c0fadcb875f6dea3 100644 (file)
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -821,3 +821,4 @@ da:
   text_wiki_page_reassign_children: Reassign child pages to this parent page
   text_wiki_page_nullify_children: Keep child pages as root pages
   text_wiki_page_destroy_children: Delete child pages and all their descendants
+  setting_password_min_length: Minimum password length

diff --git a/config/locales/de.yml b/config/locales/de.yml
index 3f9cd17a662345ea30332b3a2ce38fa78bea467c..9628f5819dd34e511553b2b3b18ecd223bc6caea 100644 (file)
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -820,3 +820,4 @@ de:
   text_wiki_page_reassign_children: Reassign child pages to this parent page
   text_wiki_page_nullify_children: Keep child pages as root pages
   text_wiki_page_destroy_children: Delete child pages and all their descendants
+  setting_password_min_length: Minimum password length

diff --git a/config/locales/en.yml b/config/locales/en.yml
index fd1ed6c51ac44d6d44fcb13b47e5036e6e5d198a..85576603929bb3270d3a91f93e745b359d482a84 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -285,6 +285,7 @@ en:
   setting_file_max_size_displayed: Max size of text files displayed inline
   setting_repository_log_display_limit: Maximum number of revisions displayed on file log
   setting_openid: Allow OpenID login and registration
+  setting_password_min_length: Minimum password length
   
   permission_edit_project: Edit project
   permission_select_project_modules: Select project modules

diff --git a/config/locales/es.yml b/config/locales/es.yml
index c37b96c64f518f68a747115109434a20267ad9ee..c82b3ac50d8aad6829e8eff15be00a6eba7a3c0a 100644 (file)
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -841,3 +841,4 @@ es:
   text_wiki_page_reassign_children: Reassign child pages to this parent page
   text_wiki_page_nullify_children: Keep child pages as root pages
   text_wiki_page_destroy_children: Delete child pages and all their descendants
+  setting_password_min_length: Minimum password length

diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 9c35cb4499063d582b152fd46008347cea0038fa..572d25c852ab29ac9011740ba2349e92ddf48c54 100644 (file)
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -831,3 +831,4 @@ fi:
   text_wiki_page_reassign_children: Reassign child pages to this parent page
   text_wiki_page_nullify_children: Keep child pages as root pages
   text_wiki_page_destroy_children: Delete child pages and all their descendants
+  setting_password_min_length: Minimum password length

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index ddd349c69f64462b8e7e481348b63ccc762a78e9..9d6aad12270c8ef92840dc55b20e559d011283e2 100644 (file)
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -317,6 +317,7 @@ fr:
   setting_file_max_size_displayed: Taille maximum des fichiers texte affichés en ligne
   setting_repository_log_display_limit: "Nombre maximum de revisions affichées sur l'historique d'un fichier"
   setting_openid: "Autoriser l'authentification et l'enregistrement OpenID"
+  setting_password_min_length: Longueur minimum des mots de passe
   
   permission_edit_project: Modifier le projet
   permission_select_project_modules: Choisir les modules

diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 9ccd9574ee4be1180ce9dbfee834f365ba72ded4..8e5b980011ebb91ad8fe2e2356368314607cd272 100644 (file)
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -820,3 +820,4 @@ gl:
   text_wiki_page_reassign_children: Reassign child pages to this parent page
   text_wiki_page_nullify_children: Keep child pages as root pages
   text_wiki_page_destroy_children: Delete child pages and all their descendants
+  setting_password_min_length: Minimum password length

diff --git a/config/locales/he.yml b/config/locales/he.yml
index 4941240b7ffd6bf4275f6646133449e4819a109a..40ae33a7f6010b6676d638bee55c3b5700c5ac14 100644 (file)
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -803,3 +803,4 @@ he:
   text_wiki_page_reassign_children: Reassign child pages to this parent page
   text_wiki_page_nullify_children: Keep child pages as root pages
   text_wiki_page_destroy_children: Delete child pages and all their descendants
+  setting_password_min_length: Minimum password length

diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index a4ac468e784e60389f485cd34fd4cd8b6068e118..ece1d11b7c75099cef50212f44b8b26835e71bde 100644 (file)
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -826,3 +826,4 @@
   text_wiki_page_reassign_children: Reassign child pages to this parent page
   text_wiki_page_nullify_children: Keep child pages as root pages
   text_wiki_page_destroy_children: Delete child pages and all their descendants
+  setting_password_min_length: Minimum password length

diff --git a/config/locales/it.yml b/config/locales/it.yml
index 58ee928abee158d5a2cba02ead27aac17dd654c1..0aa19443df2df85f30272522ce7db91b9f5f4929 100644 (file)
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -806,3 +806,4 @@ it:
   text_wiki_page_reassign_children: Reassign child pages to this parent page
   text_wiki_page_nullify_children: Keep child pages as root pages
   text_wiki_page_destroy_children: Delete child pages and all their descendants
+  setting_password_min_length: Minimum password length

diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 5574aee63787fdc79be5cbf02ee643c6147cfc3e..1d07aefa8f14083dd928026da688ceddff0317f0 100644 (file)
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -819,3 +819,4 @@ ja:
   text_wiki_page_reassign_children: Reassign child pages to this parent page
   text_wiki_page_nullify_children: Keep child pages as root pages
   text_wiki_page_destroy_children: Delete child pages and all their descendants
+  setting_password_min_length: Minimum password length

diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 0b323fe1e95647e7c2d401bd56931fb3efa253ef..85b49c5f2ca739a8bbb4349b769c42db1d0943a7 100644 (file)
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -850,3 +850,4 @@ ko:
   text_wiki_page_reassign_children: Reassign child pages to this parent page
   text_wiki_page_nullify_children: Keep child pages as root pages
   text_wiki_page_destroy_children: Delete child pages and all their descendants
+  setting_password_min_length: Minimum password length

diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index dd6b029cacf6aa391d419fbfa6a2256ca6bee583..8ee71b42fa328e0db16c69cfe82d7f2f9a530710 100644 (file)
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -831,3 +831,4 @@ lt:
   text_wiki_page_reassign_children: Reassign child pages to this parent page
   text_wiki_page_nullify_children: Keep child pages as root pages
   text_wiki_page_destroy_children: Delete child pages and all their descendants
+  setting_password_min_length: Minimum password length

diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index b5728fbb3a2d9f1c14bc935e086e8c4ab05baf5d..8aea6cb23693a07c1120899f1685cc3c8d4e72b5 100644 (file)
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -776,3 +776,4 @@ nl:
   text_wiki_page_reassign_children: Reassign child pages to this parent page
   text_wiki_page_nullify_children: Keep child pages as root pages
   text_wiki_page_destroy_children: Delete child pages and all their descendants
+  setting_password_min_length: Minimum password length

diff --git a/config/locales/no.yml b/config/locales/no.yml
index 3eb1dbabafc6c6d0c200c1a6f2f46043c4e87c38..83041cf1029309b8c005fd0b8a3831cd26541ee5 100644 (file)
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -793,3 +793,4 @@
   text_wiki_page_reassign_children: Reassign child pages to this parent page
   text_wiki_page_nullify_children: Keep child pages as root pages
   text_wiki_page_destroy_children: Delete child pages and all their descendants
+  setting_password_min_length: Minimum password length

diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 936683e8429df6f0e07488575dad3f24cfbf05b3..105b4e16948f9cb63bff7629f1511c4b6922d9ed 100644 (file)
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -824,3 +824,4 @@ pl:
   text_wiki_page_reassign_children: Reassign child pages to this parent page
   text_wiki_page_nullify_children: Keep child pages as root pages
   text_wiki_page_destroy_children: Delete child pages and all their descendants
+  setting_password_min_length: Minimum password length

diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index bd065e5d32fae6dc3d4d263277b0ed62367c4826..80883adfd06d3088ea5f2d802367c993f8c10c70 100644 (file)
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -826,3 +826,4 @@ pt-BR:
   text_wiki_page_reassign_children: Reassign child pages to this parent page
   text_wiki_page_nullify_children: Keep child pages as root pages
   text_wiki_page_destroy_children: Delete child pages and all their descendants
+  setting_password_min_length: Minimum password length

diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index aa8e672d566166a54d469e2677e6a7bd72b1893b..f2b08ec2ec7ec2f54c73e4e520f5a62e7fec81ae 100644 (file)
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -812,3 +812,4 @@ pt:
   text_wiki_page_reassign_children: Reassign child pages to this parent page
   text_wiki_page_nullify_children: Keep child pages as root pages
   text_wiki_page_destroy_children: Delete child pages and all their descendants
+  setting_password_min_length: Minimum password length

diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index fe144c703c9eb4edd4961ad1b2097a048cf86a0c..e7dd09b9465c304c2bd6b5171f56a7394bc9f1c0 100644 (file)
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -791,3 +791,4 @@ ro:
   text_wiki_page_reassign_children: Reassign child pages to this parent page
   text_wiki_page_nullify_children: Keep child pages as root pages
   text_wiki_page_destroy_children: Delete child pages and all their descendants
+  setting_password_min_length: Minimum password length

diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 668a2c7da3adf66d6ec192b6e7df77f32ba3a88a..844a82bd3a3e10e418a1a8e35b7132fc0e2db7a5 100644 (file)
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -918,3 +918,4 @@ ru:
   text_wiki_page_reassign_children: Reassign child pages to this parent page
   text_wiki_page_nullify_children: Keep child pages as root pages
   text_wiki_page_destroy_children: Delete child pages and all their descendants
+  setting_password_min_length: Minimum password length

diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 6cd573fb1dfa719f1a968a7df77c177b4840c776..37a3fefc388fe88d91cf088813e1b202a0932d53 100644 (file)
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -792,3 +792,4 @@ sk:
   text_wiki_page_reassign_children: Reassign child pages to this parent page
   text_wiki_page_nullify_children: Keep child pages as root pages
   text_wiki_page_destroy_children: Delete child pages and all their descendants
+  setting_password_min_length: Minimum password length

diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 5ccd5b7fd49f15b729ec6c649dddb091447d2bcd..079e488a6ef94cfcfb14dbc6266ba6ce71694454 100644 (file)
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -790,3 +790,4 @@ sl:
   text_wiki_page_reassign_children: Reassign child pages to this parent page
   text_wiki_page_nullify_children: Keep child pages as root pages
   text_wiki_page_destroy_children: Delete child pages and all their descendants
+  setting_password_min_length: Minimum password length

diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index b2b61a1c2118a628533ed3b214a56661b981dca0..09220c91397b09c4ea82bc0287870ae3a674c4dd 100644 (file)
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -814,3 +814,4 @@
   text_wiki_page_reassign_children: Reassign child pages to this parent page
   text_wiki_page_nullify_children: Keep child pages as root pages
   text_wiki_page_destroy_children: Delete child pages and all their descendants
+  setting_password_min_length: Minimum password length

diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index d532d4aa3228c3030c3b7b3a9496c55cba54c9ad..b3e3c139c668442d1f0a211c8e035b11aecf2952 100644 (file)
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -848,3 +848,4 @@ sv:
   text_wiki_page_reassign_children: Reassign child pages to this parent page
   text_wiki_page_nullify_children: Keep child pages as root pages
   text_wiki_page_destroy_children: Delete child pages and all their descendants
+  setting_password_min_length: Minimum password length

diff --git a/config/locales/th.yml b/config/locales/th.yml
index 9de605691a9c0132e3d6ef6bba3cdb4fa283e7ee..a19f315ef3f79866d352dc9739f1f8dcdd681451 100644 (file)
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -791,3 +791,4 @@ th:
   text_wiki_page_reassign_children: Reassign child pages to this parent page
   text_wiki_page_nullify_children: Keep child pages as root pages
   text_wiki_page_destroy_children: Delete child pages and all their descendants
+  setting_password_min_length: Minimum password length

diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 068c4ec4131c64dfa55626bf02e87aa6b4927f71..0d47a8c84f261244128a3a48bf2fbebb857139d3 100644 (file)
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -827,3 +827,4 @@ tr:
   text_wiki_page_reassign_children: Reassign child pages to this parent page
   text_wiki_page_nullify_children: Keep child pages as root pages
   text_wiki_page_destroy_children: Delete child pages and all their descendants
+  setting_password_min_length: Minimum password length

diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 23edbd172dcad3870a09fa05ce6fd155faf6046e..0762090b6b186bc4d1215fe8dd41dbf52d05ae5b 100644 (file)
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -790,3 +790,4 @@ uk:
   text_wiki_page_reassign_children: Reassign child pages to this parent page
   text_wiki_page_nullify_children: Keep child pages as root pages
   text_wiki_page_destroy_children: Delete child pages and all their descendants
+  setting_password_min_length: Minimum password length

diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 0a8f82156aa2ea8982ec1cdda7f03256a837253d..6190a19407b95f412faa61927356402b5437bbf4 100644 (file)
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -860,3 +860,4 @@ vi:
   text_wiki_page_reassign_children: Reassign child pages to this parent page
   text_wiki_page_nullify_children: Keep child pages as root pages
   text_wiki_page_destroy_children: Delete child pages and all their descendants
+  setting_password_min_length: Minimum password length

diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 7a322c10272895d282a8dd32aec01ac23b05984f..86288a9b561f7263056cd193fccee42c3c005281 100644 (file)
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -898,3 +898,4 @@
   text_wiki_page_reassign_children: Reassign child pages to this parent page
   text_wiki_page_nullify_children: Keep child pages as root pages
   text_wiki_page_destroy_children: Delete child pages and all their descendants
+  setting_password_min_length: Minimum password length

diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 5ae2411bf085ece606f338da3c660d1105b94f3f..83bd5bcf1ac7402c9b1c10346de0854954cf8b11 100644 (file)
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -823,3 +823,4 @@ zh:
   text_wiki_page_reassign_children: Reassign child pages to this parent page
   text_wiki_page_nullify_children: Keep child pages as root pages
   text_wiki_page_destroy_children: Delete child pages and all their descendants
+  setting_password_min_length: Minimum password length

diff --git a/config/settings.yml b/config/settings.yml
index 38b0a44c8fb8a76d469868e722a2100841880f6b..5d4d6ff14022a6890639541ee23fb2c0df15dd5c 100644 (file)
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -31,6 +31,9 @@ self_registration:
   default: '2'
 lost_password:
   default: 1
+password_min_length:
+  format: int
+  default: 4
 attachment_max_size:
   format: int
   default: 5120