diff options
| author | Xavier Noria <fxn@hashref.com> | 2011-04-03 22:22:03 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2011-04-03 22:22:03 +0200 |
| commit | 3e24e9ebc22f96f9124d3a5d1c83b93c1bea937d (patch) | |
| tree | 31698977fbf077d079c70e5b258abc87042b5346 /activemodel/lib | |
| parent | a000fc58b8bc288ca9c60566afc1e1943f5d6083 (diff) | |
| parent | 4c323bc25a69ba8fd8b080775335184fe6868747 (diff) | |
| download | rails-3e24e9ebc22f96f9124d3a5d1c83b93c1bea937d.tar.gz rails-3e24e9ebc22f96f9124d3a5d1c83b93c1bea937d.tar.bz2 rails-3e24e9ebc22f96f9124d3a5d1c83b93c1bea937d.zip | |
Merge branch 'master' of git://github.com/lifo/docrails
Diffstat (limited to 'activemodel/lib')
| -rw-r--r-- | activemodel/lib/active_model/errors.rb | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/activemodel/lib/active_model/errors.rb b/activemodel/lib/active_model/errors.rb index 5e3cf510b0..22ca3efa2b 100644 --- a/activemodel/lib/active_model/errors.rb +++ b/activemodel/lib/active_model/errors.rb @@ -278,19 +278,18 @@ module ActiveModel # When using inheritance in your models, it will check all the inherited # models too, but only if the model itself hasn't been found. Say you have # <tt>class Admin < User; end</tt> and you wanted the translation for - # the <tt>:blank</tt> error +message+ for the <tt>title</tt> +attribute+, + # the <tt>:blank</tt> error message for the <tt>title</tt> attribute, # it looks for these translations: # - # <ol> - # <li><tt>activemodel.errors.models.admin.attributes.title.blank</tt></li> - # <li><tt>activemodel.errors.models.admin.blank</tt></li> - # <li><tt>activemodel.errors.models.user.attributes.title.blank</tt></li> - # <li><tt>activemodel.errors.models.user.blank</tt></li> - # <li>any default you provided through the +options+ hash (in the activemodel.errors scope)</li> - # <li><tt>activemodel.errors.messages.blank</tt></li> - # <li><tt>errors.attributes.title.blank</tt></li> - # <li><tt>errors.messages.blank</tt></li> - # </ol> + # * <tt>activemodel.errors.models.admin.attributes.title.blank</tt> + # * <tt>activemodel.errors.models.admin.blank</tt> + # * <tt>activemodel.errors.models.user.attributes.title.blank</tt> + # * <tt>activemodel.errors.models.user.blank</tt> + # * any default you provided through the +options+ hash (in the <tt>activemodel.errors</tt> scope) + # * <tt>activemodel.errors.messages.blank</tt> + # * <tt>errors.attributes.title.blank</tt> + # * <tt>errors.messages.blank</tt> + # def generate_message(attribute, type = :invalid, options = {}) type = options.delete(:message) if options[:message].is_a?(Symbol) |