Skip to content

Commit f260d4e

Browse files
hishamcoryanbrandenburg
authored andcommitted
Fix issue #421
1 parent 4a38db2 commit f260d4e

File tree

1 file changed

+15
-2
lines changed

1 file changed

+15
-2
lines changed

src/Microsoft.Extensions.Localization/ResourceManagerWithCultureStringLocalizer.cs

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ namespace Microsoft.Extensions.Localization
1717
/// </summary>
1818
public class ResourceManagerWithCultureStringLocalizer : ResourceManagerStringLocalizer
1919
{
20+
private readonly string _resourceBaseName;
2021
private readonly CultureInfo _culture;
2122

2223
/// <summary>
@@ -62,6 +63,12 @@ internal ResourceManagerWithCultureStringLocalizer(
6263
throw new ArgumentNullException(nameof(culture));
6364
}
6465

66+
if (logger == null)
67+
{
68+
throw new ArgumentNullException(nameof(logger));
69+
}
70+
71+
_resourceBaseName = baseName;
6572
_culture = culture;
6673
}
6774

@@ -108,6 +115,12 @@ public ResourceManagerWithCultureStringLocalizer(
108115
throw new ArgumentNullException(nameof(culture));
109116
}
110117

118+
if (logger == null)
119+
{
120+
throw new ArgumentNullException(nameof(logger));
121+
}
122+
123+
_resourceBaseName = baseName;
111124
_culture = culture;
112125
}
113126

@@ -123,7 +136,7 @@ public override LocalizedString this[string name]
123136

124137
var value = GetStringSafely(name, _culture);
125138

126-
return new LocalizedString(name, value ?? name);
139+
return new LocalizedString(name, value ?? name, resourceNotFound: value == null, searchedLocation: _resourceBaseName);
127140
}
128141
}
129142

@@ -140,7 +153,7 @@ public override LocalizedString this[string name]
140153
var format = GetStringSafely(name, _culture);
141154
var value = string.Format(_culture, format ?? name, arguments);
142155

143-
return new LocalizedString(name, value ?? name, resourceNotFound: format == null);
156+
return new LocalizedString(name, value, resourceNotFound: format == null, searchedLocation: _resourceBaseName);
144157
}
145158
}
146159

0 commit comments

Comments
 (0)