Diplomarbeit-Absolventenverein/oqtane.framework
6
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev' into dev

Browse Source
This commit is contained in:
Charles Nurse
2021-04-28 15:08:00 -07:00
parent 1efd623a99 f9f0999315
commit 7296f94360
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Oqtane.Server/Repository/AliasRepository.cs
View File

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

3
Oqtane.Server/appsettings.json
View File

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

2
Oqtane.Shared/Shared/Constants.cs
View File

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