Amebis/wxExtend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxInitializeLocale() upgraded to optionally return UI language

Browse Source
This commit is contained in:
Simon Rozman 2016-10-18 11:00:11 +02:00
parent b644d08eac
commit 90a48ae7ce
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/wxex/common.h
View File

@ -132,12 +132,13 @@ inline bool wxModifyStyleEx(_In_ WXHWND hWnd, _In_ DWORD dwRemove, _In_ DWORD dw
/// The path to folder containing localization catalogue PO files is read from `LocalizationRepositoryPath` configuration string. /// The path to folder containing localization catalogue PO files is read from `LocalizationRepositoryPath` configuration string.
/// ///
/// \param[inout] locale Locale to initialize /// \param[inout] locale Locale to initialize
/// \param[out ] language Translation language
/// ///
/// \returns /// \returns
/// - \c true when initialization succeeded /// - \c true when initialization succeeded
/// - \c false otherwise /// - \c false otherwise
/// ///
inline bool wxInitializeLocale(wxLocale &locale) inline bool wxInitializeLocale(wxLocale &locale, wxLanguage *language = NULL)
{ {
// Read language from configuration. // Read language from configuration.
wxLanguage lang_code; wxLanguage lang_code;
@ -148,6 +149,9 @@ inline bool wxInitializeLocale(wxLocale &locale)
} else } else
lang_code = wxLANGUAGE_DEFAULT; lang_code = wxLANGUAGE_DEFAULT;
if (language)
*language = lang_code;
if (wxLocale::IsAvailable(lang_code)) { if (wxLocale::IsAvailable(lang_code)) {
// Language is "available". Well... Known actually. // Language is "available". Well... Known actually.
wxString sPath; wxString sPath;