// This is a "low-level" class and is used only by wxMsgCatalog
// ----------------------------------------------------------------------------
-WX_DECLARE_STRING_HASH_MAP(wxString, wxMessagesHash)
+WX_DECLARE_EXPORTED_STRING_HASH_MAP(wxString, wxMessagesHash)
class wxMsgCatalogFile
{
const char *StringAtOfs(wxMsgTableEntry *pTable, size_t32 index) const
{ return (const char *)(m_pData + Swap(pTable[index].ofsString)); }
-
+
wxString GetCharset() const;
// utility functions
if ( pszLcPath != NULL )
searchPath << GetAllMsgCatalogSubdirs(pszLcPath, lang);
+#ifdef __UNIX__
+ // add some standard ones and the one in the tree where wxWin was installed:
+ searchPath
+ << GetAllMsgCatalogSubdirs(wxString(wxGetInstallPrefix()) + wxT("/share/locale"), lang)
+ << GetAllMsgCatalogSubdirs(wxT("/usr/share/locale"), lang)
+ << GetAllMsgCatalogSubdirs(wxT("/usr/lib/locale"), lang)
+ << GetAllMsgCatalogSubdirs(wxT("/usr/local/share/locale"), lang);
+#endif // __UNIX__
+
// then take the current directory
// FIXME it should be the directory of the executable
#ifdef __WXMAC__
wxGetWorkingDirectory( cwd , sizeof( cwd ) ) ;
searchPath << GetAllMsgCatalogSubdirs(cwd, lang);
// generic search paths could be somewhere in the system folder preferences
-#else
+#else // !Mac
searchPath << GetAllMsgCatalogSubdirs(wxT("."), lang);
- // and finally add some standard ones
- searchPath
- << GetAllMsgCatalogSubdirs(wxT("/usr/share/locale"), lang)
- << GetAllMsgCatalogSubdirs(wxT("/usr/lib/locale"), lang)
- << GetAllMsgCatalogSubdirs(wxT("/usr/local/share/locale"), lang);
-#endif
+#endif // platform
+
return searchPath;
}
if ( !!charset )
csConv = new wxCSConv(charset);
- wxMBConv& inputConv = csConv ? *csConv : *wxConvCurrent;
+ wxMBConv& inputConv = csConv ? *((wxMBConv*)csConv) : *wxConvCurrent;
for (size_t i = 0; i < m_numStrings; i++)
{
hash[key] = wxString(StringAtOfs(m_pTransTable, i), inputConv);
#else
if ( convertEncoding )
- hash[key] =
+ hash[key] =
wxString(inputConv.cMB2WC(StringAtOfs(m_pTransTable, i)),
wxConvLocal);
else
#if wxUSE_FONTMAP
if ( convertEncoding )
{
- wxFontEncoding enc = wxTheFontMapper->CharsetToEncoding(charset, FALSE);
+ wxFontEncoding targetEnc = wxFONTENCODING_SYSTEM;
+ wxFontEncoding enc = wxFontMapper::Get()->CharsetToEncoding(charset, FALSE);
if ( enc == wxFONTENCODING_SYSTEM )
{
convertEncoding = FALSE; // unknown encoding
}
else
{
- wxFontEncoding targetEnc = wxLocale::GetSystemEncoding();
+ targetEnc = wxLocale::GetSystemEncoding();
if (targetEnc == wxFONTENCODING_SYSTEM)
{
wxFontEncodingArray a = wxEncodingConverter::GetPlatformEquivalents(enc);
if (a[0] == enc)
// no conversion needed, locale uses native encoding
- convertEncoding = FALSE;
+ convertEncoding = FALSE;
if (a.GetCount() == 0)
// we don't know common equiv. under this platform
convertEncoding = FALSE;
for (size_t i = 0; i < m_numStrings; i++)
{
wxString key(StringAtOfs(m_pOrigTable, i));
- hash[key] =
+ hash[key] =
converter.Convert(wxString(StringAtOfs(m_pTransTable, i)));
}
}
}
if ( !convertEncoding )
- #else // !wxUSE_FONTMAP
+ #endif // wxUSE_FONTMAP/!wxUSE_FONTMAP
{
for (size_t i = 0; i < m_numStrings; i++)
{
hash[key] = StringAtOfs(m_pTransTable, i);
}
}
- #endif // wxUSE_FONTMAP/!wxUSE_FONTMAP
#endif // wxUSE_WCHAR_T/!wxUSE_WCHAR_T
}
{
// first, find encoding header:
const char *hdr = StringAtOfs(m_pOrigTable, 0);
- if ( hdr == NULL || hdr[0] != 0 )
+ if ( hdr == NULL || hdr[0] != 0 )
{
// not supported by this catalog, does not have correct header
return wxEmptyString;
if ( pos == wxNOT_FOUND )
{
// incorrectly filled Content-Type header
- return wxEmptyString;
+ return wxEmptyString;
}
size_t n = pos + 34; /*strlen("Content-Type: text/plain; charset=")*/
while ( header[n] != wxT('\n') )
charset << header[n++];
-
+
if ( charset == wxT("CHARSET") )
{
// "CHARSET" is not valid charset, but lazy translator
return wxEmptyString;
}
-
+
return charset;
}
// wxMsgCatalog class
// ----------------------------------------------------------------------------
-bool wxMsgCatalog::Load(const wxChar *szDirPrefix, const wxChar *szName,
+bool wxMsgCatalog::Load(const wxChar *szDirPrefix, const wxChar *szName,
bool bConvertEncoding)
{
wxMsgCatalogFile file;
-
+
m_name = szName;
-
+
if ( file.Load(szDirPrefix, szName) )
{
file.FillHash(m_messages, bConvertEncoding);
return TRUE;
}
- else
- return FALSE;
+
+ return FALSE;
}
const wxChar *wxMsgCatalog::GetString(const wxChar *sz) const
const wxChar *retloc;
// Set the locale:
-#ifdef __UNIX__
+#if defined(__UNIX__) && !defined(__WXMAC__)
if (language == wxLANGUAGE_DEFAULT)
locale = wxEmptyString;
else
size_t i = 0,
count = ms_languagesDB->GetCount();
-#if defined(__UNIX__)
+#if defined(__UNIX__) && !defined(__WXMAC__)
// first get the string identifying the language from the environment
wxString langFull;
if (!wxGetEnv(wxT("LC_ALL"), &langFull) &&
}
}
#elif defined(__WXMAC__)
- char* lc = NULL ;
+ const char* lc = NULL ;
long lang = GetScriptVariable( smSystemScript, smScriptLang) ;
switch( GetScriptManagerVariable( smRegionCode ) ) {
case verUS :
break;
}
}
-
+
#elif defined(__WIN32__)
LCID lcid = GetUserDefaultLCID();
if ( lcid != 0 )
char *alang = nl_langinfo(CODESET);
setlocale(LC_CTYPE, oldLocale);
free(oldLocale);
- if (alang)
+
+ if ( alang )
{
-#ifdef __SOLARIS__
+ // 7 bit ASCII encoding has several alternative names which we should
+ // recognize to avoid warnings about unrecognized encoding on each
+ // program startup
+
// nl_langinfo() under Solaris returns 646 by default which stands for
- // ISO-646, i.e. 7 bit ASCII and we should recognize it to avoid
- // warnings about unrecognized encoding on each program startup
- if ( strcmp(alang, "646") == 0 )
+ // ISO-646, i.e. 7 bit ASCII
+ //
+ // and recent glibc call it ANSI_X3.4-1968...
+ if ( strcmp(alang, "646") == 0 ||
+ strcmp(alang, "ANSI_X3.4-1968") == 0 )
{
encname = _T("US-ASCII");
}
else
-#endif // __SOLARIS__
{
- encname = wxConvLibc.cMB2WX(alang);
+ encname = wxString::FromAscii( alang );
}
}
else
// if we can't get at the character set directly, try to see if it's in
// the environment variables (in most cases this won't work, but I was
// out of ideas)
- wxChar *lang = wxGetenv(wxT("LC_ALL"));
- wxChar *dot = lang ? wxStrchr(lang, wxT('.')) : (wxChar *)NULL;
+ char *lang = getenv( "LC_ALL");
+ char *dot = lang ? strchr(lang, '.') : (char *)NULL;
if (!dot)
{
- lang = wxGetenv(wxT("LC_CTYPE"));
+ lang = getenv( "LC_CTYPE" );
if ( lang )
- dot = wxStrchr(lang, wxT('.'));
+ dot = strchr(lang, '.' );
}
if (!dot)
{
- lang = wxGetenv(wxT("LANG"));
+ lang = getenv( "LANG");
if ( lang )
- dot = wxStrchr(lang, wxT('.'));
+ dot = strchr(lang, '.');
}
if ( dot )
{
- encname = dot+1;
+ encname = wxString::FromAscii( dot+1 );
}
}
#endif // Win32/Unix
wxString encname = GetSystemEncodingName();
if ( !encname.empty() )
{
- wxFontEncoding enc = wxTheFontMapper->
+ wxFontEncoding enc = wxFontMapper::Get()->
CharsetToEncoding(encname, FALSE /* not interactive */);
// this should probably be considered as a bug in CharsetToEncoding():
const wxChar *pszTrans = NULL;
wxMsgCatalog *pMsgCat;
- if ( szDomain != NULL )
+ if ( szDomain != NULL )
{
pMsgCat = FindCatalog(szDomain);
if ( pMsgCat != NULL )
pszTrans = pMsgCat->GetString(szOrigString);
}
- else
+ else
{
// search in all domains
- for ( pMsgCat = m_pMsgCat; pMsgCat != NULL; pMsgCat = pMsgCat->m_pNext )
+ for ( pMsgCat = m_pMsgCat; pMsgCat != NULL; pMsgCat = pMsgCat->m_pNext )
{
pszTrans = pMsgCat->GetString(szOrigString);
if ( pszTrans != NULL ) // take the first found
}
}
- if ( pszTrans == NULL )
+ if ( pszTrans == NULL )
{
#ifdef __WXDEBUG__
- if ( !NoTransErr::Suppress() )
+ if ( !NoTransErr::Suppress() )
{
NoTransErr noTransErr;
if ( szDomain != NULL )
{
- wxLogDebug(_T("string '%s' not found in domain '%s' for locale '%s'."),
- szOrigString, szDomain, m_strLocale.c_str());
+ wxLogTrace(_T("i18n"),
+ _T("string '%s' not found in domain '%s' for locale '%s'."),
+ szOrigString, szDomain, m_strLocale.c_str());
}
else
{
- wxLogDebug(_T("string '%s' not found in locale '%s'."),
+ wxLogTrace(_T("i18n"),
+ _T("string '%s' not found in locale '%s'."),
szOrigString, m_strLocale.c_str());
}
}
{
// linear search in the linked list
wxMsgCatalog *pMsgCat;
- for ( pMsgCat = m_pMsgCat; pMsgCat != NULL; pMsgCat = pMsgCat->m_pNext )
+ for ( pMsgCat = m_pMsgCat; pMsgCat != NULL; pMsgCat = pMsgCat->m_pNext )
{
if ( wxStricmp(pMsgCat->GetName(), szDomain) == 0 )
return pMsgCat;
LNG(wxLANGUAGE_YORUBA, "yo" , 0 , 0 , "Yoruba")
LNG(wxLANGUAGE_ZHUANG, "za" , 0 , 0 , "Zhuang")
LNG(wxLANGUAGE_ZULU, "zu" , 0 , 0 , "Zulu")
-
+
};
#undef LNG
projects / wxWidgets.git / blobdiff