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

Merge branch 'dev' of https://github.com/hishamco/Localization into hishamco-dev 

Conflicts:
	src/Microsoft.AspNet.Localization/CustomRequestCultureStrategy.cs
	src/Microsoft.AspNet.Localization/IApplicationBuilderExtensions.cs
	src/Microsoft.Framework.Localization/ResourceManagerStringLocalizer.cs
This commit is contained in:
damianedwards 2015-05-20 16:17:57 -07:00
parent 4ba159afe7 91b3ea4547
commit e5a0918054
3 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,9 +33,6 @@ 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) [NotNull] RequestLocalizationOptions options => builder.UseMiddleware<RequestLocalizationMiddleware>(options);
{
return builder.UseMiddleware<RequestLocalizationMiddleware>(options);
}
} }
} }

10
src/Microsoft.Framework.Localization/ResourceManagerStringLocalizer.cs
View File

@ -124,15 +124,9 @@ namespace Microsoft.Framework.Localization
/// Returns an <see cref="IEnumerator{LocalizedString}"/> for all strings in the current culture. /// Returns an <see cref="IEnumerator{LocalizedString}"/> for all strings in the current culture.
/// </summary> /// </summary>
/// <returns>The <see cref="IEnumerator{LocalizedString}"/>.</returns> /// <returns>The <see cref="IEnumerator{LocalizedString}"/>.</returns>
public virtual IEnumerator<LocalizedString> GetEnumerator() public virtual IEnumerator<LocalizedString> GetEnumerator() => GetEnumerator(CultureInfo.CurrentUICulture);
{
return GetEnumerator(CultureInfo.CurrentUICulture);
}
IEnumerator IEnumerable.GetEnumerator() IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
{
return GetEnumerator();
}
/// <summary> /// <summary>
/// Returns an <see cref="IEnumerator{LocalizedString}"/> for all strings in the specified culture. /// Returns an <see cref="IEnumerator{LocalizedString}"/> for all strings in the specified culture.

5
src/Microsoft.Framework.Localization/ResourceManagerWithCultureStringLocalizer.cs
View File

@ -70,9 +70,6 @@ namespace Microsoft.Framework.Localization
} }
/// <inheritdoc /> /// <inheritdoc />
public override IEnumerator<LocalizedString> GetEnumerator() public override IEnumerator<LocalizedString> GetEnumerator() => GetEnumerator(_culture);
{
return GetEnumerator(_culture);
}
} }
} }