提交 40c0b3a2 编写于 作者: P Philip Arndt

Fixed typo new_defautls -> new_defaults.

* Added tests for 'else' case in ActionView::Helpers::TranslationHelper#wrap_translate_defaults
* Also updated the testing syntax of translation.html_safe? asserts to provide better output upon failure.
上级 d22859ed
......@@ -64,7 +64,7 @@ def translate(key, options = {})
# Delegates to <tt>I18n.localize</tt> with no additional functionality.
#
# See http://rubydoc.info/github/svenfuchs/i18n/master/I18n/Backend/Base:localize
# See http://rubydoc.info/github/svenfuchs/i18n/master/I18n/Backend/Base:localize
# for more information.
def localize(*args)
I18n.localize(*args)
......@@ -96,7 +96,7 @@ def wrap_translate_defaults(defaults)
new_defaults << lambda { |_, options| translate key, options.merge(:default => defaults) }
break
else
new_defautls << key
new_defaults << key
end
end
......
......@@ -111,18 +111,28 @@ def test_translation_returning_an_array_ignores_html_suffix
def test_translate_with_default_named_html
translation = translate(:'translations.missing', :default => :'translations.hello_html')
assert_equal '<a>Hello World</a>', translation
assert translation.html_safe?
assert_equal true, translation.html_safe?
end
def test_translate_with_two_defaults_named_html
translation = translate(:'translations.missing', :default => [:'translations.missing_html', :'translations.hello_html'])
assert_equal '<a>Hello World</a>', translation
assert translation.html_safe?
assert_equal true, translation.html_safe?
end
def test_translate_with_last_default_named_html
translation = translate(:'translations.missing', :default => [:'translations.missing', :'translations.hello_html'])
assert_equal '<a>Hello World</a>', translation
assert translation.html_safe?
assert_equal true, translation.html_safe?
end
def test_translate_with_string_default
translation = translate(:'translations.missing', default: 'A Generic String')
assert_equal 'A Generic String', translation
end
def test_translate_with_array_of_string_defaults
translation = translate(:'translations.missing', default: ['A Generic String', 'Second generic string'])
assert_equal 'A Generic String', translation
end
end
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册