diff options
| author | Yves Senn <yves.senn@gmail.com> | 2013-07-22 09:57:51 +0300 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2013-07-22 09:57:51 +0300 |
| commit | ff3739e6d5da61cf49e4f4a1d281b289f6222f9a (patch) | |
| tree | 2397c5140ee042726aa69de70dbf6a44928e5e97 /activerecord/lib/active_record/locale | |
| parent | c43db5564a48bc41ae55cead400af066337e63b6 (diff) | |
| download | rails-ff3739e6d5da61cf49e4f4a1d281b289f6222f9a.tar.gz rails-ff3739e6d5da61cf49e4f4a1d281b289f6222f9a.tar.bz2 rails-ff3739e6d5da61cf49e4f4a1d281b289f6222f9a.zip | |
Revert "Merge pull request #11416 from tigrish/master"
This reverts commit 9dc8aef084fc5ae7e3a396dd098d89da93d06fda, reversing
changes made to 02e8dae6279ea25312293a3eca777faf35139c4c.
Diffstat (limited to 'activerecord/lib/active_record/locale')
| -rw-r--r-- | activerecord/lib/active_record/locale/en.yml | 4 |
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 3a81e15532..b1fbd38622 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: - 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. |