From f05b955c340476eff01ced1af7e1d6befc4c0614 Mon Sep 17 00:00:00 2001
From: hishamco <hishamco_2007@yahoo.com>
Date: Mon, 28 Dec 2020 18:15:28 +0300
Subject: [PATCH 1/2] Show LanguageSwitcher if more than one culture

---
 Oqtane.Client/Themes/Controls/ControlPanel.razor | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Oqtane.Client/Themes/Controls/ControlPanel.razor b/Oqtane.Client/Themes/Controls/ControlPanel.razor
index 931f3ff3..8018be30 100644
--- a/Oqtane.Client/Themes/Controls/ControlPanel.razor
+++ b/Oqtane.Client/Themes/Controls/ControlPanel.razor
@@ -10,6 +10,7 @@
 @inject ILogService logger
 @inject ISettingService SettingService
 @inject IStringLocalizer<ControlPanel> Localizer
+@inject ILocalizationService LocalizationService
 
 @if (_moduleDefinitions != null && UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, PageState.Page.Permissions))
 {
@@ -317,6 +318,12 @@
             _allModuleDefinitions = await ModuleDefinitionService.GetModuleDefinitionsAsync(PageState.Site.SiteId);
             _moduleDefinitions = _allModuleDefinitions.Where(item => item.Categories.Contains(Category)).ToList();
             _categories = _allModuleDefinitions.SelectMany(m => m.Categories.Split(',')).Distinct().ToList();
+
+            var cultures = await LocalizationService.GetCulturesAsync();
+            if (cultures.Count() < 2)
+            {
+                ShowLanguageSwitcher = false;
+            }
         }
     }
 

From 56e86edf9f71162113724b15bc36cf6f8192e376 Mon Sep 17 00:00:00 2001
From: hishamco <hishamco_2007@yahoo.com>
Date: Mon, 28 Dec 2020 19:59:58 +0300
Subject: [PATCH 2/2] Address feedback

---
 Oqtane.Client/Themes/Controls/ControlPanel.razor     | 7 -------
 Oqtane.Client/Themes/Controls/LanguageSwitcher.razor | 2 +-
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/Oqtane.Client/Themes/Controls/ControlPanel.razor b/Oqtane.Client/Themes/Controls/ControlPanel.razor
index 8018be30..931f3ff3 100644
--- a/Oqtane.Client/Themes/Controls/ControlPanel.razor
+++ b/Oqtane.Client/Themes/Controls/ControlPanel.razor
@@ -10,7 +10,6 @@
 @inject ILogService logger
 @inject ISettingService SettingService
 @inject IStringLocalizer<ControlPanel> Localizer
-@inject ILocalizationService LocalizationService
 
 @if (_moduleDefinitions != null && UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, PageState.Page.Permissions))
 {
@@ -318,12 +317,6 @@
             _allModuleDefinitions = await ModuleDefinitionService.GetModuleDefinitionsAsync(PageState.Site.SiteId);
             _moduleDefinitions = _allModuleDefinitions.Where(item => item.Categories.Contains(Category)).ToList();
             _categories = _allModuleDefinitions.SelectMany(m => m.Categories.Split(',')).Distinct().ToList();
-
-            var cultures = await LocalizationService.GetCulturesAsync();
-            if (cultures.Count() < 2)
-            {
-                ShowLanguageSwitcher = false;
-            }
         }
     }
 
diff --git a/Oqtane.Client/Themes/Controls/LanguageSwitcher.razor b/Oqtane.Client/Themes/Controls/LanguageSwitcher.razor
index 4dca37bc..16391513 100644
--- a/Oqtane.Client/Themes/Controls/LanguageSwitcher.razor
+++ b/Oqtane.Client/Themes/Controls/LanguageSwitcher.razor
@@ -6,7 +6,7 @@
 @inject ILocalizationService LocalizationService
 @inject NavigationManager NavigationManager
 
-@if (_supportedCultures != null)
+@if (_supportedCultures?.Count() > 1)
 {
     <div class="btn-group" role="group">
         <button id="btnCultures" type="button" class="btn btn-outline-secondary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">