aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorDamien Mathieu <42@dmathieu.com>2011-06-15 09:56:47 +0200
committerAndrew White <andyw@pixeltrix.co.uk>2011-06-15 09:51:36 +0100
commit0438e92ae73544874ab9cd73d0a33e7a815c395b (patch)
tree5901dd291d3b2fbb6394be08cb65418546516ded /actionpack
parent0ac0d7a0f03da3d08440c74477d653622d61a26e (diff)
downloadrails-0438e92ae73544874ab9cd73d0a33e7a815c395b.tar.gz
rails-0438e92ae73544874ab9cd73d0a33e7a815c395b.tar.bz2
rails-0438e92ae73544874ab9cd73d0a33e7a815c395b.zip
simplify to only one condition
Signed-off-by: Andrew White <andyw@pixeltrix.co.uk>
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_view/helpers/translation_helper.rb6
1 files changed, 1 insertions, 5 deletions
diff --git a/actionpack/lib/action_view/helpers/translation_helper.rb b/actionpack/lib/action_view/helpers/translation_helper.rb
index e5bd55e935..26b6e8b599 100644
--- a/actionpack/lib/action_view/helpers/translation_helper.rb
+++ b/actionpack/lib/action_view/helpers/translation_helper.rb
@@ -5,11 +5,7 @@ module I18n
class ExceptionHandler
include Module.new {
def call(exception, locale, key, options)
- if exception.is_a?(MissingTranslation)
- options[:rescue_format] == :html ? super.html_safe : super
- else
- super
- end
+ exception.is_a?(MissingTranslation) && options[:rescue_format] == :html ? super.html_safe : super
end
}
end