Merge pull request #93 from oqtane/dev

sync

Oqtane.Client/Modules/Admin/Languages/Add.razor

@@ -61,6 +61,10 @@ else
         {
             AddModuleMessage(Localizer["The Only Supported Culture That Has Been Defined Is English"], MessageType.Warning);
         }
+        else
+        {
+            _supportedCultures = _supportedCultures.Where(c => !c.Name.Equals(Constants.DefaultCulture));
+        }
     }
 
     private async Task SaveLanguage()

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

@@ -27,6 +27,10 @@
     protected override async Task OnParametersSetAsync()
     {
         var languages = await LanguageService.GetLanguagesAsync(PageState.Site.SiteId);
+        var defaultCulture = CultureInfo.GetCultureInfo(Constants.DefaultCulture);
+
+        languages.Add(new Language { Code = defaultCulture.Name, Name = defaultCulture.DisplayName });
+        
         _supportedCultures = languages.Select(l => new Culture { Name = l.Code, DisplayName = l.Name });
     }
 

Oqtane.Server/Repository/AliasRepository.cs

@@ -65,8 +65,8 @@ namespace Oqtane.Repository
                     break; // found a matching alias
                 }
             }
-
-            return alias;
+            // return fallback alias
+            return alias ?? aliases.Find(item => item.Name.Equals("*"));
         }
 
         public void DeleteAlias(int aliasId)

Oqtane.Server/appsettings.json

@@ -16,7 +16,6 @@
     "DefaultContainer": ""
   },
   "Localization": {
-    "DefaultCulture": "",
-    "SupportedCultures": []
+    "DefaultCulture": "en"
   }
 }

Oqtane.Shared/Shared/Constants.cs

@@ -71,6 +71,6 @@ namespace Oqtane.Shared {
 
         public static readonly string SatelliteAssemblyExtension = ".resources.dll";
 
-        public static readonly string DefaultCulture = CultureInfo.InstalledUICulture.Name;
+        public static readonly string DefaultCulture = "en";
     }
 }