diff --git a/ZRCola/zrcolaapp.cpp b/ZRCola/zrcolaapp.cpp index f708ae4..cf78c92 100644 --- a/ZRCola/zrcolaapp.cpp +++ b/ZRCola/zrcolaapp.cpp @@ -32,6 +32,7 @@ wxIMPLEMENT_APP(ZRColaApp); ZRColaApp::ZRColaApp() : m_mainWnd(NULL), + m_lang_ui(wxLANGUAGE_DEFAULT), wxApp() { } @@ -55,7 +56,7 @@ bool ZRColaApp::OnInit() return false; // Initialize locale. - if (wxInitializeLocale(m_locale)) { + if (wxInitializeLocale(m_locale, &m_lang_ui)) { wxVERIFY(m_locale.AddCatalog(wxT("wxExtend") wxT(wxExtendVersion))); wxVERIFY(m_locale.AddCatalog(wxT("UpdaterZRCola"))); wxVERIFY(m_locale.AddCatalog(wxT("libZRColaUI"))); diff --git a/ZRCola/zrcolaapp.h b/ZRCola/zrcolaapp.h index 6c1f374..f617abc 100644 --- a/ZRCola/zrcolaapp.h +++ b/ZRCola/zrcolaapp.h @@ -84,6 +84,7 @@ public: wxZRColaFrame *m_mainWnd; ///< Main window wxLocale m_locale; ///< Current locale + wxLanguage m_lang_ui; ///< Translation language (language of User Interface, wxLANGUAGE_DEFAULT = English) protected: #ifdef __WXMSW__ diff --git a/ZRCola/zrcolachrslct.cpp b/ZRCola/zrcolachrslct.cpp index 7062456..db66f73 100644 --- a/ZRCola/zrcolachrslct.cpp +++ b/ZRCola/zrcolachrslct.cpp @@ -35,8 +35,9 @@ wxZRColaCharSelect::wxZRColaCharSelect(wxWindow* parent) : wxZRColaCharSelectBase(parent) { // Set tag lookup locale. - auto language = static_cast(dynamic_cast(wxTheApp)->m_locale.GetLanguage()); - if (wxLANGUAGE_ENGLISH <= language && language <= wxLANGUAGE_ENGLISH_ZIMBABWE) m_locale = MAKELCID(MAKELANGID(LANG_ENGLISH , SUBLANG_DEFAULT), SORT_DEFAULT); + wxLanguage language = dynamic_cast(wxTheApp)->m_lang_ui; + if (wxLANGUAGE_DEFAULT == language || + wxLANGUAGE_ENGLISH <= language && language <= wxLANGUAGE_ENGLISH_ZIMBABWE) m_locale = MAKELCID(MAKELANGID(LANG_ENGLISH , SUBLANG_DEFAULT), SORT_DEFAULT); else if (wxLANGUAGE_RUSSIAN <= language && language <= wxLANGUAGE_RUSSIAN_UKRAINE ) m_locale = MAKELCID(MAKELANGID(LANG_RUSSIAN , SUBLANG_DEFAULT), SORT_DEFAULT); else if (wxLANGUAGE_SLOVENIAN == language ) m_locale = MAKELCID(MAKELANGID(LANG_SLOVENIAN, SUBLANG_DEFAULT), SORT_DEFAULT); else m_locale = MAKELCID(MAKELANGID(LANG_ENGLISH , SUBLANG_DEFAULT), SORT_DEFAULT); diff --git a/lib/wxExtend b/lib/wxExtend index b644d08..05627f9 160000 --- a/lib/wxExtend +++ b/lib/wxExtend @@ -1 +1 @@ -Subproject commit b644d08eac98260556cf3d059a2d272f98955097 +Subproject commit 05627f98d6b9f2cca5ac9765d516353fb17e0e6a