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

Shorten lang names in wxTranslations, not wxFileTranslationsLoader.

Browse Source 
If a catalog with full language name ("fr_BE") doesn't exist,
wxFileTranslationsLoader tries to look for just the base language ("fr")
too. This isn't something specific to wxFileTranslationsLoader, it makes
sense to do it regardless of the loader.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64154 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2010-04-26 20:51:16 +00:00
parent 8dffb6b1a7
commit 076c0a8ee8
2 changed files with 45 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
src/common/translation.cpp
View File

@@ -1359,8 +1359,48 @@ bool wxTranslations::AddCatalog(const wxString& domain,
if ( msgIdLang == domain_lang )
return true;
return LoadCatalog(domain, domain_lang);
}
bool wxTranslations::LoadCatalog(const wxString& domain, const wxString& lang)
{
wxCHECK_MSG( m_loader, false, "loader can't be NULL" );
return m_loader->LoadCatalog(this, domain, domain_lang);
#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(lang);
fullname << wxS('.') << wxFontMapperBase::GetEncodingName(encSys);
if ( m_loader->LoadCatalog(this, domain, fullname) )
return true;
}
#endif // wxUSE_FONTMAP
// Next try: use the provided name language name:
if ( m_loader->LoadCatalog(this, domain, lang) )
return true;
// Also try just base locale name: for things like "fr_BE" (Belgium
// French) we should use fall back on plain "fr" if no Belgium-specific
// message catalogs exist
if ( lang.length() > LEN_LANG && lang[LEN_LANG] == wxS('_') )
{
if ( m_loader->LoadCatalog(this, domain, ExtractLang(lang)) )
return true;
}
// Nothing worked, the catalog just isn't there
wxLogTrace(TRACE_I18N,
"Catalog \"%s.mo\" not found for language \"%s\".",
domain, lang);
return false;
}
@@ -1669,31 +1709,7 @@ bool wxFileTranslationsLoader::LoadCatalog(wxTranslations *translations,
wxCHECK_MSG( lang.length() >= LEN_LANG, false,
"invalid language specification" );
wxString searchPath;
#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(lang);
fullname << wxS('.') << wxFontMapperBase::GetEncodingName(encSys);
searchPath << GetFullSearchPath(fullname) << wxPATH_SEP;
}
#endif // wxUSE_FONTMAP
searchPath += GetFullSearchPath(lang);
if ( lang.length() > LEN_LANG && lang[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
// message catalogs exist
searchPath << wxPATH_SEP
<< GetFullSearchPath(ExtractLang(lang));
}
wxString searchPath = GetFullSearchPath(lang);
wxLogTrace(TRACE_I18N, wxS("Looking for \"%s.mo\" in search path \"%s\""),
domain, searchPath);
@@ -1703,11 +1719,7 @@ bool wxFileTranslationsLoader::LoadCatalog(wxTranslations *translations,
wxString strFullName;
if ( !wxFindFileInPath(&strFullName, searchPath, fn.GetFullPath()) )
{
wxLogVerbose(_("catalog file for domain '%s' not found."), domain);
wxLogTrace(TRACE_I18N, wxS("Catalog \"%s.mo\" not found"), domain);
return false;
}
// open file and read its data
wxLogVerbose(_("using catalog '%s' from '%s'."), domain, strFullName.c_str());