TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Do not modify options hash in human_attribute_name, remove reverse_merge

Browse Source
This commit is contained in:
Carlos Antonio da Silva 2012-04-28 11:23:29 -03:00
parent 9fc9e89477
commit cafe6a38f5
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
activemodel/lib/active_model/translation.rb
View File

@ -1,5 +1,3 @@
require 'active_support/core_ext/hash/reverse_merge'
module ActiveModel
# == Active Model Translation
@ -43,6 +41,7 @@ def lookup_ancestors
#
# Specify +options+ with additional translating options.
def human_attribute_name(attribute, options = {})
options = { :count => 1 }.merge!(options)
defaults = []
parts = attribute.to_s.split(".", 2)
attribute = parts.pop
@ -63,7 +62,7 @@ def human_attribute_name(attribute, options = {})
defaults << options.delete(:default) if options[:default]
defaults << attribute.humanize
options.reverse_merge! :count => 1, :default => defaults
options[:default] = defaults
I18n.translate(defaults.shift, options)
end
end

10
activemodel/test/cases/translation_test.rb
View File

@ -82,9 +82,15 @@ def test_translated_model_names_with_ancestors_fallback
end
def test_human_does_not_modify_options
options = {:default => 'person model'}
options = { :default => 'person model' }
Person.model_name.human(options)
assert_equal({:default => 'person model'}, options)
assert_equal({ :default => 'person model' }, options)
end
def test_human_attribute_name_does_not_modify_options
options = { :default => 'Cool gender' }
Person.human_attribute_name('gender', options)
assert_equal({ :default => 'Cool gender' }, options)
end
end