From 3634026436e7945ebe5cf60867f0b222a98f2c94 Mon Sep 17 00:00:00 2001 From: DanielSvoboda Date: Thu, 13 Feb 2025 14:54:50 -0300 Subject: [PATCH] Standard language fix (#2420) * Standard language fix * + --- src/common/config.cpp | 6 +++--- src/qt_gui/settings_dialog.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/common/config.cpp b/src/common/config.cpp index 048571a5a..b61f92043 100644 --- a/src/common/config.cpp +++ b/src/common/config.cpp @@ -96,7 +96,7 @@ u32 m_window_size_H = 720; std::vector m_pkg_viewer; std::vector m_elf_viewer; std::vector m_recent_files; -std::string emulator_language = "en"; +std::string emulator_language = "en_US"; static int backgroundImageOpacity = 50; static bool showBackgroundImage = true; @@ -768,7 +768,7 @@ void load(const std::filesystem::path& path) { m_elf_viewer = toml::find_or>(gui, "elfDirs", {}); m_recent_files = toml::find_or>(gui, "recentFiles", {}); m_table_mode = toml::find_or(gui, "gameTableMode", 0); - emulator_language = toml::find_or(gui, "emulatorLanguage", "en"); + emulator_language = toml::find_or(gui, "emulatorLanguage", "en_US"); backgroundImageOpacity = toml::find_or(gui, "backgroundImageOpacity", 50); showBackgroundImage = toml::find_or(gui, "showBackgroundImage", true); } @@ -954,7 +954,7 @@ void setDefaultValues() { vkHostMarkers = false; vkGuestMarkers = false; rdocEnable = false; - emulator_language = "en"; + emulator_language = "en_US"; m_language = 1; gpuId = -1; separateupdatefolder = false; diff --git a/src/qt_gui/settings_dialog.cpp b/src/qt_gui/settings_dialog.cpp index e546e0997..63b5bb384 100644 --- a/src/qt_gui/settings_dialog.cpp +++ b/src/qt_gui/settings_dialog.cpp @@ -347,7 +347,7 @@ void SettingsDialog::LoadValuesFromConfig() { toml::find_or(data, "Settings", "consoleLanguage", 6))) % languageIndexes.size()); ui->emulatorLanguageComboBox->setCurrentIndex( - languages[toml::find_or(data, "GUI", "emulatorLanguage", "en")]); + languages[toml::find_or(data, "GUI", "emulatorLanguage", "en_US")]); ui->hideCursorComboBox->setCurrentIndex(toml::find_or(data, "Input", "cursorState", 1)); OnCursorStateChanged(toml::find_or(data, "Input", "cursorState", 1)); ui->idleTimeoutSpinBox->setValue(toml::find_or(data, "Input", "cursorHideTimeout", 5));