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

This commit is contained in:
jacalvar 2016-11-08 16:34:47 -08:00
commit 6f3a68d80d
1 changed files with 17 additions and 8 deletions

View File

@ -36,19 +36,28 @@ namespace Microsoft.Extensions.Localization
Assembly resourceAssembly, Assembly resourceAssembly,
string baseName, string baseName,
IResourceNamesCache resourceNamesCache) 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( : this(
resourceManager, resourceManager,
new AssemblyResourceStringProvider( new AssemblyResourceStringProvider(resourceNamesCache, resourceAssemblyWrapper, baseName),
resourceNamesCache,
new AssemblyWrapper(resourceAssembly),
baseName),
baseName, baseName,
resourceNamesCache) resourceNamesCache)
{ {
if (resourceAssembly == null)
{
throw new ArgumentNullException(nameof(resourceAssembly));
}
} }
/// <summary> /// <summary>