Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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

This reverts commit 9dc8aef, reversing
changes made to 02e8dae.
  • Loading branch information...
commit ff3739e6d5da61cf49e4f4a1d281b289f6222f9a 1 parent c43db55
@senny senny authored
View
2  activerecord/lib/active_record/associations/has_many_association.rb
@@ -15,7 +15,7 @@ def handle_dependency
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
View
2  activerecord/lib/active_record/associations/has_one_association.rb
@@ -12,7 +12,7 @@ def handle_dependency
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
View
4 activerecord/lib/active_record/locale/en.yml
@@ -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.
Please sign in to comment.
Something went wrong with that request. Please try again.