aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
diff options
context:
space:
mode:
authorArthur Zapparoli <arthurzap@gmail.com>2009-08-09 14:42:38 -0300
committerPratik Naik <pratiknaik@gmail.com>2009-08-09 23:55:54 +0100
commitce2422ceaf8ee128e6ea9d8582611ba2ac1e0406 (patch)
tree9a769e328a7d02bc96415893c4670b40476e0843 /activerecord/lib/active_record
parent920ef4e6f3832ea1d3297e2e7e5f0f775dab69a8 (diff)
downloadrails-ce2422ceaf8ee128e6ea9d8582611ba2ac1e0406.tar.gz
rails-ce2422ceaf8ee128e6ea9d8582611ba2ac1e0406.tar.bz2
rails-ce2422ceaf8ee128e6ea9d8582611ba2ac1e0406.zip
Model#human_attribute_name now accept symbols [#3025 status:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
Diffstat (limited to 'activerecord/lib/active_record')
-rwxr-xr-xactiverecord/lib/active_record/base.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index d4103b46c0..2219edaa3a 100755
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -1394,7 +1394,7 @@ module ActiveRecord #:nodoc:
end
defaults << options[:default] if options[:default]
defaults.flatten!
- defaults << attribute_key_name.humanize
+ defaults << attribute_key_name.to_s.humanize
options[:count] ||= 1
I18n.translate(defaults.shift, options.merge(:default => defaults, :scope => [:activerecord, :attributes]))
end