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

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

diff --git a/app/controllers/errors_controller.rb b/app/controllers/errors_controller.rb
index caadd51213ed9cd1af4bd0224f87967a32fc2e31..ee1fcca6f8892ea346c1cacd3161eebc9c56983c 100644 (file)
--- a/app/controllers/errors_controller.rb
+++ b/app/controllers/errors_controller.rb
@@ -3,6 +3,8 @@ class ErrorsController < ApplicationController
 
   skip_authorization_check
 
 
   skip_authorization_check
 

+  before_action :set_locale
+

   def forbidden
     respond_to do |format|
       format.html { render :status => :forbidden }
   def forbidden
     respond_to do |format|
       format.html { render :status => :forbidden }