include the locale name in the error message when the catalog can't be loaded

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59970 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi 2009-04-01 14:59:38 +00:00
parent 2daa5d2c99
commit 5036c26475

View File

@ -240,8 +240,10 @@ bool MyApp::OnInit()
wxLocale::AddCatalogLookupPathPrefix("."); wxLocale::AddCatalogLookupPathPrefix(".");
// Initialize the catalogs we'll be using // Initialize the catalogs we'll be using
const wxLanguageInfo* pInfo = wxLocale::GetLanguageInfo(m_lang);
if (!m_locale.AddCatalog("internat")) if (!m_locale.AddCatalog("internat"))
wxLogError(_("Couldn't find/load the 'internat' catalog.")); wxLogError(_("Couldn't find/load the 'internat' catalog for locale '%s'."),
pInfo ? pInfo->GetLocaleName() : _("unknown"));
// Now try to add wxstd.mo so that loading "NOTEXIST.ING" file will produce // Now try to add wxstd.mo so that loading "NOTEXIST.ING" file will produce
// a localized error message: // a localized error message:
@ -330,8 +332,8 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
wxString sysname = m_locale.GetSysName(); wxString sysname = m_locale.GetSysName();
wxString canname = m_locale.GetCanonicalName(); wxString canname = m_locale.GetCanonicalName();
localeInfo.Printf(_("Language: %s\nSystem locale name:\n%s\nCanonical locale name: %s\n"), localeInfo.Printf(_("Language: %s\nSystem locale name: %s\nCanonical locale name: %s\n"),
locale.c_str(), sysname.c_str(), canname.c_str() ); locale.c_str(), sysname.c_str(), canname.c_str() );
wxMessageDialog dlg( wxMessageDialog dlg(
this, this,