aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel/lib/active_model/validations
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2012-04-29 16:29:33 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2012-04-29 16:29:33 -0700
commitf975a8663e9157afe6b82fc799d617c83be01eb1 (patch)
tree7d8b4d225448b2b8d5372f7dbe65d35ccb7c3f52 /activemodel/lib/active_model/validations
parent55fefdb8abce9a3d7b13bc1c406ad5ae0df4e060 (diff)
parent4433b1a99afa904884927d6787a1baf162b14f2e (diff)
downloadrails-f975a8663e9157afe6b82fc799d617c83be01eb1.tar.gz
rails-f975a8663e9157afe6b82fc799d617c83be01eb1.tar.bz2
rails-f975a8663e9157afe6b82fc799d617c83be01eb1.zip
Merge pull request #5942 from bcardarella/confirmation_error_message_on_confirmation_attribute
confirmation validation error attribute
Diffstat (limited to 'activemodel/lib/active_model/validations')
-rw-r--r--activemodel/lib/active_model/validations/confirmation.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/activemodel/lib/active_model/validations/confirmation.rb b/activemodel/lib/active_model/validations/confirmation.rb
index e8526303e2..69ab74734d 100644
--- a/activemodel/lib/active_model/validations/confirmation.rb
+++ b/activemodel/lib/active_model/validations/confirmation.rb
@@ -5,7 +5,8 @@ module ActiveModel
class ConfirmationValidator < EachValidator
def validate_each(record, attribute, value)
if (confirmed = record.send("#{attribute}_confirmation")) && (value != confirmed)
- record.errors.add(attribute, :confirmation, options)
+ human_attribute_name = record.class.human_attribute_name(attribute)
+ record.errors.add(:"#{attribute}_confirmation", :confirmation, options.merge(:attribute => human_attribute_name))
end
end