diff options
Diffstat (limited to 'actionview/lib/action_view/helpers')
| -rw-r--r-- | actionview/lib/action_view/helpers/translation_helper.rb | 4 | 
1 files changed, 2 insertions, 2 deletions
| diff --git a/actionview/lib/action_view/helpers/translation_helper.rb b/actionview/lib/action_view/helpers/translation_helper.rb index be80bc4ccf..0615bd2e0d 100644 --- a/actionview/lib/action_view/helpers/translation_helper.rb +++ b/actionview/lib/action_view/helpers/translation_helper.rb @@ -60,11 +60,11 @@ module ActionView          # 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 | 
