X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/101ee6ade2a24e8c468badb82d56c17b04e0df37..dffd5fe2d080732936d3f46a40b864a6bf9c6972:/app/controllers/application_controller.rb?ds=sidebyside

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 6e9be2de4..ea5d450a4 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,4 +1,5 @@
 class ApplicationController < ActionController::Base
+  include SessionPersistence
 
   protect_from_forgery
 
@@ -250,8 +251,6 @@ class ApplicationController < ActionController::Base
 
     I18n.locale = request.compatible_language_from(I18n.available_locales) || I18n.default_locale
 
-    logger.info "Selected locale #{I18n.locale} from #{request.user_preferred_languages.inspect}"
-
     response.headers['Content-Language'] = I18n.locale.to_s
   end
 
@@ -268,7 +267,7 @@ class ApplicationController < ActionController::Base
       report_error message, :bad_request
     rescue OSM::APIError => ex
       report_error ex.message, ex.status
-    rescue ActionController::UnknownAction => ex
+    rescue AbstractController::ActionNotFound => ex
       raise
     rescue Exception => ex
       logger.info("API threw unexpected #{ex.class} exception: #{ex.message}")