aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-12-19 09:37:08 +0100
committerJosé Valim <jose.valim@gmail.com>2010-12-19 09:37:08 +0100
commit863de37b05900f037132656812b7ef550d096ae1 (patch)
tree1ffcaeff862339d5304321d08206d9a2307f55d6 /activemodel
parent432556b9238b182dbd380a8f9936e3ca5dc6fa57 (diff)
downloadrails-863de37b05900f037132656812b7ef550d096ae1.tar.gz
rails-863de37b05900f037132656812b7ef550d096ae1.tar.bz2
rails-863de37b05900f037132656812b7ef550d096ae1.zip
'unsecure' => 'insecure'
Diffstat (limited to 'activemodel')
-rw-r--r--activemodel/lib/active_model/locale/en.yml2
-rw-r--r--activemodel/lib/active_model/secure_password.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/activemodel/lib/active_model/locale/en.yml b/activemodel/lib/active_model/locale/en.yml
index c370a1f33e..4a27355c6c 100644
--- a/activemodel/lib/active_model/locale/en.yml
+++ b/activemodel/lib/active_model/locale/en.yml
@@ -28,4 +28,4 @@ en:
attributes:
password:
- unsecure: "is too weak and common"
+ insecure: "is too weak and common"
diff --git a/activemodel/lib/active_model/secure_password.rb b/activemodel/lib/active_model/secure_password.rb
index cd997a61db..1dcd389f8a 100644
--- a/activemodel/lib/active_model/secure_password.rb
+++ b/activemodel/lib/active_model/secure_password.rb
@@ -64,7 +64,7 @@ module ActiveModel
def password_must_be_strong
if password.present?
errors.add(:password, :too_short, :count => 7) unless password.size > 6
- errors.add(:password, :unsecure) if WEAK_PASSWORDS.include?(password)
+ errors.add(:password, :insecure) if WEAK_PASSWORDS.include?(password)
end
end
end