aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2006-03-28 01:11:09 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2006-03-28 01:11:09 +0000
commit31199a9e4af79f5d609bc6446e40e5f4ac03bb61 (patch)
treed3a31dd39163a06cf58193627b5931874bfd4791 /activerecord/lib
parent66f546644b52394a60f6c17cfb544f86aac3b824 (diff)
downloadrails-31199a9e4af79f5d609bc6446e40e5f4ac03bb61.tar.gz
rails-31199a9e4af79f5d609bc6446e40e5f4ac03bb61.tar.bz2
rails-31199a9e4af79f5d609bc6446e40e5f4ac03bb61.zip
Update description
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4074 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib')
-rwxr-xr-xactiverecord/lib/active_record/validations.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/validations.rb b/activerecord/lib/active_record/validations.rb
index e206dfbbf1..c5c38ff4fd 100755
--- a/activerecord/lib/active_record/validations.rb
+++ b/activerecord/lib/active_record/validations.rb
@@ -31,8 +31,8 @@ module ActiveRecord
:accepted => "must be accepted",
:empty => "can't be empty",
:blank => "can't be blank",
- :too_long => "is too long (max is %d characters)",
- :too_short => "is too short (min is %d characters)",
+ :too_long => "is too long (maximum is %d characters)",
+ :too_short => "is too short (minimum is %d characters)",
:wrong_length => "is the wrong length (should be %d characters)",
:taken => "has already been taken",
:not_a_number => "is not a number"
@@ -415,7 +415,7 @@ module ActiveRecord
# * <tt>in</tt> - A synonym(or alias) for :within
# * <tt>allow_nil</tt> - Attribute may be nil; skip validation.
#
- # * <tt>too_long</tt> - The error message if the attribute goes over the maximum (default is: "is too long (max is %d characters)")
+ # * <tt>too_long</tt> - The error message if the attribute goes over the maximum (default is: "is too long (maximum is %d characters)")
# * <tt>too_short</tt> - The error message if the attribute goes under the minimum (default is: "is too short (min is %d characters)")
# * <tt>wrong_length</tt> - The error message if using the :is method and the attribute is the wrong size (default is: "is the wrong length (should be %d characters)")
# * <tt>message</tt> - The error message to use for a :minimum, :maximum, or :is violation. An alias of the appropriate too_long/too_short/wrong_length message