From df0e2f78818d662b90839fa46c7441777f07003c Mon Sep 17 00:00:00 2001 From: Tillsunset <35825944+Tillsunset@users.noreply.github.com> Date: Sat, 15 Oct 2022 00:20:20 -0500 Subject: [PATCH] Fix Cannot set locale to "" (#366) * Add en resource and change language selection for macos user that don't have US as their system region * default to English if the system language is unavailable --- bin/resources/en/cemu.mo | Bin 0 -> 56624 bytes src/gui/CemuApp.cpp | 20 +++++++++++--------- 2 files changed, 11 insertions(+), 9 deletions(-) create mode 100644 bin/resources/en/cemu.mo diff --git a/bin/resources/en/cemu.mo b/bin/resources/en/cemu.mo new file mode 100644 index 0000000000000000000000000000000000000000..93d8f7e59bd0864234171af1e3ba46ba15c562c8 GIT binary patch literal 56624 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 literal 0 HcmV?d00001 diff --git a/src/gui/CemuApp.cpp b/src/gui/CemuApp.cpp index 2c766f5b..c7a5adaa 100644 --- a/src/gui/CemuApp.cpp +++ b/src/gui/CemuApp.cpp @@ -115,22 +115,24 @@ bool CemuApp::OnInit() m_languages = GetAvailableLanguages(); const sint32 language = GetConfig().language; - if (language != wxLANGUAGE_ENGLISH) + const auto it = std::find_if(m_languages.begin(), m_languages.end(), [language](const wxLanguageInfo* info) { return info->Language == language; }); + if (it != m_languages.end() && wxLocale::IsAvailable(language)) { - const auto it = std::find_if(m_languages.begin(), m_languages.end(), [language](const wxLanguageInfo* info) { return info->Language == language; }); - if (it != m_languages.end() && wxLocale::IsAvailable(language)) + if (m_locale.Init(language)) { - if (m_locale.Init(language)) - { - m_locale.AddCatalogLookupPathPrefix(ActiveSettings::GetDataPath("resources").generic_string()); - m_locale.AddCatalog("cemu"); - } + m_locale.AddCatalogLookupPathPrefix(ActiveSettings::GetDataPath("resources").generic_string()); + m_locale.AddCatalog("cemu"); } } if (!m_locale.IsOk()) { - m_locale.Init(wxLANGUAGE_DEFAULT); + if (!wxLocale::IsAvailable(wxLANGUAGE_DEFAULT) || !m_locale.Init(wxLANGUAGE_DEFAULT)) + { + m_locale.Init(wxLANGUAGE_ENGLISH); + m_locale.AddCatalogLookupPathPrefix(ActiveSettings::GetDataPath("resources").generic_string()); + m_locale.AddCatalog("cemu"); + } } // fill colour db