huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix issue #88

This commit is contained in:
Hisham Bin Ateya 2015-09-22 04:54:58 +03:00 committed by Kirthi Krishnamraju
parent ed70441162
commit 61106d36a1
2 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Microsoft.AspNet.Localization/AcceptLanguageHeaderRequestCultureProvider.cs
View File

@ -57,7 +57,7 @@ namespace Microsoft.AspNet.Localization
requestCulture = ValidateRequestCulture(requestCulture);
if (requestCulture.Culture == culture)
if (requestCulture?.Culture == culture)
{
return Task.FromResult(requestCulture);
}

33
test/Microsoft.AspNet.Localization.Tests/AccessLanguageHeaderRequestCultureProviderTest.cs
View File

@ -106,5 +106,38 @@ namespace Microsoft.Framework.Localization.Tests
var response = await client.GetAsync(string.Empty);
}
}
[Fact]
public async void OmitDefaultRequestCultureShouldNotThrowNullReferenceException_And_ShouldGetTheRightCulture()
{
using (var server = TestServer.Create(app =>
{
var options = new RequestLocalizationOptions()
{
SupportedCultures = new List<CultureInfo>
{
new CultureInfo("ar-YE")
},
SupportedUICultures = new List<CultureInfo>
{
new CultureInfo("ar-YE")
}
};
app.UseRequestLocalization(options);
app.Run(context =>
{
var requestCultureFeature = context.Features.Get<IRequestCultureFeature>();
var requestCulture = requestCultureFeature.RequestCulture;
Assert.Equal("ar-YE", requestCulture.Culture.Name);
Assert.Equal("ar-YE", requestCulture.UICulture.Name);
return Task.FromResult(0);
});
}))
{
var client = server.CreateClient();
client.DefaultRequestHeaders.AcceptLanguage.ParseAdd("en-GB,ar-YE,en-US");
var response = await client.GetAsync(string.Empty);
}
}
}
}