Merge pull request #6163 from sbwalker/dev

fix #6157 - support changing language with LanguageSwitcher when not using content localization

Oqtane.Client/Themes/Controls/Theme/LanguageSwitcher.razor

@@ -48,7 +48,7 @@
     {
         MenuAlignment = DropdownAlignment.ToLower() == "right" ? "dropdown-menu-end" : string.Empty;
 
-        // if AliasName is populated it means the site is using content localization
+        // determine if site is using content localization
         _contentLocalization = PageState.Languages.Any(item => !string.IsNullOrEmpty(item.AliasName));
 
         if (PageState.QueryString.ContainsKey("culture"))

Oqtane.Server/Components/App.razor

@@ -194,7 +194,7 @@
                     ManageScripts(resources, alias);
                     AddBodyContent(site.BodyContent);
                     AddBodyContent(page.BodyContent);
-                    ManageLocalization(site);
+                    _language = ManageLocalization(alias, site);
 
                     // PWA script
                     if (site.PwaIsEnabled && site.PwaAppIconFileId != null && site.PwaSplashIconFileId != null)
@@ -810,52 +810,67 @@
         }
     }
 
-    private void ManageLocalization(Site site)
+    private string ManageLocalization(Alias alias, Site site)
     {
+        // get site culture (content localization)
+        var culture = site.CultureCode;
+        if (string.IsNullOrEmpty(culture))
+        {
+            // use fallback language
+            culture = LocalizationManager.GetDefaultCulture();
+        }
+
+        // determine if site is using content localization
+        var contentLocalization = site.Languages.Any(item => !string.IsNullOrEmpty(item.AliasName));
+
         // get user culture (ui localization)
-        var uiCulture = site?.User?.CultureCode;
+        var uiCulture = site.User?.CultureCode;
+        // if user has not specified a UI culture
         if (string.IsNullOrEmpty(uiCulture))
         {
-            // get default language for site
+            // if not using content localization
-            if (site.Languages.Any())
+            if (!contentLocalization)
             {
                 // use default language if specified otherwise use first language in collection
                 uiCulture = (site.Languages.Where(l => l.IsDefault).SingleOrDefault() ?? site.Languages.First()).Code;
             }
             else
             {
-                // fallback language
+                // use site culture
-                uiCulture = LocalizationManager.GetDefaultCulture();
+                uiCulture = culture;
-            }
-        }
-        
-        // get site culture (content localization)
-        var culture = site?.CultureCode;
-        if (string.IsNullOrEmpty(culture))
-        {
-            culture = uiCulture;
-        }
-        _language = culture; // html element language attribute
-
-        // get culture cookie
-        string cultureCookie = Context.Request.Cookies[Shared.CookieRequestCultureProvider.DefaultCookieName];
-        if (cultureCookie != null)
-        {
-            // verify culture cookie (which could be inaccurate when using subfolders ie. domain.com/fr as cookies are based on domain)
-            var requestCulture = Shared.CookieRequestCultureProvider.ParseCookieValue(cultureCookie);
-            if (culture != requestCulture.Culture.Name || uiCulture != requestCulture.UICulture.Name)
-            {
-                // convert to culture cookie format (ie. "c=en|uic=en") and save cookie
-                cultureCookie = Shared.CookieRequestCultureProvider.MakeCookieValue(new Models.RequestCulture(culture, uiCulture));
-                SetLocalizationCookie(cultureCookie);
             }
         }
         else
+        {
+            // if not using content localization and UI culture is not supported by site
+            if (!contentLocalization && !site.Languages.Any(item => item.Code == uiCulture))
+            {
+                // use site culture
+                uiCulture = culture;                
+            }
+        }
+
+        // get culture cookie
+        string cultureCookie = Context.Request.Cookies[Shared.CookieRequestCultureProvider.DefaultCookieName];
+        if (cultureCookie == null)
         {
             // convert to culture cookie format (ie. "c=en|uic=en") and save cookie
             cultureCookie = Shared.CookieRequestCultureProvider.MakeCookieValue(new Models.RequestCulture(culture, uiCulture));
             SetLocalizationCookie(cultureCookie);
         }
+        else
+        {
+            // validate the culture cookie
+            var requestCulture = Shared.CookieRequestCultureProvider.ParseCookieValue(cultureCookie);
+            if (requestCulture.Culture.Name != culture || requestCulture.UICulture.Name != uiCulture)
+            {
+                // convert to culture cookie format (ie. "c=en|uic=en") and save cookie
+                cultureCookie = Shared.CookieRequestCultureProvider.MakeCookieValue(new Models.RequestCulture(culture, uiCulture));
+                SetLocalizationCookie(cultureCookie);
+            }
+        }
+
+        return culture; // html element language attribute for page
     }
 
     private void SetLocalizationCookie(string cookieValue)