piwalker/ryujinx-ryubing
1
0
Fork 0
mirror of https://git.ryujinx.app/ryubing/ryujinx.git synced 2025-07-26 07:39:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

misc: chore: Use explicit types in the Avalonia project

Browse Source
This commit is contained in:
Evan Husted
2025-01-25 14:00:23 -06:00
parent 3b5f6170d1
commit be3bd0bcb5
69 changed files with 367 additions and 348 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Ryujinx/Common/LocaleManager.cs
View File

@ -32,7 +32,7 @@ namespace Ryujinx.Ava.Common.Locale
private void Load()
{
var localeLanguageCode = !string.IsNullOrEmpty(ConfigurationState.Instance.UI.LanguageCode.Value) ?
string localeLanguageCode = !string.IsNullOrEmpty(ConfigurationState.Instance.UI.LanguageCode.Value) ?
ConfigurationState.Instance.UI.LanguageCode.Value : CultureInfo.CurrentCulture.Name.Replace('-', '_');
LoadLanguage(localeLanguageCode);
@ -54,7 +54,7 @@ namespace Ryujinx.Ava.Common.Locale
if (_localeStrings.TryGetValue(key, out string value))
{
// Check if the localized string needs to be formatted.
if (_dynamicValues.TryGetValue(key, out var dynamicValue))
if (_dynamicValues.TryGetValue(key, out object[] dynamicValue))
try
{
return string.Format(value, dynamicValue);
@ -99,7 +99,7 @@ namespace Ryujinx.Ava.Common.Locale
public void LoadLanguage(string languageCode)
{
var locale = LoadJsonLanguage(languageCode);
Dictionary<LocaleKeys, string> locale = LoadJsonLanguage(languageCode);
if (locale == null)
{
@ -125,7 +125,7 @@ namespace Ryujinx.Ava.Common.Locale
private static Dictionary<LocaleKeys, string> LoadJsonLanguage(string languageCode)
{
var localeStrings = new Dictionary<LocaleKeys, string>();
Dictionary<LocaleKeys, string> localeStrings = new Dictionary<LocaleKeys, string>();
_localeData ??= EmbeddedResources.ReadAllText("Ryujinx/Assets/locales.json")
.Into(it => JsonHelper.Deserialize(it, LocalesJsonContext.Default.LocalesJson));
@ -142,10 +142,10 @@ namespace Ryujinx.Ava.Common.Locale
throw new Exception($"Locale key {{{locale.ID}}} has too many languages! Has {locale.Translations.Count} translations, expected {_localeData.Value.Languages.Count}!");
}
if (!Enum.TryParse<LocaleKeys>(locale.ID, out var localeKey))
if (!Enum.TryParse<LocaleKeys>(locale.ID, out LocaleKeys localeKey))
continue;
var str = locale.Translations.TryGetValue(languageCode, out string val) && !string.IsNullOrEmpty(val)
string str = locale.Translations.TryGetValue(languageCode, out string val) && !string.IsNullOrEmpty(val)
? val
: locale.Translations[DefaultLanguageCode];