From 09ee21921ab526cff6e5eef65458a150609056cb Mon Sep 17 00:00:00 2001 From: chiu Date: Thu, 23 Jul 2020 16:17:22 +0800 Subject: [PATCH] change site controller --- temp_file/app/controllers/admin/sites_controller.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/temp_file/app/controllers/admin/sites_controller.rb b/temp_file/app/controllers/admin/sites_controller.rb index 9259560..ee009b4 100644 --- a/temp_file/app/controllers/admin/sites_controller.rb +++ b/temp_file/app/controllers/admin/sites_controller.rb @@ -124,7 +124,11 @@ class Admin::SitesController < OrbitAdminController if params[:site][:enable_language_detection].eql?("0") Site.update_all({:enable_language_detection => false}) elsif params[:site][:enable_language_detection].eql?("1") - Site.update_all({:default_locale => nil}) + if @site.in_use_locales.include?(:en) + Site.update_all({:default_locale => nil}) + else + Site.update_all({:enable_language_detection => false}) + end end if !@site.in_use_locales.include?I18n.locale I18n.locale = @site.in_use_locales.first