TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request #11416 from tigrish/master

Browse Source 
Rename the I18n keys for associations' restrict_dependent_destroy errors
This commit is contained in:
Yves Senn 2013-07-21 04:06:32 -07:00
commit 9dc8aef084
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 @@ def handle_dependency
when :restrict_with_error
unless empty?
record = klass.human_attribute_name(reflection.name).downcase
owner.errors.add(:base, :"restrict_dependent_destroy.many", record: record)
owner.errors.add(:base, :"restrict_dependent_destroy.has_many", record: record)
false
end

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

@ -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.one", record: record)
owner.errors.add(:base, :"restrict_dependent_destroy.has_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:
one: "Cannot delete record because a dependent %{record} exists"
many: "Cannot delete record because dependent %{record} exist"
has_one: "Cannot delete record because a dependent %{record} exists"
has_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.