diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2012-01-26 00:00:40 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2012-01-26 00:00:40 +0530 |
| commit | 203771da9e0b0357f23e1c4e61d2e72578af4155 (patch) | |
| tree | 0b4b7c23c37b4648cf8f0851c5b01b63199f5f57 /activemodel/lib | |
| parent | c421870c7a7315082524e909cce825a75e2f34b1 (diff) | |
| parent | 368f0fe2d359209e2475a90bc7ef859cd93cc0a3 (diff) | |
| download | rails-203771da9e0b0357f23e1c4e61d2e72578af4155.tar.gz rails-203771da9e0b0357f23e1c4e61d2e72578af4155.tar.bz2 rails-203771da9e0b0357f23e1c4e61d2e72578af4155.zip | |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'activemodel/lib')
| -rw-r--r-- | activemodel/lib/active_model/errors.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activemodel/lib/active_model/errors.rb b/activemodel/lib/active_model/errors.rb index 5cd8f77f0d..023c872055 100644 --- a/activemodel/lib/active_model/errors.rb +++ b/activemodel/lib/active_model/errors.rb @@ -219,7 +219,7 @@ module ActiveModel # +attribute+. # If no +message+ is supplied, <tt>:invalid</tt> is assumed. # - # If +message+ is a symbol, it will be translated using the appropriate scope (see +translate_error+). + # If +message+ is a symbol, it will be translated using the appropriate scope (see +generate_message+). # If +message+ is a proc, it will be called, allowing for things like <tt>Time.now</tt> to be used within an error. def add(attribute, message = nil, options = {}) message = normalize_message(attribute, message, options) |