diff options
author | Emilio Tagua <miloops@gmail.com> | 2009-06-30 20:12:17 -0300 |
---|---|---|
committer | Emilio Tagua <miloops@gmail.com> | 2009-06-30 20:12:17 -0300 |
commit | e5b8c4483c8de805d5847563edcf4e5d7e035a87 (patch) | |
tree | 00f579d40ce23c5ebb0a3386ca5c00d22406bbd6 /activerecord/lib/active_record/base.rb | |
parent | 9c70442534c7754eac3738e0ddf11446b01c4f9e (diff) | |
parent | db3de78a83379ab2a58e0d29fb10622b813a4d44 (diff) | |
download | rails-e5b8c4483c8de805d5847563edcf4e5d7e035a87.tar.gz rails-e5b8c4483c8de805d5847563edcf4e5d7e035a87.tar.bz2 rails-e5b8c4483c8de805d5847563edcf4e5d7e035a87.zip |
Merge commit 'rails/master'
Conflicts:
activerecord/lib/active_record/base.rb
Diffstat (limited to 'activerecord/lib/active_record/base.rb')
-rwxr-xr-x | activerecord/lib/active_record/base.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index b3ecd01348..56ed851d6a 100755 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -1403,14 +1403,14 @@ module ActiveRecord #:nodoc: end # Transform the modelname into a more humane format, using I18n. - # Defaults to the basic humanize method. + # By default, it will underscore then humanize the class name (BlogPost.human_name #=> "Blog post"). # Default scope of the translation is activerecord.models # Specify +options+ with additional translating options. def human_name(options = {}) defaults = self_and_descendants_from_active_record.map do |klass| :"#{klass.name.underscore}" end - defaults << self.name.humanize + defaults << self.name.underscore.humanize I18n.translate(defaults.shift, {:scope => [:activerecord, :models], :count => 1, :default => defaults}.merge(options)) end |