JJBanana13/ryujinx
1
0
Fork 0
mirror of https://git.ryujinx.app/ryubing/ryujinx.git synced 2026-06-06 20:39:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

More fractured locales

Browse Source
This commit is contained in:
_Neo_
2026-03-24 23:41:12 +02:00
parent ea3ee010f6
commit 583cac31eb
10 changed files with 746 additions and 739 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Ryujinx/UI/Helpers/UserErrorDialog.cs
View File

@@ -14,9 +14,9 @@ namespace Ryujinx.Ava.UI.Helpers
private static string GetErrorTitle(UserError error) =>
error switch
{
UserError.NoKeys => LocaleManager.Instance[LocaleKeys.Keys_UserError_NoKeys],
UserError.NoFirmware => LocaleManager.Instance[LocaleKeys.Firmware_UserError_NoFirmware],
UserError.FirmwareParsingFailed => LocaleManager.Instance[LocaleKeys.Firmware_UserError_ParsingFailed],
UserError.NoKeys => LocaleManager.Instance[LocaleKeys.Error_NoKeysFound],
UserError.NoFirmware => LocaleManager.Instance[LocaleKeys.Error_NoFirmwareFound],
UserError.FirmwareParsingFailed => LocaleManager.Instance[LocaleKeys.Error_FirmwareParsingFailed],
UserError.ApplicationNotFound => LocaleManager.Instance[LocaleKeys.UserErrorApplicationNotFound],
UserError.Unknown => LocaleManager.Instance[LocaleKeys.UserErrorUnknown],
_ => LocaleManager.Instance[LocaleKeys.UserErrorUndefined],
@@ -25,9 +25,9 @@ namespace Ryujinx.Ava.UI.Helpers
private static string GetErrorDescription(UserError error) =>
error switch
{
UserError.NoKeys => LocaleManager.Instance[LocaleKeys.Keys_UserError_NoKeys_Description],
UserError.NoFirmware => LocaleManager.Instance[LocaleKeys.Firmware_UserError_NoFirmware_Description],
UserError.FirmwareParsingFailed => LocaleManager.Instance[LocaleKeys.Firmware_UserError_ParsingFailed_Description],
UserError.NoKeys => LocaleManager.Instance[LocaleKeys.Error_NoKeysFoundDescription],
UserError.NoFirmware => LocaleManager.Instance[LocaleKeys.Error_NoFirmwareFoundDescription],
UserError.FirmwareParsingFailed => LocaleManager.Instance[LocaleKeys.Error_FirmwareParsingFailedDescription],
UserError.ApplicationNotFound => LocaleManager.Instance[LocaleKeys.UserErrorApplicationNotFoundDescription],
UserError.Unknown => LocaleManager.Instance[LocaleKeys.UserErrorUnknownDescription],
_ => LocaleManager.Instance[LocaleKeys.UserErrorUndefinedDescription],

39
src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
View File

@@ -941,25 +941,25 @@ namespace Ryujinx.Ava.UI.ViewModels
{
await ContentDialogHelper.CreateErrorDialog(
LocaleManager.Instance.UpdateAndGetDynamicValue(
LocaleKeys.Firmware_Installer_FirmwareNotFound, filename));
LocaleKeys.Dialog_Firmware_InstallerFirmwareNotFound, filename));
return;
}
string dialogTitle = LocaleManager.Instance.UpdateAndGetDynamicValue(
LocaleKeys.Firmware_Installer_Title, firmwareVersion.VersionString);
LocaleKeys.Dialog_Firmware_InstallerTitle, firmwareVersion.VersionString);
string dialogMessage = LocaleManager.Instance.UpdateAndGetDynamicValue(
LocaleKeys.Firmware_Installer_Message_Main, firmwareVersion.VersionString);
LocaleKeys.Dialog_Firmware_InstallerMainMessage, firmwareVersion.VersionString);
SystemVersion currentVersion = ContentManager.GetCurrentFirmwareVersion();
if (currentVersion != null)
{
dialogMessage += LocaleManager.Instance.UpdateAndGetDynamicValue(
LocaleKeys.Firmware_Installer_Message_Sub, currentVersion.VersionString);
LocaleKeys.Dialog_Firmware_InstallerSubMessage, currentVersion.VersionString);
}
dialogMessage +=
LocaleManager.Instance[LocaleKeys.Firmware_Installer_Message_Confirm];
LocaleManager.Instance[LocaleKeys.Dialog_Firmware_InstallerConfirmMessage];
UserResult result = await ContentDialogHelper.CreateConfirmationDialog(
dialogTitle,
@@ -969,7 +969,7 @@ namespace Ryujinx.Ava.UI.ViewModels
LocaleManager.Instance[LocaleKeys.RyujinxConfirm]);
UpdateWaitWindow waitingDialog = new(dialogTitle,
LocaleManager.Instance[LocaleKeys.Firmware_Installer_Message_Wait]);
LocaleManager.Instance[LocaleKeys.Dialog_Firmware_InstallerWaitMessage]);
if (result == UserResult.Yes)
{
@@ -991,7 +991,7 @@ namespace Ryujinx.Ava.UI.ViewModels
waitingDialog.Close();
string message = LocaleManager.Instance.UpdateAndGetDynamicValue(
LocaleKeys.Firmware_Installer_Message_Success,
LocaleKeys.Dialog_Firmware_InstallerSuccessMessage,
firmwareVersion.VersionString);
await ContentDialogHelper.CreateInfoDialog(
@@ -1061,16 +1061,16 @@ namespace Ryujinx.Ava.UI.ViewModels
string dialogTitle =
LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.MenuBar_Actions_InstallKeysLabel);
string dialogMessage =
LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.Keys_Installer_Message_Main);
LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.Dialog_Keys_InstallerMainMessage);
if (ContentManager.AreKeysAlreadyPresent(systemDirectory))
{
dialogMessage +=
LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys
.Keys_Installer_Message_Sub);
.Dialog_Keys_InstallerSubMessage);
}
dialogMessage += LocaleManager.Instance[LocaleKeys.Keys_Installer_ConfirmInstall];
dialogMessage += LocaleManager.Instance[LocaleKeys.Dialog_Keys_InstallerConfirmInstall];
UserResult result = await ContentDialogHelper.CreateConfirmationDialog(
dialogTitle,
@@ -1080,7 +1080,7 @@ namespace Ryujinx.Ava.UI.ViewModels
LocaleManager.Instance[LocaleKeys.RyujinxConfirm]);
UpdateWaitWindow waitingDialog = new(dialogTitle,
LocaleManager.Instance[LocaleKeys.Keys_Installer_Message_Wait]);
LocaleManager.Instance[LocaleKeys.Dialog_Keys_InstallerWaitMessage]);
if (result == UserResult.Yes)
{
@@ -1103,7 +1103,7 @@ namespace Ryujinx.Ava.UI.ViewModels
string message =
LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys
.Keys_Installer_Message_Success);
.Dialog_Keys_InstallerSuccessMessage);
await ContentDialogHelper.CreateInfoDialog(
dialogTitle,
@@ -1125,7 +1125,7 @@ namespace Ryujinx.Ava.UI.ViewModels
if (ex is FormatException)
{
message = LocaleManager.Instance.UpdateAndGetDynamicValue(
LocaleKeys.Keys_Installer_KeysNotFound, filename);
LocaleKeys.Dialog_Keys_InstallerKeysNotFound, filename);
}
await ContentDialogHelper.CreateErrorDialog(message);
@@ -1414,7 +1414,7 @@ namespace Ryujinx.Ava.UI.ViewModels
{
Optional<IStorageFile> result = await StorageProvider.OpenSingleFilePickerAsync(new FilePickerOpenOptions
{
Title = LocaleManager.Instance[LocaleKeys.Firmware_InstallFromFile_DialogTitle],
Title = LocaleManager.Instance[LocaleKeys.Dialog_Firmware_InstallFromFileDialogTitle],
FileTypeFilter = new List<FilePickerFileType>
{
new(LocaleManager.Instance[LocaleKeys.AllSupportedFormats])
@@ -1448,7 +1448,7 @@ namespace Ryujinx.Ava.UI.ViewModels
{
Optional<IStorageFolder> result = await StorageProvider.OpenSingleFolderPickerAsync(new FolderPickerOpenOptions
{
Title = LocaleManager.Instance[LocaleKeys.Firmware_InstallFromFolder_DialogTitle]
Title = LocaleManager.Instance[LocaleKeys.Dialog_Firmware_InstallFromFolderDialogTitle]
});
if (result.HasValue)
@@ -1461,7 +1461,7 @@ namespace Ryujinx.Ava.UI.ViewModels
{
Optional<IStorageFile> result = await StorageProvider.OpenSingleFilePickerAsync(new FilePickerOpenOptions
{
Title = LocaleManager.Instance[LocaleKeys.Keys_InstallFromFile_DialogTitle],
Title = LocaleManager.Instance[LocaleKeys.Dialog_Keys_InstallFromFileDialogTitle],
FileTypeFilter = new List<FilePickerFileType>
{
new("KEYS")
@@ -1483,7 +1483,7 @@ namespace Ryujinx.Ava.UI.ViewModels
{
Optional<IStorageFolder> result = await StorageProvider.OpenSingleFolderPickerAsync(new FolderPickerOpenOptions
{
Title = LocaleManager.Instance[LocaleKeys.Keys_InstallFromFolder_DialogTitle]
Title = LocaleManager.Instance[LocaleKeys.Dialog_Keys_InstallFromFolderDialogTitle]
});
if (result.HasValue)
@@ -1838,14 +1838,13 @@ namespace Ryujinx.Ava.UI.ViewModels
if (version != null)
{
LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.Firmware_StatusBar_Version,
version.VersionString);
LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.StatusBar_FirmwareVersion, version.VersionString);
hasApplet = version.Major > 3;
}
else
{
LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.Firmware_StatusBar_Version, "NaN");
LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.StatusBar_FirmwareVersion, "NaN");
}
IsAppletMenuActive = hasApplet;

2
src/Ryujinx/UI/Views/Main/MainStatusBarView.axaml
View File

@@ -329,7 +329,7 @@
Margin="5, 0, 0, 0"
HorizontalAlignment="Right"
VerticalAlignment="Center"
Text="{ext:Locale Firmware_StatusBar_Version}" />
Text="{ext:Locale StatusBar_FirmwareVersion}" />
</StackPanel>
</Grid>
</UserControl>