kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Revert "Merge pull request #11416 from tigrish/master"

Browse source 
This reverts commit 9dc8aef084, reversing
changes made to 02e8dae627.
This commit is contained in:
Yves Senn 2013-07-22 09:57:51 +03:00
parent c43db5564a
commit ff3739e6d5
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
activerecord/lib/active_record/associations/has_many_association.rb
View file

@ -15,7 +15,7 @@ module ActiveRecord
when :restrict_with_error
unless empty?
record = klass.human_attribute_name(reflection.name).downcase
owner.errors.add(:base, :"restrict_dependent_destroy.has_many", record: record)
owner.errors.add(:base, :"restrict_dependent_destroy.many", record: record)
false
end

2
activerecord/lib/active_record/associations/has_one_association.rb
View file

@ -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.has_one", record: record)
owner.errors.add(:base, :"restrict_dependent_destroy.one", record: record)
false
end

4
activerecord/lib/active_record/locale/en.yml
View file

@ -15,8 +15,8 @@ en:
messages:
record_invalid: "Validation failed: %{errors}"
restrict_dependent_destroy:
has_one: "Cannot delete record because a dependent %{record} exists"
has_many: "Cannot delete record because dependent %{record} exist"
one: "Cannot delete record because a dependent %{record} exists"
many: "Cannot delete record because dependent %{record} exist"
# Append your own errors here or at the model/attributes scope.
# You can define own errors for models or model attributes.