Permalink
Browse files

Remove :rescue_format option for translate helper since it's no longe…

…r supported by I18n.
  • Loading branch information...
imanel committed May 4, 2015
1 parent e5139f1 commit 3d8b783d131796f1e85ecd0ce33c3c2374533958
View
@@ -1,3 +1,8 @@
* Remove `:rescue_format` option for `translate` helper since it's no longer
supported by I18n.
*Bernard Potocki*
* `translate` should handle `raise` flag correctly in case of both main and default
translation is missing.
@@ -60,11 +60,11 @@ def translate(key, options = {})
# If the user has explicitly decided to NOT raise errors, pass that option to I18n.
# Otherwise, tell I18n to raise an exception, which we rescue further in this method.
# Note: `raise_error` refers to us re-raising the error in this method. I18n is forced to raise by default.
if options[:raise] == false || (options.key?(:rescue_format) && options[:rescue_format].nil?)
if options[:raise] == false
raise_error = false
i18n_raise = false
else
raise_error = options[:raise] || options[:rescue_format] || ActionView::Base.raise_on_missing_translations
raise_error = options[:raise] || ActionView::Base.raise_on_missing_translations
i18n_raise = true
end
@@ -41,8 +41,8 @@ class TranslationHelperTest < ActiveSupport::TestCase
I18n.backend.reload!
end
def test_delegates_to_i18n_setting_the_rescue_format_option_to_html
I18n.expects(:translate).with(:foo, :locale => 'en', :raise=>true).returns("")
def test_delegates_setting_to_i18n
I18n.expects(:translate).with(:foo, :locale => 'en', :raise => true).returns("")
translate :foo, :locale => 'en'
end
@@ -58,12 +58,6 @@ def test_returns_missing_translation_message_wrapped_into_span
assert_equal true, translate(:"translations.missing").html_safe?
end
def test_returns_missing_translation_message_using_nil_as_rescue_format
expected = 'translation missing: en.translations.missing'
assert_equal expected, translate(:"translations.missing", :rescue_format => nil)
assert_equal false, translate(:"translations.missing", :rescue_format => nil).html_safe?
end
def test_raises_missing_translation_message_with_raise_config_option
ActionView::Base.raise_on_missing_translations = true
@@ -96,12 +90,6 @@ def test_uses_custom_exception_handler_when_specified_for_html
I18n.exception_handler = old_exception_handler
end
def test_i18n_translate_defaults_to_nil_rescue_format
expected = 'translation missing: en.translations.missing'
assert_equal expected, I18n.translate(:"translations.missing")
assert_equal false, I18n.translate(:"translations.missing").html_safe?
end
def test_translation_returning_an_array
expected = %w(foo bar)
assert_equal expected, translate(:"translations.array")

0 comments on commit 3d8b783

Please sign in to comment.