aboutsummaryrefslogtreecommitdiff
path: root/Ryujinx.Ava/Common/Locale
diff options
context:
space:
mode:
authorEmmanuel Hansen <emmausssss@gmail.com>2022-07-05 18:06:31 +0000
committerGitHub <noreply@github.com>2022-07-05 20:06:31 +0200
commit594246ea4727c9377b1c916934d9b257a1b5d0d0 (patch)
treed3a8538f729575262543bcdb16e5c2c01522796b /Ryujinx.Ava/Common/Locale
parentd21b403886fdc00dac2493532b3e8ff53d5882c4 (diff)
UI - Avalonia Part 2 (#3351)
* add settings windows and children views * Expose hotkeys configuration on the UI * Remove double spacing from locale JSON * simplify button assigner * add cemuhook buttons and title to locale * move common button assigner to own class * cancel button assigner when window is closed * remove unused setting * address review. fix controller profile not loading default when switching devices * fix updater file name * Input cleanup (#37) * addressed review * add device type to controller device checks * change accessibility modifier of public classes to internal * Update Ryujinx.Ava/Ui/ViewModels/ControllerSettingsViewModel.cs Co-authored-by: gdkchan <gab.dark.100@gmail.com> * Update de_DE.json * Update de_DE.json * Update tr_TR.json Translated newly added lines * Update it_IT.json * fix rebase * update avalonia * fix wrong key used for button text * Align settings window elements * Tabs to spaces * Update brazilian portuguese translation * Minor improvement on brazilian portuguese translation * fix turkish translation * remove unused text * change view related classes to public * unsubscribe from deferred event if dialog is closed * Load the default language before loading any other when switching languages * Make controller settings more compact * increase default width of settings window, reduce profile buttons width Co-authored-by: gdk <gab.dark.100@gmail.com> Co-authored-by: MutantAura <44103205+MutantAura@users.noreply.github.com> Co-authored-by: Niwu34 <67392333+Niwu34@users.noreply.github.com> Co-authored-by: aegiff <99728970+aegiff@users.noreply.github.com> Co-authored-by: Antonio Brugnolo <36473846+AntoSkate@users.noreply.github.com>
Diffstat (limited to 'Ryujinx.Ava/Common/Locale')
-rw-r--r--Ryujinx.Ava/Common/Locale/LocaleExtension.cs2
-rw-r--r--Ryujinx.Ava/Common/Locale/LocaleManager.cs7
2 files changed, 7 insertions, 2 deletions
diff --git a/Ryujinx.Ava/Common/Locale/LocaleExtension.cs b/Ryujinx.Ava/Common/Locale/LocaleExtension.cs
index a9e5cac5..8fca1a00 100644
--- a/Ryujinx.Ava/Common/Locale/LocaleExtension.cs
+++ b/Ryujinx.Ava/Common/Locale/LocaleExtension.cs
@@ -5,7 +5,7 @@ using System;
namespace Ryujinx.Ava.Common.Locale
{
- public class LocaleExtension : MarkupExtension
+ internal class LocaleExtension : MarkupExtension
{
public LocaleExtension(string key)
{
diff --git a/Ryujinx.Ava/Common/Locale/LocaleManager.cs b/Ryujinx.Ava/Common/Locale/LocaleManager.cs
index daa0328f..42756990 100644
--- a/Ryujinx.Ava/Common/Locale/LocaleManager.cs
+++ b/Ryujinx.Ava/Common/Locale/LocaleManager.cs
@@ -40,7 +40,7 @@ namespace Ryujinx.Ava.Common.Locale
}
// Load english first, if the target language translation is incomplete, we default to english.
- LoadLanguage(DefaultLanguageCode);
+ LoadDefaultLanguage();
if (localeLanguageCode != DefaultLanguageCode)
{
@@ -79,6 +79,11 @@ namespace Ryujinx.Ava.Common.Locale
OnPropertyChanged("Item");
}
+ public void LoadDefaultLanguage()
+ {
+ LoadLanguage(DefaultLanguageCode);
+ }
+
public void LoadLanguage(string languageCode)
{
string languageJson = EmbeddedResources.ReadAllText($"Ryujinx.Ava/Assets/Locales/{languageCode}.json");