From 72a0755ff3be058472bd9072d492678cf9a9000a Mon Sep 17 00:00:00 2001 From: Az <56699741+AlchlcDvl@users.noreply.github.com> Date: Tue, 3 Nov 2026 10:31:56 -0500 Subject: [PATCH 1/5] improve system --- MiraAPI/Translation/MiraLocaleManager.cs | 167 +++++++++++++++-------- 1 file changed, 109 insertions(+), 58 deletions(-) diff --git a/MiraAPI/Translation/MiraLocaleManager.cs b/MiraAPI/Translation/MiraLocaleManager.cs index 1bd925df..043f20e5 100644 --- a/MiraAPI/Translation/MiraLocaleManager.cs +++ b/MiraAPI/Translation/MiraLocaleManager.cs @@ -4,6 +4,7 @@ using System.IO; using System.Linq; using System.Reflection; using System.Xml; +using AmongUs.Data; using MiraAPI.Utilities; using Reactor.Localization.Utilities; using UnityEngine; @@ -16,6 +17,8 @@ namespace MiraAPI.Translation; public static class MiraLocaleManager { private const string LangDirectory = "mira_languages"; + private const string RefPrefix = "@ref:"; + private const int MaxDepth = 10; // Language, XML Name, then Value @@ -40,6 +43,7 @@ public static class MiraLocaleManager /// public static Dictionary LangList { get; } = new() { + // Vanilla { MiraLanguage.English, "en_US" }, { MiraLanguage.Latam, "es_419" }, { MiraLanguage.Brazilian, "pt_BR" }, @@ -56,16 +60,20 @@ public static class MiraLocaleManager { MiraLanguage.SChinese, "zh_CN" }, { MiraLanguage.TChinese, "zh_TW" }, { MiraLanguage.Irish, "ga_IE" }, - { MiraLanguage.Polish, "pl_PL" }, // Custom - { MiraLanguage.Turkish, "tr_TR" }, // Custom - { MiraLanguage.Swedish, "sv_SE" }, // Custom - { MiraLanguage.Lithuanian, "lt_LT" }, // Custom - { MiraLanguage.Czech, "cs_CZ" }, // Custom - { MiraLanguage.LChinese, "lzh_CN" }, // Custom - { MiraLanguage.Greek, "el_GR" }, // Custom - { MiraLanguage.Arabic, "arb" }, // Custom - { MiraLanguage.Hebrew, "heb" }, // Custom + + // Custom + { MiraLanguage.Polish, "pl_PL" }, + { MiraLanguage.Turkish, "tr_TR" }, + { MiraLanguage.Swedish, "sv_SE" }, + { MiraLanguage.Lithuanian, "lt_LT" }, + { MiraLanguage.Czech, "cs_CZ" }, + { MiraLanguage.LChinese, "lzh_CN" }, + { MiraLanguage.Greek, "el_GR" }, + { MiraLanguage.Arabic, "arb" }, + { MiraLanguage.Hebrew, "heb" }, }; + private static readonly Dictionary ReverseLangLookup = + LangList.ToDictionary(x => x.Value, x => x.Key); /// /// Gets a dictionary mapping values to their standard language codes. @@ -111,7 +119,7 @@ public static class MiraLocaleManager { try { - var langName = AmongUs.Data.DataManager.Settings.Language.CurrentLanguage; + var langName = DataManager.Settings.Language.CurrentLanguage; return (MiraLanguage)langName; } catch @@ -248,7 +256,7 @@ public static class MiraLocaleManager text = translation; } - foreach (var tmpText in parseList.Where(x => text.Contains(x.Key))) + foreach (var tmpText in parseList) { text = text.Replace(tmpText.Key, tmpText.Value); } @@ -329,16 +337,16 @@ public static class MiraLocaleManager { var fileName = Path.GetFileNameWithoutExtension(filePath); - var lang = LangList.ContainsValue(fileName) - ? LangList.First(x => x.Value == fileName).Key - : (MiraLanguage)(-1); - if ((int)lang == -1) continue; + if (!ReverseLangLookup.TryGetValue(fileName, out var lang)) + { + continue; + } try { Locale.TryAdd(lang, []); - var xmlContent = File.ReadAllText(filePath); - ParseXmlFile(xmlContent, lang, false); + using var fileStream = File.OpenRead(filePath); + ParseXmlFile(fileStream, lang, false); } catch (Exception e) { @@ -354,27 +362,26 @@ public static class MiraLocaleManager RegisteredModIds.Add(modGuid); var atLeastOneLoaded = false; - foreach (var locale in LangList) + + foreach (var (lang, name) in LangList) { - using var resourceStream = - assembly.GetManifestResourceStream(resourcePrefix + locale.Value + ".xml"); + using var resourceStream = assembly.GetManifestResourceStream(resourcePrefix + name + ".xml"); + if (resourceStream == null) { // Silently skipped continue; } - using StreamReader reader = new(resourceStream); - var xmlContent = reader.ReadToEnd(); try { - Locale.TryAdd(locale.Key, []); - ParseXmlFile(xmlContent, locale.Key, true); + Locale.TryAdd(lang, []); + ParseXmlFile(resourceStream, lang, true); atLeastOneLoaded = true; } catch (Exception e) { - Error($"Failed to load translation {resourcePrefix}{locale.Value}: {e.Message}"); + Error($"Failed to load translation {resourcePrefix}{name}: {e.Message}"); } } @@ -391,52 +398,96 @@ public static class MiraLocaleManager /// The language that the xml file corresponds to. /// Flag that indicates if the xml being parsed is internal or not. public static void ParseXmlFile(string xmlContent, MiraLanguage language, bool loadingInternal) + { + using var stringReader = new StringReader(xmlContent); + using var xmlReader = XmlReader.Create(stringReader); + ParseXml(xmlReader, language, loadingInternal); + } + + /// + /// Parses the provided xml stream into translation keys and values and registers them to the locale manager. + /// + /// The stream to the xml content. + /// The language that the xml file corresponds to. + /// Flag that indicates if the xml being parsed is internal or not. + public static void ParseXmlFile(Stream xmlStream, MiraLanguage language, bool loadingInternal) + { + using var reader = XmlReader.Create(xmlStream); + ParseXml(reader, language, loadingInternal); + } + + private static void ParseXml(XmlReader reader, MiraLanguage language, bool loadingInternal) { var dict = Locale[language]; - XmlDocument xmlDoc = new(); + var total = 0; + + var pendingRefs = new Dictionary(); + try { - xmlDoc.LoadXml(xmlContent); - var stringNodes = xmlDoc.SelectNodes("/resources/string"); - - if (stringNodes == null) + while (reader.ReadToFollowing("string")) { - return; + var name = reader.GetAttribute("name"); + + if (string.IsNullOrEmpty(name)) + continue; + + if (loadingInternal && dict.ContainsKey(name)) + { + Error($"String for \"{name}\" in {language} was overwritten by a duplicate!"); + } + + var value = reader.ReadElementContentAsString(); + + if (value.StartsWith(RefPrefix, StringComparison.Ordinal)) + { + pendingRefs[name] = value[RefPrefix.Length..]; + } + else + { + value = value.Replace('[', '<') + .Replace(']', '>') + .Replace("", "\n") + .Replace("", "&"); + + dict[name] = value; + total++; + } } - var total = 0; - - foreach (XmlNode node in stringNodes) + foreach (var unresolved in pendingRefs) { - if (node.Attributes?["name"] == null) + var originalKey = unresolved.Key; + var currentTarget = unresolved.Value; + var depth = 0; + var resolved = false; + + while (depth < MaxDepth) { - continue; + if (dict.TryGetValue(currentTarget, out var resolvedValue)) + { + dict[originalKey] = resolvedValue; + total++; + resolved = true; + break; + } + + if (pendingRefs.TryGetValue(currentTarget, out var nextTarget)) + { + currentTarget = nextTarget; + depth++; + } + else + { + Error($"Translation reference '{unresolved.Value}' for '{originalKey}' not found."); + break; + } } - var name = node.Attributes["name"]!.Value; - var value = node.InnerText; - - if (string.IsNullOrEmpty(name)) continue; - - if (value.Contains('[')) + if (!resolved && depth >= MaxDepth) { - value = value.Replace('[', '<'); + Error($"Circular translation reference or max depth exceeded for '{originalKey}'."); } - - if (value.Contains(']')) - { - value = value.Replace(']', '>'); - } - - value = value.Replace("", "\n").Replace("", "&"); - - if (loadingInternal && Locale[language].ContainsKey(name)) - { - Error($"String for \"{name}\" in {language} was overwritten by duplicate!"); - } - - dict[name] = value; - total++; } Info($"Loaded {language.ToDisplayString()} translation with ({total} keys)"); From b0549e3a9a414fbb188610351b831eb8e211a814 Mon Sep 17 00:00:00 2001 From: Az <56699741+AlchlcDvl@users.noreply.github.com> Date: Fri, 6 Nov 2026 17:14:30 -0500 Subject: [PATCH 2/5] consolidate code --- MiraAPI/Translation/MiraLocaleManager.cs | 59 ++++-------------------- 1 file changed, 9 insertions(+), 50 deletions(-) diff --git a/MiraAPI/Translation/MiraLocaleManager.cs b/MiraAPI/Translation/MiraLocaleManager.cs index 043f20e5..0218e4aa 100644 --- a/MiraAPI/Translation/MiraLocaleManager.cs +++ b/MiraAPI/Translation/MiraLocaleManager.cs @@ -129,11 +129,7 @@ public static class MiraLocaleManager } } - /// - /// Registers translations for a mod. - /// Call once per mod during plugin Load(). - /// - /// The mod GUID (e.g., "mira.example"). + /// [Obsolete("Pass typeof(YourPlugin).Assembly directly to Register for better performance.")] public static void Register(string modGuid) { @@ -141,23 +137,13 @@ public static class MiraLocaleManager LoadInternalStrings(callingAssembly, callingAssembly.GetName().Name!, modGuid); } - /// - /// Registers translations for a mod. - /// Call once per mod during plugin Load(). - /// - /// The mod GUID (e.g., "mira.example"). - /// The to load the strings from. + /// public static void Register(string modGuid, Assembly assembly) { LoadInternalStrings(assembly, assembly.GetName().Name!, modGuid); } - /// - /// Registers translations for a mod. - /// Call once per mod during plugin Load(). - /// - /// The mod GUID (e.g., "mira.example"). - /// The mod's root namespace (e.g., "mira.api"). + /// [Obsolete("Pass typeof(YourPlugin).Assembly directly to Register for better performance.")] public static void Register(string modGuid, string internalName) { @@ -177,12 +163,7 @@ public static class MiraLocaleManager LoadInternalStrings(assembly, internalName, modGuid); } - /// - /// Translates a key into the current language. - /// - /// The string id to find. - /// Fallback string to use if no translation is found. - /// A based on the key provided. + /// public static string Get(string key, string fallback = "") { return Get(CurrentLanguage, key, fallback != string.Empty ? fallback : key); @@ -212,13 +193,7 @@ public static class MiraLocaleManager return fallback; } - /// - /// Translates a key into the current language. - /// - /// The string id to find. - /// List of keys to change into other text. - /// Fallback string to use if no translation is found. - /// A based on the key provided. + /// public static string GetParsed( string key, Dictionary parseList, @@ -241,20 +216,9 @@ public static class MiraLocaleManager Dictionary parseList, string fallback = "") { - var text = fallback; - - if (Locale.TryGetValue(MiraLanguage.English, out var translationsEng) && - translationsEng.TryGetValue(key, out var translationEng)) - { - text = translationEng; - } - - if (language is not MiraLanguage.English && - Locale.TryGetValue(language, out var translations) && - translations.TryGetValue(key, out var translation)) - { - text = translation; - } + var text = Locale.GetValueOrDefault(language)?.GetValueOrDefault(key) + ?? Locale.GetValueOrDefault(MiraLanguage.English)?.GetValueOrDefault(key) + ?? fallback; foreach (var tmpText in parseList) { @@ -276,12 +240,7 @@ public static class MiraLocaleManager return idPart.StartsWith('#') ? idPart[1..] : $"{modId}.{idPart}.{suffix}"; } - /// - /// Builds a formatted translation ID string using a mod ID and a specific ID part. - /// - /// The mod GUID. - /// The core part of the ID. If it starts with '#', the character is stripped. - /// A formatted translation ID . + /// public static string BuildTranslationId(string modId, string idPart) { return idPart.StartsWith('#') ? idPart[1..] : $"{modId}.{idPart}"; From ae500b53c8739a9c536f55ec034c52c7428c7669 Mon Sep 17 00:00:00 2001 From: Az <56699741+AlchlcDvl@users.noreply.github.com> Date: Sat, 7 Nov 2026 20:40:05 -0500 Subject: [PATCH 3/5] slight expansion --- MiraAPI/Translation/MiraLocaleManager.cs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/MiraAPI/Translation/MiraLocaleManager.cs b/MiraAPI/Translation/MiraLocaleManager.cs index 0218e4aa..99248089 100644 --- a/MiraAPI/Translation/MiraLocaleManager.cs +++ b/MiraAPI/Translation/MiraLocaleManager.cs @@ -216,9 +216,12 @@ public static class MiraLocaleManager Dictionary parseList, string fallback = "") { - var text = Locale.GetValueOrDefault(language)?.GetValueOrDefault(key) - ?? Locale.GetValueOrDefault(MiraLanguage.English)?.GetValueOrDefault(key) - ?? fallback; + var text = Locale.GetValueOrDefault(language)?.GetValueOrDefault(key); + + if (language != MiraLanguage.English) + text = Locale.GetValueOrDefault(MiraLanguage.English)?.GetValueOrDefault(key); + + text ??= fallback; foreach (var tmpText in parseList) { From 2e3a3a7285032171acf9b1e7b1cecad129741c0d Mon Sep 17 00:00:00 2001 From: Az <56699741+AlchlcDvl@users.noreply.github.com> Date: Sat, 7 Nov 2026 20:54:52 -0500 Subject: [PATCH 4/5] fix oversight and add overload --- MiraAPI/Translation/MiraLocaleManager.cs | 44 ++++++++++++++++++++++-- 1 file changed, 41 insertions(+), 3 deletions(-) diff --git a/MiraAPI/Translation/MiraLocaleManager.cs b/MiraAPI/Translation/MiraLocaleManager.cs index 99248089..c1f914f6 100644 --- a/MiraAPI/Translation/MiraLocaleManager.cs +++ b/MiraAPI/Translation/MiraLocaleManager.cs @@ -202,6 +202,15 @@ public static class MiraLocaleManager return GetParsed(CurrentLanguage, key, parseList, fallback != string.Empty ? fallback : key); } + /// + public static string GetParsed( + string key, + (string, string)[] parseList, + string fallback = "") + { + return GetParsed(CurrentLanguage, key, parseList, fallback != string.Empty ? fallback : key); + } + /// /// Translates a key into the current language. /// @@ -219,13 +228,42 @@ public static class MiraLocaleManager var text = Locale.GetValueOrDefault(language)?.GetValueOrDefault(key); if (language != MiraLanguage.English) - text = Locale.GetValueOrDefault(MiraLanguage.English)?.GetValueOrDefault(key); + text ??= Locale.GetValueOrDefault(MiraLanguage.English)?.GetValueOrDefault(key); text ??= fallback; - foreach (var tmpText in parseList) + foreach (var (toReplace, value) in parseList) { - text = text.Replace(tmpText.Key, tmpText.Value); + text = text.Replace(toReplace, value); + } + + return text; + } + + /// + /// Translates a key into the current language. + /// + /// The specific language to prioritize. + /// The string id to find. + /// List of keys to change into other text. + /// Fallback string to use if no translation is found. + /// A based on the key provided. + public static string GetParsed( + MiraLanguage language, + string key, + (string, string)[] parseList, + string fallback = "") + { + var text = Locale.GetValueOrDefault(language)?.GetValueOrDefault(key); + + if (language != MiraLanguage.English) + text ??= Locale.GetValueOrDefault(MiraLanguage.English)?.GetValueOrDefault(key); + + text ??= fallback; + + foreach (var (toReplace, value) in parseList) + { + text = text.Replace(toReplace, value); } return text; From 9a53897f28daefc98797aed521c43c47303c635b Mon Sep 17 00:00:00 2001 From: Az <56699741+AlchlcDvl@users.noreply.github.com> Date: Sun, 8 Nov 2026 01:10:57 -0500 Subject: [PATCH 5/5] some more deduplication --- MiraAPI/Translation/MiraLocaleManager.cs | 81 ++++++------------------ 1 file changed, 19 insertions(+), 62 deletions(-) diff --git a/MiraAPI/Translation/MiraLocaleManager.cs b/MiraAPI/Translation/MiraLocaleManager.cs index c1f914f6..028ffcb2 100644 --- a/MiraAPI/Translation/MiraLocaleManager.cs +++ b/MiraAPI/Translation/MiraLocaleManager.cs @@ -78,37 +78,8 @@ public static class MiraLocaleManager /// /// Gets a dictionary mapping values to their standard language codes. /// - public static Dictionary LangCultureList { get; } = new() - { - // Vanilla - { MiraLanguage.English, "en-US" }, - { MiraLanguage.Latam, "es-419" }, - { MiraLanguage.Brazilian, "pt-BR" }, - { MiraLanguage.Portuguese, "pt-PT" }, - { MiraLanguage.Korean, "ko-KR" }, - { MiraLanguage.Russian, "ru-RU" }, - { MiraLanguage.Dutch, "nl-NL" }, - { MiraLanguage.Filipino, "fil-PH" }, - { MiraLanguage.French, "fr-FR" }, - { MiraLanguage.German, "de-DE" }, - { MiraLanguage.Italian, "it-IT" }, - { MiraLanguage.Japanese, "ja-JP" }, - { MiraLanguage.Spanish, "es-ES" }, - { MiraLanguage.SChinese, "zh-CN" }, - { MiraLanguage.TChinese, "zh-TW" }, - { MiraLanguage.Irish, "ga-IE" }, - - // Custom - { MiraLanguage.Polish, "pl-PL" }, - { MiraLanguage.Turkish, "tr-TR" }, - { MiraLanguage.Swedish, "sv-SE" }, - { MiraLanguage.Lithuanian, "lt-LT" }, - { MiraLanguage.Czech, "cs-CZ" }, - { MiraLanguage.LChinese, "lzh-CN" }, - { MiraLanguage.Greek, "el-GR" }, - { MiraLanguage.Arabic, "arb" }, - { MiraLanguage.Hebrew, "heb" }, - }; + public static Dictionary LangCultureList { get; } = + LangList.ToDictionary(x => x.Key, x => x.Value.Replace('_', '-')); /// /// Gets the current language from Among Us settings. @@ -133,22 +104,20 @@ public static class MiraLocaleManager [Obsolete("Pass typeof(YourPlugin).Assembly directly to Register for better performance.")] public static void Register(string modGuid) { - var callingAssembly = Assembly.GetCallingAssembly(); - LoadInternalStrings(callingAssembly, callingAssembly.GetName().Name!, modGuid); + LoadInternalStrings(Assembly.GetCallingAssembly(), modGuid); } /// public static void Register(string modGuid, Assembly assembly) { - LoadInternalStrings(assembly, assembly.GetName().Name!, modGuid); + LoadInternalStrings(assembly, modGuid); } /// [Obsolete("Pass typeof(YourPlugin).Assembly directly to Register for better performance.")] public static void Register(string modGuid, string internalName) { - var callingAssembly = Assembly.GetCallingAssembly(); - LoadInternalStrings(callingAssembly, internalName, modGuid); + LoadInternalStrings(Assembly.GetCallingAssembly(), internalName, modGuid); } /// @@ -166,7 +135,7 @@ public static class MiraLocaleManager /// public static string Get(string key, string fallback = "") { - return Get(CurrentLanguage, key, fallback != string.Empty ? fallback : key); + return Get(CurrentLanguage, key, string.IsNullOrEmpty(fallback) ? key : fallback); } /// @@ -178,19 +147,12 @@ public static class MiraLocaleManager /// A based on the key provided. public static string Get(MiraLanguage language, string key, string fallback = "") { - if (Locale.TryGetValue(language, out var translations) && - translations.TryGetValue(key, out var translation)) - { - return translation; - } + var text = Locale.GetValueOrDefault(language)?.GetValueOrDefault(key); - if (Locale.TryGetValue(MiraLanguage.English, out var translationsEng) && - translationsEng.TryGetValue(key, out var translationEng)) - { - return translationEng; - } + if (language != MiraLanguage.English) + text ??= Locale.GetValueOrDefault(MiraLanguage.English)?.GetValueOrDefault(key); - return fallback; + return text ?? fallback; } /// @@ -199,7 +161,7 @@ public static class MiraLocaleManager Dictionary parseList, string fallback = "") { - return GetParsed(CurrentLanguage, key, parseList, fallback != string.Empty ? fallback : key); + return GetParsed(CurrentLanguage, key, parseList, string.IsNullOrEmpty(fallback) ? key : fallback); } /// @@ -208,7 +170,7 @@ public static class MiraLocaleManager (string, string)[] parseList, string fallback = "") { - return GetParsed(CurrentLanguage, key, parseList, fallback != string.Empty ? fallback : key); + return GetParsed(CurrentLanguage, key, parseList, string.IsNullOrEmpty(fallback) ? key : fallback); } /// @@ -225,12 +187,7 @@ public static class MiraLocaleManager Dictionary parseList, string fallback = "") { - var text = Locale.GetValueOrDefault(language)?.GetValueOrDefault(key); - - if (language != MiraLanguage.English) - text ??= Locale.GetValueOrDefault(MiraLanguage.English)?.GetValueOrDefault(key); - - text ??= fallback; + var text = Get(language, key, fallback); foreach (var (toReplace, value) in parseList) { @@ -254,12 +211,7 @@ public static class MiraLocaleManager (string, string)[] parseList, string fallback = "") { - var text = Locale.GetValueOrDefault(language)?.GetValueOrDefault(key); - - if (language != MiraLanguage.English) - text ??= Locale.GetValueOrDefault(MiraLanguage.English)?.GetValueOrDefault(key); - - text ??= fallback; + var text = Get(language, key, fallback); foreach (var (toReplace, value) in parseList) { @@ -355,6 +307,11 @@ public static class MiraLocaleManager } } + private static void LoadInternalStrings(Assembly assembly, string modGuid) + { + LoadInternalStrings(assembly, assembly.GetName().Name!, modGuid); + } + private static void LoadInternalStrings(Assembly assembly, string internalName, string modGuid) { var resourcePrefix = $"{internalName}.Resources.Locale.";