aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations/has_one_association.rb
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2013-07-21 04:06:32 -0700
committerYves Senn <yves.senn@gmail.com>2013-07-21 04:06:32 -0700
commit9dc8aef084fc5ae7e3a396dd098d89da93d06fda (patch)
tree44957ffa6fbf583041dd4c7eb206e3b98b6f0722 /activerecord/lib/active_record/associations/has_one_association.rb
parent02e8dae6279ea25312293a3eca777faf35139c4c (diff)
parent26c2620a533fd03441c0edd994c6d153f4a3f3f5 (diff)
downloadrails-9dc8aef084fc5ae7e3a396dd098d89da93d06fda.tar.gz
rails-9dc8aef084fc5ae7e3a396dd098d89da93d06fda.tar.bz2
rails-9dc8aef084fc5ae7e3a396dd098d89da93d06fda.zip
Merge pull request #11416 from tigrish/master
Rename the I18n keys for associations' restrict_dependent_destroy errors
Diffstat (limited to 'activerecord/lib/active_record/associations/has_one_association.rb')
-rw-r--r--activerecord/lib/active_record/associations/has_one_association.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/has_one_association.rb b/activerecord/lib/active_record/associations/has_one_association.rb
index 3ab1ea1ff4..5791602846 100644
--- a/activerecord/lib/active_record/associations/has_one_association.rb
+++ b/activerecord/lib/active_record/associations/has_one_association.rb
@@ -12,7 +12,7 @@ module ActiveRecord
when :restrict_with_error
if load_target
record = klass.human_attribute_name(reflection.name).downcase
- owner.errors.add(:base, :"restrict_dependent_destroy.one", record: record)
+ owner.errors.add(:base, :"restrict_dependent_destroy.has_one", record: record)
false
end