Rescue nil in Albums

app/controllers/admin/sites_controller.rb

@@ -21,7 +21,7 @@ class Admin::SitesController < OrbitBackendController
   end
 
   def update
-    params[:site][:defalut_locale] = "zh_tw" if params[:site][:default_locale].blank?
+    params[:site][:defalut_locale] = nil if params[:site][:default_locale].blank?
     @site.update_attributes(params[:site])
     redirect_to :back
   end

app/controllers/application_controller.rb

@@ -162,8 +162,9 @@ class ApplicationController < ActionController::Base
       #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 (@site.default_locale.nil? && @site.enable_language_detection.eql?(false))
-      condition = @site.valid_locales.first
+    elsif (@site.default_locale.nil? && @site.enable_language_detection.eql?(false) && session[:locale].nil?)
+      session[:locale] = @site.valid_locales.first
+      condition = @site.in_use_locales.include?(session[:locale])
     end
 
     session[:locale] = condition ? (browser_locale || session[:locale] || default_locale || backup_locale) : I18n.default_locale.to_s