Merge branch 'dev' of github.com:aspnet/Localization into dev

This commit is contained in:
jacalvar 2016-11-08 16:34:47 -08:00
Родитель f0a9f22db6 5c18449474
Коммит 6f3a68d80d
1 изменённых файлов: 17 добавлений и 8 удалений

Просмотреть файл

@ -36,19 +36,28 @@ namespace Microsoft.Extensions.Localization
Assembly resourceAssembly,
string baseName,
IResourceNamesCache resourceNamesCache)
: this(
resourceManager,
new AssemblyWrapper(resourceAssembly),
baseName,
resourceNamesCache)
{
}
/// <summary>
/// Intended for testing purposes only.
/// </summary>
public ResourceManagerStringLocalizer(
ResourceManager resourceManager,
AssemblyWrapper resourceAssemblyWrapper,
string baseName,
IResourceNamesCache resourceNamesCache)
: this(
resourceManager,
new AssemblyResourceStringProvider(
resourceNamesCache,
new AssemblyWrapper(resourceAssembly),
baseName),
new AssemblyResourceStringProvider(resourceNamesCache, resourceAssemblyWrapper, baseName),
baseName,
resourceNamesCache)
{
if (resourceAssembly == null)
{
throw new ArgumentNullException(nameof(resourceAssembly));
}
}
/// <summary>