Permalink
Browse files

Handle raise flag in translate when both main and default translation…

… is missing. Fixes #19967
  • Loading branch information...
imanel authored and semaperepelitsa committed May 4, 2015
1 parent 21abb6e commit 97a527eaced1804594e6fdb7da00c89e949bbf46
View
@@ -1,3 +1,10 @@
* `translate` should handle `raise` flag correctly in case of both main and default
translation is missing.
Fixes #19967
*Bernard Potocki*
* `translate` should accept nils as members of the `:default`
parameter without raising a translation missing error. Fixes a
regression introduced 362557e.
@@ -48,10 +48,10 @@ def translate(key, options = {})
# 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?)
raise_error = false
options[:raise] = false
i18n_raise = false
else
raise_error = options[:raise] || options[:rescue_format] || ActionView::Base.raise_on_missing_translations
options[:raise] = true
i18n_raise = true
end
if html_safe_translation_key?(key)
@@ -61,11 +61,11 @@ def translate(key, options = {})
html_safe_options[name] = ERB::Util.html_escape(value.to_s)
end
end
translation = I18n.translate(scope_key_by_partial(key), html_safe_options)
translation = I18n.translate(scope_key_by_partial(key), html_safe_options.merge(raise: i18n_raise))
translation.respond_to?(:html_safe) ? translation.html_safe : translation
else
I18n.translate(scope_key_by_partial(key), options)
I18n.translate(scope_key_by_partial(key), options.merge(raise: i18n_raise))
end
rescue I18n::MissingTranslationData => e
if remaining_defaults.present?
@@ -153,6 +153,19 @@ def test_translate_with_default_named_html
assert_equal true, translation.html_safe?
end
def test_translate_with_missing_default
translation = translate(:'translations.missing', :default => :'translations.missing_html')
expected = '<span class="translation_missing" title="translation missing: en.translations.missing_html">Missing Html</span>'
assert_equal expected, translation
assert_equal true, translation.html_safe?
end
def test_translate_with_missing_default_and_raise_option
assert_raise(I18n::MissingTranslationData) do
translate(:'translations.missing', :default => :'translations.missing_html', :raise => true)
end
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

0 comments on commit 97a527e

Please sign in to comment.