From 0e324c12ef5f40e383c181987120f862f19058e9 Mon Sep 17 00:00:00 2001 From: LotP1 <68976644+LotP1@users.noreply.github.com> Date: Thu, 1 Jan 2026 03:15:19 +0100 Subject: [PATCH 1/2] fix --- assets/Locales/RenderDoc.json | 104 ++++++++++++++++++++++++++++ src/Ryujinx/Common/LocaleManager.cs | 4 +- 2 files changed, 106 insertions(+), 2 deletions(-) create mode 100644 assets/Locales/RenderDoc.json diff --git a/assets/Locales/RenderDoc.json b/assets/Locales/RenderDoc.json new file mode 100644 index 000000000..132e24067 --- /dev/null +++ b/assets/Locales/RenderDoc.json @@ -0,0 +1,104 @@ +{ + "Locales": [ + { + "ID": "MenuBarActions_StartCapture", + "Translations": { + "ar_SA": "", + "de_DE": "", + "el_GR": "", + "en_US": "Start RenderDoc Frame Capture", + "es_ES": "", + "fr_FR": "", + "he_IL": "", + "it_IT": "", + "ja_JP": "", + "ko_KR": "", + "no_NO": "", + "pl_PL": "", + "pt_BR": "", + "ru_RU": "", + "sv_SE": "", + "th_TH": "", + "tr_TR": "", + "uk_UA": "", + "zh_CN": "", + "zh_TW": "" + } + }, + { + "ID": "MenuBarActions_EndCapture", + "Translations": { + "ar_SA": "", + "de_DE": "", + "el_GR": "", + "en_US": "End RenderDoc Frame Capture", + "es_ES": "", + "fr_FR": "", + "he_IL": "", + "it_IT": "", + "ja_JP": "", + "ko_KR": "", + "no_NO": "", + "pl_PL": "", + "pt_BR": "", + "ru_RU": "", + "sv_SE": "", + "th_TH": "", + "tr_TR": "", + "uk_UA": "", + "zh_CN": "", + "zh_TW": "" + } + }, + { + "ID": "MenuBarActions_DiscardCapture", + "Translations": { + "ar_SA": "", + "de_DE": "", + "el_GR": "", + "en_US": "Discard RenderDoc Frame Capture", + "es_ES": "", + "fr_FR": "", + "he_IL": "", + "it_IT": "", + "ja_JP": "", + "ko_KR": "", + "no_NO": "", + "pl_PL": "", + "pt_BR": "", + "ru_RU": "", + "sv_SE": "", + "th_TH": "", + "tr_TR": "", + "uk_UA": "", + "zh_CN": "", + "zh_TW": "" + } + }, + { + "ID": "MenuBarActions_DiscardCapture_ToolTip", + "Translations": { + "ar_SA": "", + "de_DE": "", + "el_GR": "", + "en_US": "Ends the currently active RenderDoc Frame Capture, immediately discarding its result.", + "es_ES": "", + "fr_FR": "", + "he_IL": "", + "it_IT": "", + "ja_JP": "", + "ko_KR": "", + "no_NO": "", + "pl_PL": "", + "pt_BR": "", + "ru_RU": "", + "sv_SE": "", + "th_TH": "", + "tr_TR": "", + "uk_UA": "", + "zh_CN": "", + "zh_TW": "" + } + } + ] +} diff --git a/src/Ryujinx/Common/LocaleManager.cs b/src/Ryujinx/Common/LocaleManager.cs index 330ef4f18..4433f9859 100644 --- a/src/Ryujinx/Common/LocaleManager.cs +++ b/src/Ryujinx/Common/LocaleManager.cs @@ -190,7 +190,7 @@ namespace Ryujinx.Ava.Common.Locale } - foreach (LocalesJson file in _localeData.Value.LocalesFiles.Values) + foreach ((string fileName, LocalesJson file) in _localeData.Value.LocalesFiles) { foreach (LocalesEntry locale in file.Locales) { @@ -206,7 +206,7 @@ namespace Ryujinx.Ava.Common.Locale $"Locale key {{{locale.ID}}} has too many languages! Has {locale.Translations.Count} translations, expected {_localeData.Value.Languages.Count}!"); } - if (!Enum.TryParse(locale.ID, out LocaleKeys localeKey)) + if (!Enum.TryParse(fileName == "Root.json" ? locale.ID : $"{fileName[..^".json".Length]}_{locale.ID}" , out LocaleKeys localeKey)) continue; string str = locale.Translations.TryGetValue(languageCode, out string val) && !string.IsNullOrEmpty(val) From 3afa6e1041cf7d3afa07d4379c1a377edbc9fd78 Mon Sep 17 00:00:00 2001 From: LotP1 <68976644+LotP1@users.noreply.github.com> Date: Thu, 1 Jan 2026 03:20:42 +0100 Subject: [PATCH 2/2] remove renderdoc placeholder file --- assets/Locales/RenderDoc.json | 104 ---------------------------------- 1 file changed, 104 deletions(-) delete mode 100644 assets/Locales/RenderDoc.json diff --git a/assets/Locales/RenderDoc.json b/assets/Locales/RenderDoc.json deleted file mode 100644 index 132e24067..000000000 --- a/assets/Locales/RenderDoc.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "Locales": [ - { - "ID": "MenuBarActions_StartCapture", - "Translations": { - "ar_SA": "", - "de_DE": "", - "el_GR": "", - "en_US": "Start RenderDoc Frame Capture", - "es_ES": "", - "fr_FR": "", - "he_IL": "", - "it_IT": "", - "ja_JP": "", - "ko_KR": "", - "no_NO": "", - "pl_PL": "", - "pt_BR": "", - "ru_RU": "", - "sv_SE": "", - "th_TH": "", - "tr_TR": "", - "uk_UA": "", - "zh_CN": "", - "zh_TW": "" - } - }, - { - "ID": "MenuBarActions_EndCapture", - "Translations": { - "ar_SA": "", - "de_DE": "", - "el_GR": "", - "en_US": "End RenderDoc Frame Capture", - "es_ES": "", - "fr_FR": "", - "he_IL": "", - "it_IT": "", - "ja_JP": "", - "ko_KR": "", - "no_NO": "", - "pl_PL": "", - "pt_BR": "", - "ru_RU": "", - "sv_SE": "", - "th_TH": "", - "tr_TR": "", - "uk_UA": "", - "zh_CN": "", - "zh_TW": "" - } - }, - { - "ID": "MenuBarActions_DiscardCapture", - "Translations": { - "ar_SA": "", - "de_DE": "", - "el_GR": "", - "en_US": "Discard RenderDoc Frame Capture", - "es_ES": "", - "fr_FR": "", - "he_IL": "", - "it_IT": "", - "ja_JP": "", - "ko_KR": "", - "no_NO": "", - "pl_PL": "", - "pt_BR": "", - "ru_RU": "", - "sv_SE": "", - "th_TH": "", - "tr_TR": "", - "uk_UA": "", - "zh_CN": "", - "zh_TW": "" - } - }, - { - "ID": "MenuBarActions_DiscardCapture_ToolTip", - "Translations": { - "ar_SA": "", - "de_DE": "", - "el_GR": "", - "en_US": "Ends the currently active RenderDoc Frame Capture, immediately discarding its result.", - "es_ES": "", - "fr_FR": "", - "he_IL": "", - "it_IT": "", - "ja_JP": "", - "ko_KR": "", - "no_NO": "", - "pl_PL": "", - "pt_BR": "", - "ru_RU": "", - "sv_SE": "", - "th_TH": "", - "tr_TR": "", - "uk_UA": "", - "zh_CN": "", - "zh_TW": "" - } - } - ] -}