diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-02-01 11:17:35 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-02-01 11:17:35 -0800 |
| commit | ab58c5e6640636b7d3ea7f50edfa368cc75fc56b (patch) | |
| tree | 6cd089cd1ffd7a164726513ca3655682b5db0648 /activerecord | |
| parent | 33d8b62c527b16851db7d7ea79f1269db325d1aa (diff) | |
| parent | 9b1d54e29287406ead1b5c3c2c3187607b54d8ea (diff) | |
| download | rails-ab58c5e6640636b7d3ea7f50edfa368cc75fc56b.tar.gz rails-ab58c5e6640636b7d3ea7f50edfa368cc75fc56b.tar.bz2 rails-ab58c5e6640636b7d3ea7f50edfa368cc75fc56b.zip | |
Merge pull request #4830 from rafaelfranca/restrict-fix
Fix typo
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/locale/en.yml | 2 | ||||
| -rw-r--r-- | activerecord/test/cases/associations/has_one_associations_test.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/locale/en.yml b/activerecord/lib/active_record/locale/en.yml index ad48de2e23..896132d566 100644 --- a/activerecord/lib/active_record/locale/en.yml +++ b/activerecord/lib/active_record/locale/en.yml @@ -11,7 +11,7 @@ en: taken: "has already been taken" record_invalid: "Validation failed: %{errors}" restrict_dependent_destroy: - one: "Cannot delete record because a 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. diff --git a/activerecord/test/cases/associations/has_one_associations_test.rb b/activerecord/test/cases/associations/has_one_associations_test.rb index 331358bd61..246877bbed 100644 --- a/activerecord/test/cases/associations/has_one_associations_test.rb +++ b/activerecord/test/cases/associations/has_one_associations_test.rb @@ -184,7 +184,7 @@ class HasOneAssociationsTest < ActiveRecord::TestCase firm.destroy assert !firm.errors.empty? - assert_equal "Cannot delete record because a dependent account exist", firm.errors[:base].first + assert_equal "Cannot delete record because a dependent account exists", firm.errors[:base].first assert RestrictedFirm.exists?(:name => 'restrict') assert firm.account.present? ensure @@ -207,7 +207,7 @@ class HasOneAssociationsTest < ActiveRecord::TestCase firm.destroy assert !firm.errors.empty? - assert_equal "Cannot delete record because a dependent account model exist", firm.errors[:base].first + assert_equal "Cannot delete record because a dependent account model exists", firm.errors[:base].first assert RestrictedFirm.exists?(:name => 'restrict') assert firm.account.present? ensure |