Updated with some locale fixes in site preferences

app/controllers/application_controller.rb

@@ -140,21 +140,23 @@ class ApplicationController < ActionController::Base
     # update session if passed
     session[:locale] = params[:locale] if params[:locale]
     browser_locale = condition = nil
-    default_locale = @site.default_locale if @site.default_locale.present?
-    # check if locale is valid for non site pages
+    default_locale = condition = nil
 
+    # check if locale is valid for non site pages
     if LIST[:forbidden_item_names].include?(env['PATH_INFO'].split('/')[1].to_s)
       condition = VALID_LOCALES.include?(session[:locale])
-    elsif session[:locale]
-      condition = @site.in_use_locales.include?(session[:locale])
+    #check if the default locale is present or not
     elsif @site.default_locale.present?
       default_locale = @site.default_locale
-      condition = @site.valid_locales.include?(default_locale)
-    else
+      condition = @site.in_use_locales.include?(default_locale)
+    elsif !@site.enable_language_detection
+      #check enable langauge detection
       browser_locale = request.env['HTTP_ACCEPT_LANGUAGE'].scan(/^[a-z]{2}/).first rescue nil
       condition = @site.in_use_locales.include?(browser_locale)
+    elsif session[:locale]
+      condition = @site.in_use_locales.include?(session[:locale])
     end
-    session[:locale] = condition ? ( browser_locale || session[:locale] || default_locale) : I18n.default_locale.to_s
+    session[:locale] = condition ? (default_locale || browser_locale || session[:locale]) : I18n.default_locale.to_s
     I18n.locale = session[:locale].to_sym
     @site_in_use_locales = site_locales_default_head(@site.in_use_locales)
     @site_valid_locales = site_locales_default_head(@site.valid_locales)