Localization 238 B

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162
  1. commit f260d4e5244ca536c5fcc05ccea1163548c6eddc
  2. Author: hishamco <[email protected]>
  3. Date: Mon Oct 16 14:25:11 2017 +0300
  4. Fix issue #421
  5. diff --git a/src/Microsoft.Extensions.Localization/ResourceManagerWithCultureStringLocalizer.cs b/src/Microsoft.Extensions.Localization/ResourceManagerWithCultureStringLocalizer.cs
  6. index c6c7b370cd1..65b6ae242c6 100644
  7. --- a/src/Microsoft.Extensions.Localization/ResourceManagerWithCultureStringLocalizer.cs
  8. +++ b/src/Microsoft.Extensions.Localization/ResourceManagerWithCultureStringLocalizer.cs
  9. @@ -17,6 +17,7 @@ namespace Microsoft.Extensions.Localization
  10. /// </summary>
  11. public class ResourceManagerWithCultureStringLocalizer : ResourceManagerStringLocalizer
  12. {
  13. + private readonly string _resourceBaseName;
  14. private readonly CultureInfo _culture;
  15. /// <summary>
  16. @@ -62,6 +63,12 @@ namespace Microsoft.Extensions.Localization
  17. throw new ArgumentNullException(nameof(culture));
  18. }
  19. + if (logger == null)
  20. + {
  21. + throw new ArgumentNullException(nameof(logger));
  22. + }
  23. +
  24. + _resourceBaseName = baseName;
  25. _culture = culture;
  26. }
  27. @@ -108,6 +115,12 @@ namespace Microsoft.Extensions.Localization
  28. throw new ArgumentNullException(nameof(culture));
  29. }
  30. + if (logger == null)
  31. + {
  32. + throw new ArgumentNullException(nameof(logger));
  33. + }
  34. +
  35. + _resourceBaseName = baseName;
  36. _culture = culture;
  37. }
  38. @@ -123,7 +136,7 @@ namespace Microsoft.Extensions.Localization
  39. var value = GetStringSafely(name, _culture);
  40. - return new LocalizedString(name, value ?? name);
  41. + return new LocalizedString(name, value ?? name, resourceNotFound: value == null, searchedLocation: _resourceBaseName);
  42. }
  43. }
  44. @@ -140,7 +153,7 @@ namespace Microsoft.Extensions.Localization
  45. var format = GetStringSafely(name, _culture);
  46. var value = string.Format(_culture, format ?? name, arguments);
  47. - return new LocalizedString(name, value ?? name, resourceNotFound: format == null);
  48. + return new LocalizedString(name, value, resourceNotFound: format == null, searchedLocation: _resourceBaseName);
  49. }
  50. }