Fix issue #421
This commit is contained in:
parent
4a38db25e9
commit
f260d4e524
|
|
@ -17,6 +17,7 @@ namespace Microsoft.Extensions.Localization
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class ResourceManagerWithCultureStringLocalizer : ResourceManagerStringLocalizer
|
public class ResourceManagerWithCultureStringLocalizer : ResourceManagerStringLocalizer
|
||||||
{
|
{
|
||||||
|
private readonly string _resourceBaseName;
|
||||||
private readonly CultureInfo _culture;
|
private readonly CultureInfo _culture;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
@ -62,6 +63,12 @@ namespace Microsoft.Extensions.Localization
|
||||||
throw new ArgumentNullException(nameof(culture));
|
throw new ArgumentNullException(nameof(culture));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (logger == null)
|
||||||
|
{
|
||||||
|
throw new ArgumentNullException(nameof(logger));
|
||||||
|
}
|
||||||
|
|
||||||
|
_resourceBaseName = baseName;
|
||||||
_culture = culture;
|
_culture = culture;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -108,6 +115,12 @@ namespace Microsoft.Extensions.Localization
|
||||||
throw new ArgumentNullException(nameof(culture));
|
throw new ArgumentNullException(nameof(culture));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (logger == null)
|
||||||
|
{
|
||||||
|
throw new ArgumentNullException(nameof(logger));
|
||||||
|
}
|
||||||
|
|
||||||
|
_resourceBaseName = baseName;
|
||||||
_culture = culture;
|
_culture = culture;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -123,7 +136,7 @@ namespace Microsoft.Extensions.Localization
|
||||||
|
|
||||||
var value = GetStringSafely(name, _culture);
|
var value = GetStringSafely(name, _culture);
|
||||||
|
|
||||||
return new LocalizedString(name, value ?? name);
|
return new LocalizedString(name, value ?? name, resourceNotFound: value == null, searchedLocation: _resourceBaseName);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -140,7 +153,7 @@ namespace Microsoft.Extensions.Localization
|
||||||
var format = GetStringSafely(name, _culture);
|
var format = GetStringSafely(name, _culture);
|
||||||
var value = string.Format(_culture, format ?? name, arguments);
|
var value = string.Format(_culture, format ?? name, arguments);
|
||||||
|
|
||||||
return new LocalizedString(name, value ?? name, resourceNotFound: format == null);
|
return new LocalizedString(name, value, resourceNotFound: format == null, searchedLocation: _resourceBaseName);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue