aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel/lib/active_model/naming.rb
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-04-28 12:06:51 -0300
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-04-28 12:14:59 -0300
commitf48d83b5996f34103fc7c725a098a3e9a4062703 (patch)
treeae0fdb3a5125d00f59f74b9cae7cac3342366a3e /activemodel/lib/active_model/naming.rb
parentcafe6a38f5478403bf249ec9a9a39ff836849ff7 (diff)
downloadrails-f48d83b5996f34103fc7c725a098a3e9a4062703.tar.gz
rails-f48d83b5996f34103fc7c725a098a3e9a4062703.tar.bz2
rails-f48d83b5996f34103fc7c725a098a3e9a4062703.zip
Refactor human attribute name
Diffstat (limited to 'activemodel/lib/active_model/naming.rb')
-rw-r--r--activemodel/lib/active_model/naming.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activemodel/lib/active_model/naming.rb b/activemodel/lib/active_model/naming.rb
index 5665e10002..2b5fc57a3a 100644
--- a/activemodel/lib/active_model/naming.rb
+++ b/activemodel/lib/active_model/naming.rb
@@ -54,7 +54,7 @@ module ActiveModel
defaults << options[:default] if options[:default]
defaults << @human
- options = {:scope => [@klass.i18n_scope, :models], :count => 1, :default => defaults}.merge(options.except(:default))
+ options = { :scope => [@klass.i18n_scope, :models], :count => 1, :default => defaults }.merge!(options.except(:default))
I18n.translate(defaults.shift, options)
end