Better cmtool integration

app/controllers/application_controller.rb

@@ -25,6 +25,10 @@ private
     redirect_to '/', alert: t('general.unauthorized') unless current_user.present? && current_user.admin?
   end
 
+  def cmtool_locale
+    :en
+  end
+
   def broadcast_user(uid, event, data = {})
     Qwaiter.broadcast_user uid, event, data
   end
@@ -34,7 +38,8 @@ private
   end
 
   def set_locale
-    I18n.locale = (params[:locale].presence || I18n.default_locale).to_sym
+    #session[:locale] = (params[:locale].presence || session[:locale] || Rails.configuration.i18n.default_locale).to_sym
+    I18n.locale = params[:locale].presence.try(:to_sym) || Rails.configuration.i18n.default_locale
   end
 
   def _render_with_renderer_json(resource, options)