aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/locale/en.yml
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2013-07-21 04:06:32 -0700
committerYves Senn <yves.senn@gmail.com>2013-07-21 04:06:32 -0700
commit9dc8aef084fc5ae7e3a396dd098d89da93d06fda (patch)
tree44957ffa6fbf583041dd4c7eb206e3b98b6f0722 /activerecord/lib/active_record/locale/en.yml
parent02e8dae6279ea25312293a3eca777faf35139c4c (diff)
parent26c2620a533fd03441c0edd994c6d153f4a3f3f5 (diff)
downloadrails-9dc8aef084fc5ae7e3a396dd098d89da93d06fda.tar.gz
rails-9dc8aef084fc5ae7e3a396dd098d89da93d06fda.tar.bz2
rails-9dc8aef084fc5ae7e3a396dd098d89da93d06fda.zip
Merge pull request #11416 from tigrish/master
Rename the I18n keys for associations' restrict_dependent_destroy errors
Diffstat (limited to 'activerecord/lib/active_record/locale/en.yml')
-rw-r--r--activerecord/lib/active_record/locale/en.yml4
1 files changed, 2 insertions, 2 deletions
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.