diff --git a/test/WebSites/FiltersWebSite/LocalizationPipeline.cs b/test/WebSites/FiltersWebSite/LocalizationPipeline.cs index d61e355c66..ad0623722e 100644 --- a/test/WebSites/FiltersWebSite/LocalizationPipeline.cs +++ b/test/WebSites/FiltersWebSite/LocalizationPipeline.cs @@ -5,6 +5,7 @@ using System.Globalization; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Localization; using Microsoft.AspNetCore.Mvc.Localization; +using Microsoft.AspNetCore.Localization.Routing; namespace FiltersWebSite { diff --git a/test/WebSites/FiltersWebSite/RouteDataRequestCultureProvider.cs b/test/WebSites/FiltersWebSite/RouteDataRequestCultureProvider.cs deleted file mode 100644 index 0f005d5498..0000000000 --- a/test/WebSites/FiltersWebSite/RouteDataRequestCultureProvider.cs +++ /dev/null @@ -1,72 +0,0 @@ -using System; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Routing; -using Microsoft.AspNetCore.Localization; - -namespace FiltersWebSite -{ - /// - /// Determines the culture information for a request via values in the route data. - /// - public class RouteDataRequestCultureProvider : RequestCultureProvider - { - /// - /// The key that contains the culture name. - /// Defaults to "culture". - /// - public string RouteDataStringKey { get; set; } = "culture"; - - /// - /// The key that contains the UI culture name. If not specified or no value is found, - /// will be used. - /// Defaults to "ui-culture". - /// - public string UIRouteDataStringKey { get; set; } = "ui-culture"; - - /// - public override Task DetermineProviderCultureResult(HttpContext httpContext) - { - if (httpContext == null) - { - throw new ArgumentNullException(nameof(httpContext)); - } - - string culture = null; - string uiCulture = null; - - if (!string.IsNullOrWhiteSpace(RouteDataStringKey)) - { - culture = httpContext.GetRouteValue(RouteDataStringKey) as string; - } - - if (!string.IsNullOrWhiteSpace(UIRouteDataStringKey)) - { - uiCulture = httpContext.GetRouteValue(UIRouteDataStringKey) as string; - } - - if (culture == null && uiCulture == null) - { - // No values specified for either so no match - return Task.FromResult((ProviderCultureResult)null); - } - - if (culture != null && uiCulture == null) - { - // Value for culture but not for UI culture so default to culture value for both - uiCulture = culture; - } - - if (culture == null && uiCulture != null) - { - // Value for UI culture but not for culture so default to UI culture value for both - culture = uiCulture; - } - - var providerResultCulture = new ProviderCultureResult(culture, uiCulture); - - return Task.FromResult(providerResultCulture); - } - } - -} diff --git a/test/WebSites/FiltersWebSite/project.json b/test/WebSites/FiltersWebSite/project.json index 8cfa9fbb86..dd3a0b96da 100644 --- a/test/WebSites/FiltersWebSite/project.json +++ b/test/WebSites/FiltersWebSite/project.json @@ -5,6 +5,7 @@ }, "dependencies": { "Microsoft.AspNetCore.Authentication": "1.1.0-*", + "Microsoft.AspNetCore.Localization.Routing": "1.1.0-*", "Microsoft.AspNetCore.Mvc": "1.1.0-*", "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.1.0-*", "Microsoft.AspNetCore.Mvc.TestConfiguration": "1.0.0",