diff --git a/EnvelopeGenerator.Web/Middleware/CultureMiddleware.cs b/EnvelopeGenerator.Web/Middleware/CultureMiddleware.cs index c13e8a10..ea3200e6 100644 --- a/EnvelopeGenerator.Web/Middleware/CultureMiddleware.cs +++ b/EnvelopeGenerator.Web/Middleware/CultureMiddleware.cs @@ -24,9 +24,13 @@ public class CultureMiddleware if (string.IsNullOrEmpty(cookieValue)) { - context.Response.Cookies.SetCulture(_cultures.Default.Language); - CultureInfo.CurrentCulture = new CultureInfo(_cultures.Default.Language); - CultureInfo.CurrentUICulture = new CultureInfo(_cultures.Default.Language); + var requestCulture = context.GetCultureByAcceptLanguage()?.Name; + var culture = _cultures.GetOrDefault(requestCulture); + var cultureInfo = culture.Info ?? new CultureInfo(culture.Language); + + context.Response.Cookies.SetCulture(culture.Language); + CultureInfo.CurrentCulture = cultureInfo; + CultureInfo.CurrentUICulture = cultureInfo; } await _next(context);