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

Fix the merge

This commit is contained in:
damianedwards 2015-05-20 16:22:54 -07:00
parent e5a0918054
commit 5c7d811aa6
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Microsoft.AspNet.Localization/CustomRequestCultureProvider.cs
View File

@ -26,8 +26,6 @@ namespace Microsoft.AspNet.Localization
/// <inheritdoc /> /// <inheritdoc />
public override Task<RequestCulture> DetermineRequestCulture([NotNull] HttpContext httpContext) public override Task<RequestCulture> DetermineRequestCulture([NotNull] HttpContext httpContext)
{ => _provider(httpContext);
return _provider(httpContext);
}
} }
} }

3
src/Microsoft.AspNet.Localization/IApplicationBuilderExtensions.cs
View File

@ -33,6 +33,7 @@ namespace Microsoft.AspNet.Builder
/// <returns>The <see cref="IApplicationBuilder"/>.</returns> /// <returns>The <see cref="IApplicationBuilder"/>.</returns>
public static IApplicationBuilder UseRequestLocalization( public static IApplicationBuilder UseRequestLocalization(
[NotNull] this IApplicationBuilder builder, [NotNull] this IApplicationBuilder builder,
[NotNull] RequestLocalizationOptions options => builder.UseMiddleware<RequestLocalizationMiddleware>(options); [NotNull] RequestLocalizationOptions options)
=> builder.UseMiddleware<RequestLocalizationMiddleware>(options);
} }
} }