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

look in codeset-specific directory for locale files first, then fallback to the one without codeset

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35577 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-09-18 19:49:28 +00:00
parent 761952d9cb
commit ca6a9a1486
1 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/common/intl.cpp
View File

@@ -107,6 +107,8 @@ static const size_t LEN_LANG = 2;
static const size_t LEN_SUBLANG = 2; static const size_t LEN_SUBLANG = 2;
static const size_t LEN_FULL = LEN_LANG + 1 + LEN_SUBLANG; // 1 for '_' static const size_t LEN_FULL = LEN_LANG + 1 + LEN_SUBLANG; // 1 for '_'
#define TRACE_I18N _T("i18n")
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// global functions // global functions
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -1076,13 +1078,24 @@ static wxString GetFullSearchPath(const wxChar *lang)
bool wxMsgCatalogFile::Load(const wxChar *szDirPrefix, const wxChar *szName, bool wxMsgCatalogFile::Load(const wxChar *szDirPrefix, const wxChar *szName,
wxPluralFormsCalculatorPtr& rPluralFormsCalculator) wxPluralFormsCalculatorPtr& rPluralFormsCalculator)
{ {
/* wxString searchPath;
We need to handle locales like de_AT.iso-8859-1
For this we first chop off the .CHARSET specifier and ignore it.
FIXME: UNICODE SUPPORT: must use CHARSET specifier!
*/
wxString searchPath = GetFullSearchPath(szDirPrefix); #if wxUSE_FONTMAP
// first look for the catalog for this language and the current locale:
// notice that we don't use the system name for the locale as this would
// force us to install catalogs in different locations depending on the
// system but always use the canonical name
wxFontEncoding encSys = wxLocale::GetSystemEncoding();
if ( encSys != wxFONTENCODING_SYSTEM )
{
wxString fullname(szDirPrefix);
fullname << _T('.') << wxFontMapperBase::GetEncodingName(encSys);
searchPath << GetFullSearchPath(fullname) << wxPATH_SEP;
}
#endif // wxUSE_FONTMAP
searchPath += GetFullSearchPath(szDirPrefix);
const wxChar *sublocale = wxStrchr(szDirPrefix, wxT('_')); const wxChar *sublocale = wxStrchr(szDirPrefix, wxT('_'));
if ( sublocale ) if ( sublocale )
{ {
@@ -1102,17 +1115,21 @@ bool wxMsgCatalogFile::Load(const wxChar *szDirPrefix, const wxChar *szName,
NoTransErr noTransErr; NoTransErr noTransErr;
wxLogVerbose(_("looking for catalog '%s' in path '%s'."), wxLogVerbose(_("looking for catalog '%s' in path '%s'."),
szName, searchPath.c_str()); szName, searchPath.c_str());
wxLogTrace(TRACE_I18N, _T("Looking for \"%s.mo\" in \"%s\""),
szName, searchPath.c_str());
wxFileName fn(szName); wxFileName fn(szName);
fn.SetExt(_T("mo")); fn.SetExt(_T("mo"));
wxString strFullName; wxString strFullName;
if ( !wxFindFileInPath(&strFullName, searchPath, fn.GetFullPath()) ) { if ( !wxFindFileInPath(&strFullName, searchPath, fn.GetFullPath()) ) {
wxLogVerbose(_("catalog file for domain '%s' not found."), szName); wxLogVerbose(_("catalog file for domain '%s' not found."), szName);
wxLogTrace(TRACE_I18N, _T("Catalog \"%s.mo\" not found"), szName);
return false; return false;
} }
// open file // open file
wxLogVerbose(_("using catalog '%s' from '%s'."), szName, strFullName.c_str()); wxLogVerbose(_("using catalog '%s' from '%s'."), szName, strFullName.c_str());
wxLogTrace(TRACE_I18N, _T("Using catalog \"%s\"."), strFullName.c_str());
wxFile fileMsg(strFullName); wxFile fileMsg(strFullName);
if ( !fileMsg.IsOpened() ) if ( !fileMsg.IsOpened() )
@@ -1200,8 +1217,7 @@ bool wxMsgCatalogFile::Load(const wxChar *szDirPrefix, const wxChar *szName,
} }
else else
{ {
wxLogVerbose(_("Cannot parse Plural-Forms:'%s'"), wxLogVerbose(_("Cannot parse Plural-Forms:'%s'"), pfs.c_str());
pfs.c_str());
} }
} }
} }
@@ -2541,7 +2557,7 @@ const wxChar *wxLocale::GetString(const wxChar *szOrigString,
if ( szDomain != NULL ) if ( szDomain != NULL )
{ {
wxLogTrace(_T("i18n"), wxLogTrace(TRACE_I18N,
_T("string '%s'[%lu] not found in domain '%s' for locale '%s'."), _T("string '%s'[%lu] not found in domain '%s' for locale '%s'."),
szOrigString, (unsigned long)n, szOrigString, (unsigned long)n,
szDomain, m_strLocale.c_str()); szDomain, m_strLocale.c_str());
@@ -2549,7 +2565,7 @@ const wxChar *wxLocale::GetString(const wxChar *szOrigString,
} }
else else
{ {
wxLogTrace(_T("i18n"), wxLogTrace(TRACE_I18N,
_T("string '%s'[%lu] not found in locale '%s'."), _T("string '%s'[%lu] not found in locale '%s'."),
szOrigString, (unsigned long)n, m_strLocale.c_str()); szOrigString, (unsigned long)n, m_strLocale.c_str());
} }