s/wxWindows/wxWidgets; update wx-dev mail address

[wxWidgets.git] / src / common / intl.cpp

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index 0fd36d04d9888ebff956d59233044343ead0a088..e20715c4c75f842604ee1c65c3da87b5a88f683e 100644 (file)
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -1198,7 +1198,7 @@ bool wxMsgCatalogFile::Load(const wxString& szDirPrefix, const wxString& szName,
 
 
     searchPath += GetFullSearchPath(szDirPrefix);
-    if ( szDirPrefix[LEN_LANG] == wxS('_') )
+    if ( szDirPrefix.length() > LEN_LANG && szDirPrefix[LEN_LANG] == wxS('_') )
     {
         // also add just base locale name: for things like "fr_BE" (Belgium
         // French) we should use fall back on plain "fr" if no Belgium-specific
@@ -2573,7 +2573,7 @@ bool wxLocale::AddCatalog(const wxString& szDomain,
                         const wxString& msgIdCharset)
 
 {
-    wxCHECK_MSG( IsOk(), false, "must initialize catalog first" );
+    wxCHECK_MSG( !m_strShort.empty(), false, "must initialize catalog first" );
 
 
     // It is OK to not load catalog if the msgid language and m_language match,