X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4cfee1efef0cdca4e40c7d902dbcccf46224c97e..8757ab3623821c10158224e0c9ed245bd83851d5:/src/common/translation.cpp diff --git a/src/common/translation.cpp b/src/common/translation.cpp index ee4328a72c..6b54200b85 100644 --- a/src/common/translation.cpp +++ b/src/common/translation.cpp @@ -1500,8 +1500,8 @@ const wxString& wxTranslations::GetString(const wxString& origString, TRACE_I18N, "string \"%s\"%s not found in %slocale '%s'.", origString, - n != UINT_MAX ? wxString::Format("[%ld]", (long)n) : wxString(), - !domain.empty() ? wxString::Format("domain '%s' ", domain) : wxString(), + (n != UINT_MAX ? wxString::Format("[%ld]", (long)n) : wxString()), + (!domain.empty() ? wxString::Format("domain '%s' ", domain) : wxString()), m_lang ); @@ -1741,7 +1741,7 @@ wxArrayString wxFileTranslationsLoader::GetAvailableTranslations(const wxString& i != prefixes.end(); ++i ) { - if (i->length() == 0) + if ( i->empty() ) continue; wxDir dir; if ( !dir.Open(*i) ) @@ -1790,7 +1790,7 @@ wxMsgCatalog *wxResourceTranslationsLoader::LoadCatalog(const wxString& domain, resname, GetResourceType(), GetModule()) ) - return false; + return NULL; wxLogTrace(TRACE_I18N, "Using catalog from Windows resource \"%s\".", resname);