X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6f0114437c0fa9b0da5c08cfede8257715d3a000..e215c9959cfae9db319cbca376553301dfa17cf1:/src/common/intl.cpp diff --git a/src/common/intl.cpp b/src/common/intl.cpp index 39cd1a0c3f..896533d2a4 100644 --- a/src/common/intl.cpp +++ b/src/common/intl.cpp @@ -2575,6 +2575,14 @@ bool wxLocale::AddCatalog(const wxString& szDomain, { wxCHECK_MSG( IsOk(), false, "must initialize catalog first" ); + + // It is OK to not load catalog if the msgid language and m_language match, + // in which case we can directly display the texts embedded in program's + // source code: + if ( msgIdLanguage == m_language ) + return true; + + wxMsgCatalog *pMsgCat = new wxMsgCatalog; if ( pMsgCat->Load(m_strShort, szDomain, msgIdCharset, m_bConvertEncoding) ) @@ -2591,12 +2599,6 @@ bool wxLocale::AddCatalog(const wxString& szDomain, delete pMsgCat; - // It is OK to not load catalog if the msgid language and m_language match, - // in which case we can directly display the texts embedded in program's - // source code: - if ( msgIdLanguage == m_language ) - return true; - // If there's no exact match, we may still get partial match where the // (basic) language is same, but the country differs. For example, it's // permitted to use en_US strings from sources even if m_language is en_GB: