keep language across session reset

app/controllers/application_controller.rb

@@ -87,6 +87,11 @@ class ApplicationController < ActionController::Base
     true
   end
 
+  def reset_user_session
+    reset_session
+    session[:locale] = I18n.locale
+  end
+
   def update_session_expiry
     session[:expires_at] = 15.minutes.from_now.to_i
   end
@@ -95,6 +100,6 @@ class ApplicationController < ActionController::Base
   def destroy_session
     session[:user_id] = nil
     session[:mail_crypt_recovery_token] = nil
-    reset_session
+    reset_user_session
   end
 end

app/controllers/sessions_controller.rb

@@ -116,7 +116,8 @@ EOF
             end
           end
 
-          reset_session
+          reset_user_session
+
           unless @handoff
             session[:user_id] = res['email']
             update_session_expiry