From 3d8b783d131796f1e85ecd0ce33c3c2374533958 Mon Sep 17 00:00:00 2001 From: Bernard Potocki Date: Mon, 4 May 2015 23:46:25 +0200 Subject: Remove :rescue_format option for translate helper since it's no longer supported by I18n. --- actionview/lib/action_view/helpers/translation_helper.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'actionview/lib/action_view/helpers') 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 -- cgit v1.2.3