Skip to content

fix(agent-installer): resolve raw localization keys in custom dialog labels #1836

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

Draft
irvingouj@Devolutions (irvingoujAtDevolution) wants to merge 2 commits into
base: master
Choose a base branch
from
+8 −27
Draft

fix(agent-installer): resolve raw localization keys in custom dialog labels #1836

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3aaeb60
chore(agent-installer): track custom installer dialog localization gap
irvingoujAtDevolution Jun 23, 2026
2583b50
fix(agent-installer): localize custom installer dialog labels
irvingoujAtDevolution Jun 24, 2026
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
35 changes: 8 additions & 27 deletions package/AgentWindowsManaged/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,7 @@
using System.IO.Compression;
using System.Linq;
using System.Security.Cryptography;
using System.Text.RegularExpressions;
using System.Windows.Forms;
using System.Xml;

using WixSharp;
using WixSharp.CommonTasks;
Expand Down Expand Up @@ -427,33 +425,16 @@ private static void Project_UIInitialized(SetupEventArgs e)
string lcid = CultureInfo.CurrentUICulture.TwoLetterISOLanguageName == "fr" ? frFR.Key : enUS.Key;

using Stream stream = Assembly.GetExecutingAssembly()
.GetManifestResourceStream($"DevolutionsAgent.Resources.{Languages[lcid]}");
.GetManifestResourceStream($"DevolutionsAgent.Resources.{Languages[lcid]}")
?? throw new FileNotFoundException($"Missing localization resource: {Languages[lcid]}");
using MemoryStream memory = new();
stream.CopyTo(memory);

XmlDocument xml = new();
xml.Load(stream);
InstallerRuntime runtime = e.ManagedUI.Shell.RuntimeContext as InstallerRuntime
?? throw new InvalidOperationException("Managed UI runtime is not available");
runtime.UIText.InitFromWxl(memory.ToArray(), true);

Dictionary<string, string> strings = new();

foreach (XmlNode s in xml.GetElementsByTagName("String"))
{
strings.Add(s.Attributes["Id"].Value, s.InnerText);
}

string I18n(string key)
{
if (!strings.TryGetValue(key, out string result))
{
return key;
}

return Regex.Replace(result, @"\[(.*?)]", (match) =>
{
string property = match.Groups[1].Value;
string value = e.Session[property];

return string.IsNullOrEmpty(value) ? property : value;
});
}
string I18n(string key) => $"[{key}]".LocalizeWith(runtime.Localize);

if (!Environment.Is64BitOperatingSystem)
{
Expand Down
Loading