Skip to content

fix(i18n): stop leaking a ResourceDictionary on every language switch #165

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
divya0795 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(i18n): stop leaking a ResourceDictionary on every language switch #165

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 17 additions & 5 deletions WandEnhancer/Core/Services/LocalizationManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,11 @@ public static class LocalizationManager
private static CultureInfo _currentLanguage;
private static ResourceDictionary _englishBaseDictionary;

// The locale dictionary currently merged into the application resources. It is built in
// code and therefore has no Source, so it cannot be found again by the Source-based lookup
// below; tracking it here is what allows the previous one to be removed on every switch.
private static ResourceDictionary _currentLocaleDictionary;

public static CultureInfo CurrentLanguage
{
get => _currentLanguage;
Expand Down Expand Up @@ -104,20 +109,27 @@ private static void SetLanguage(CultureInfo culture, bool saveSettings = true)
localeDict[entry.Key] = targetDict[entry.Key];
}

// Find and replace the old locale dictionary
var oldDict = Application.Current.Resources.MergedDictionaries
// Find and replace the old locale dictionary. The tracked instance is checked first
// because only the very first replacement targets the Source-bearing dictionary merged
// by App.xaml; every later one targets a code-built dictionary with no Source.
var oldDict = _currentLocaleDictionary ?? Application.Current.Resources.MergedDictionaries
.FirstOrDefault(d => d.Source != null && d.Source.OriginalString.StartsWith("Locale/lang."));

if (oldDict != null)
var index = oldDict != null
? Application.Current.Resources.MergedDictionaries.IndexOf(oldDict)
: -1;

if (index >= 0)
{
var index = Application.Current.Resources.MergedDictionaries.IndexOf(oldDict);
Application.Current.Resources.MergedDictionaries.Remove(oldDict);
Application.Current.Resources.MergedDictionaries.RemoveAt(index);
Application.Current.Resources.MergedDictionaries.Insert(index, localeDict);
}
else
{
Application.Current.Resources.MergedDictionaries.Add(localeDict);
}

_currentLocaleDictionary = localeDict;

if (saveSettings)
{
Expand Down