Merge remote-tracking branch 'upstream/pull/4747'

[rails.git] / app / controllers / errors_controller.rb

diff --git a/app/controllers/errors_controller.rb b/app/controllers/errors_controller.rb
index 3bc958615b5a982e570f74af35f0662d3e81872f..ee1fcca6f8892ea346c1cacd3161eebc9c56983c 100644 (file)
--- a/app/controllers/errors_controller.rb
+++ b/app/controllers/errors_controller.rb
@@ -3,15 +3,26 @@ class ErrorsController < ApplicationController
 
   skip_authorization_check
 
+  before_action :set_locale
+
   def forbidden
-    render :status => :forbidden
+    respond_to do |format|
+      format.html { render :status => :forbidden }
+      format.any { render :status => :forbidden, :plain => "" }
+    end
   end
 
   def not_found
-    render :status => :not_found
+    respond_to do |format|
+      format.html { render :status => :not_found }
+      format.any { render :status => :not_found, :plain => "" }
+    end
   end
 
   def internal_server_error
-    render :status => :internal_server_error
+    respond_to do |format|
+      format.html { render :status => :internal_server_error }
+      format.any { render :status => :internal_server_error, :plain => "" }
+    end
   end
 end