fix locale was not set until terms acceptance, so the locale selected…

… by the user was lost (#712)
coopdevs · Nov 23, 2023 · b44d559 · b44d559
1 parent d85df1d
commit b44d559
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -6,10 +6,10 @@ class ApplicationController < ActionController::Base
   MissingTOSAcceptance = Class.new(Exception)
   OutadedTOSAcceptance = Class.new(Exception)
 
-  append_before_action :check_for_terms_acceptance!, unless: :devise_controller?
+  before_action :set_locale
+  before_action :check_for_terms_acceptance!, unless: :devise_controller?
   before_action :configure_permitted_parameters, if: :devise_controller?
-  before_action :set_locale,
-                :set_current_organization,
+  before_action :set_current_organization,
                 :store_user_location
 
   rescue_from MissingTOSAcceptance, OutadedTOSAcceptance do