aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel/lib/active_model/locale/en.yml
diff options
context:
space:
mode:
authorMichael de Silva <michael@mwdesilva.com>2012-03-11 23:31:11 +0300
committerMichael de Silva <michael@mwdesilva.com>2012-03-11 23:31:37 +0300
commitddbea9474e20a40e80110944c1e3493ba0efe572 (patch)
tree45486ce19e3b064cbd1bf275ab71fd8831218ff1 /activemodel/lib/active_model/locale/en.yml
parent625cb12f21d08630577047ccf11678f886145234 (diff)
downloadrails-ddbea9474e20a40e80110944c1e3493ba0efe572.tar.gz
rails-ddbea9474e20a40e80110944c1e3493ba0efe572.tar.bz2
rails-ddbea9474e20a40e80110944c1e3493ba0efe572.zip
Fixed Issue #2884 ActiveModel::SecurePassword code / rdoc conflict; an elucidated explanation has been provided and ActiveModel en-locale updated to present a less confusing attribute name for 'password_digest' in form errors due to "has_secure_password"
Diffstat (limited to 'activemodel/lib/active_model/locale/en.yml')
-rw-r--r--activemodel/lib/active_model/locale/en.yml4
1 files changed, 4 insertions, 0 deletions
diff --git a/activemodel/lib/active_model/locale/en.yml b/activemodel/lib/active_model/locale/en.yml
index ba49c6beaa..1842ba002f 100644
--- a/activemodel/lib/active_model/locale/en.yml
+++ b/activemodel/lib/active_model/locale/en.yml
@@ -1,4 +1,8 @@
en:
+ attributes:
+ # Prevent confusion in form errors due to 'has_secure_password'
+ password_digest: "Password"
+
errors:
# The default format to use in full error messages.
format: "%{attribute} %{message}"