diff options
| author | Christopher Dell <chris@tigrish.com> | 2013-07-13 02:52:13 +0200 |
|---|---|---|
| committer | Christopher Dell <chris@tigrish.com> | 2013-07-13 02:52:13 +0200 |
| commit | 26c2620a533fd03441c0edd994c6d153f4a3f3f5 (patch) | |
| tree | fef84e8465d72b28330f72f5fc0513aab66b6cb5 | |
| parent | 3af7b16c114802acdf0c0e7a34837a7a454fd23f (diff) | |
| download | rails-26c2620a533fd03441c0edd994c6d153f4a3f3f5.tar.gz rails-26c2620a533fd03441c0edd994c6d153f4a3f3f5.tar.bz2 rails-26c2620a533fd03441c0edd994c6d153f4a3f3f5.zip | |
Remove ambiguity with pluralizations and I18n keys used for association restrict_dependent_destroy errors
3 files changed, 4 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/associations/has_many_association.rb b/activerecord/lib/active_record/associations/has_many_association.rb index 607ed0da46..6e722616bf 100644 --- a/activerecord/lib/active_record/associations/has_many_association.rb +++ b/activerecord/lib/active_record/associations/has_many_association.rb @@ -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.many", record: record) + owner.errors.add(:base, :"restrict_dependent_destroy.has_many", record: record) false end 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 diff --git a/activerecord/lib/active_record/locale/en.yml b/activerecord/lib/active_record/locale/en.yml index b1fbd38622..3a81e15532 100644 --- a/activerecord/lib/active_record/locale/en.yml +++ b/activerecord/lib/active_record/locale/en.yml @@ -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. |