Skip to content

Commit

Permalink
Merge pull request #2305 from unoplatform/mergify/bp/release/stable/4…
Browse files Browse the repository at this point in the history
….1/pr-2302

fix: ResourceLoaderStringLocalizer not resolving (backport #2302)
  • Loading branch information
jeromelaban committed May 27, 2024
2 parents afeae3c + d851c6c commit 6bfe93b
Showing 1 changed file with 4 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,12 @@ private LocalizedString GetLocalizedString(string name, params object[] argument
string? resource = null;
try
{
resource =
#if WINDOWS
resource = _appResourceMap.GetValue(name)?.ValueAsString ??
_defaultResourceMap.GetValue(name)?.ValueAsString;
_appResourceMap.GetValue(name)?.ValueAsString ??
_defaultResourceMap.GetValue(name)?.ValueAsString;
#else
resource = _appResourceLoader?.GetString(name) ??
(_appResourceLoader?.GetString(name) is { Length: > 0 } tmp ? tmp : null) ??
_defaultResourceLoader.GetString(name);
#endif

Expand Down

0 comments on commit 6bfe93b

Please sign in to comment.