aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel/lib/active_model
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2015-02-01 10:31:53 -0200
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2015-02-01 10:31:54 -0200
commitfdeef19833ce47b03bcb792f1850f6233f050b9f (patch)
tree8da97ee3782434caddee95a6bd9c52c795e2a46a /activemodel/lib/active_model
parente374db237198b07e778c41320922d574fef4bc5e (diff)
downloadrails-fdeef19833ce47b03bcb792f1850f6233f050b9f.tar.gz
rails-fdeef19833ce47b03bcb792f1850f6233f050b9f.tar.bz2
rails-fdeef19833ce47b03bcb792f1850f6233f050b9f.zip
Move required error message and changelog to Active Record
The new association error belongs to Active Record, not Active Model. See #18700 for reference.
Diffstat (limited to 'activemodel/lib/active_model')
-rw-r--r--activemodel/lib/active_model/locale/en.yml3
1 files changed, 1 insertions, 2 deletions
diff --git a/activemodel/lib/active_model/locale/en.yml b/activemodel/lib/active_model/locale/en.yml
index b0b20ee0bf..b11c8f53b4 100644
--- a/activemodel/lib/active_model/locale/en.yml
+++ b/activemodel/lib/active_model/locale/en.yml
@@ -14,10 +14,9 @@ en:
empty: "can't be empty"
blank: "can't be blank"
present: "must be blank"
- required: "must exist"
too_long:
one: "is too long (maximum is 1 character)"
- other: "is too long (maximum is %{count} characters)"
+ other: "is too long (maximum is %{count} characters)"
too_short:
one: "is too short (minimum is 1 character)"
other: "is too short (minimum is %{count} characters)"