Merge pull request #6433 from parndt/fix_typo

Fixed typo new_defautls -> new_defaults.

2 files changed, 15 insertions, 5 deletions

diff --git a/actionpack/lib/action_view/helpers/translation_helper.rb b/actionpack/lib/action_view/helpers/translation_helper.rb
index 8171bea8ed..552c9ba660 100644
--- a/actionpack/lib/action_view/helpers/translation_helper.rb
+++ b/actionpack/lib/action_view/helpers/translation_helper.rb
@@ -64,7 +64,7 @@ module ActionView
 
       # 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 @@ module ActionView
               new_defaults << lambda { |_, options| translate key, options.merge(:default => defaults) }
               break
             else
-              new_defautls << key
+              new_defaults << key
             end
           end
 
diff --git a/actionpack/test/template/translation_helper_test.rb b/actionpack/test/template/translation_helper_test.rb
index 97777ccff0..d496dbb35e 100644
--- a/actionpack/test/template/translation_helper_test.rb
+++ b/actionpack/test/template/translation_helper_test.rb
@@ -111,18 +111,28 @@ class TranslationHelperTest < ActiveSupport::TestCase
   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