Browse files

Make MissingTranslation exception handler respect :rescue_format

  • Loading branch information...
1 parent 56b301f commit 0ac0d7a0f03da3d08440c74477d653622d61a26e @pixeltrix pixeltrix committed Jun 15, 2011
View
6 actionpack/lib/action_view/helpers/translation_helper.rb
@@ -5,7 +5,11 @@ module I18n
class ExceptionHandler
include Module.new {
def call(exception, locale, key, options)
- exception.is_a?(MissingTranslation) ? super.html_safe : super
+ if exception.is_a?(MissingTranslation)
+ options[:rescue_format] == :html ? super.html_safe : super
+ else
+ super
+ end
end
}
end
View
8 actionpack/test/template/translation_helper_test.rb
@@ -38,11 +38,19 @@ def test_delegates_localize_to_i18n
def test_returns_missing_translation_message_wrapped_into_span
expected = '<span class="translation_missing" title="translation missing: en.translations.missing">Missing</span>'
assert_equal expected, translate(:"translations.missing")
+ 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_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

0 comments on commit 0ac0d7a

Please sign in to comment.