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

Merge remote-tracking branch 'upstream/dev' into default-language-fix

Browse Source
This commit is contained in:
hishamco
2021-02-05 15:35:52 +03:00
parent 90ca6aafe9 170289cc8e
commit 3f29fd1b9f
33 changed files with 671 additions and 510 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Oqtane.Server/Pages/_Host.cshtml.cs
View File

@ -43,8 +43,8 @@ namespace Oqtane.Pages
ProcessThemeControls(assembly);
}
// if framework is installed
if (!string.IsNullOrEmpty(_configuration.GetConnectionString("DefaultConnection")))
// if culture not specified and framework is installed
if (HttpContext.Request.Cookies[CookieRequestCultureProvider.DefaultCookieName] == null && !string.IsNullOrEmpty(_configuration.GetConnectionString("DefaultConnection")))
{
var uri = new Uri(Request.GetDisplayUrl());
var alias = _aliases.GetAlias(uri.Authority + "/" + uri.LocalPath.Substring(1));
@ -61,6 +61,13 @@ namespace Oqtane.Pages
CookieRequestCultureProvider.MakeCookieValue(
new RequestCulture(defaultLanguage.Code)));
}
else
{
HttpContext.Response.Cookies.Append(
CookieRequestCultureProvider.DefaultCookieName,
CookieRequestCultureProvider.MakeCookieValue(
new RequestCulture(_configuration.GetSection("Localization").GetValue("DefaultCulture", Constants.DefaultCulture))));
}
}
}