From b4b49a4296d9341b688462488bb8851f9e8a79b4 Mon Sep 17 00:00:00 2001 From: Ian McInerney Date: Sun, 2 Jul 2023 19:20:16 +0100 Subject: [PATCH] Don't skip loading the wxWidgets message catalogs The wxWidgets message catalog contains translations for strings that are in the wx-provided dialogs, and these strings aren't contained in our message catalog. Fixes https://gitlab.com/kicad/code/kicad/-/issues/15035 (Cherry-picked from 5e740c354e3613364214096efa2cfd87818c27ba) --- common/pgm_base.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/common/pgm_base.cpp b/common/pgm_base.cpp index 4764af3db1..9f9b8cef29 100644 --- a/common/pgm_base.cpp +++ b/common/pgm_base.cpp @@ -655,7 +655,7 @@ bool PGM_BASE::SetLanguage( wxString& aErrMsg, bool first_time ) // don't use wxLOCALE_LOAD_DEFAULT flag so that Init() doesn't return // false just because it failed to load wxstd catalog - if( !m_locale->Init( m_language_id, wxLOCALE_DONT_LOAD_DEFAULT ) ) + if( !m_locale->Init( m_language_id ) ) { wxLogTrace( traceLocale, wxT( "This language is not supported by the system." ) ); @@ -663,7 +663,7 @@ bool PGM_BASE::SetLanguage( wxString& aErrMsg, bool first_time ) delete m_locale; m_locale = new wxLocale; - m_locale->Init( wxLANGUAGE_DEFAULT, wxLOCALE_DONT_LOAD_DEFAULT); + m_locale->Init( wxLANGUAGE_DEFAULT ); aErrMsg = _( "This language is not supported by the operating system." ); return false; @@ -714,7 +714,7 @@ bool PGM_BASE::SetLanguage( wxString& aErrMsg, bool first_time ) delete m_locale; m_locale = new wxLocale; - m_locale->Init( wxLANGUAGE_DEFAULT, wxLOCALE_DONT_LOAD_DEFAULT); + m_locale->Init( wxLANGUAGE_DEFAULT ); aErrMsg = _( "The KiCad language file for this language is not installed." ); return false;