added russian language to the list of choices
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10783 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -84,14 +84,19 @@ IMPLEMENT_APP(MyApp)
|
|||||||
// `Main program' equivalent, creating windows and returning main app frame
|
// `Main program' equivalent, creating windows and returning main app frame
|
||||||
bool MyApp::OnInit()
|
bool MyApp::OnInit()
|
||||||
{
|
{
|
||||||
wxString langs[] = {_T("(System default)"),
|
const wxChar * const langs[] =
|
||||||
_T("French"),
|
{
|
||||||
_T("German"),
|
_T("(System default)"),
|
||||||
_T("English"),
|
_T("French"),
|
||||||
_T("English (U.S.)")};
|
_T("German"),
|
||||||
|
_T("Russian"),
|
||||||
|
_T("English"),
|
||||||
|
_T("English (U.S.)")
|
||||||
|
};
|
||||||
|
|
||||||
SetExitOnFrameDelete(FALSE);
|
SetExitOnFrameDelete(FALSE);
|
||||||
int lng = wxGetSingleChoiceIndex(_T("Please choose language:"), _T("Language"),
|
int lng = wxGetSingleChoiceIndex(_T("Please choose language:"), _T("Language"),
|
||||||
5, langs);
|
WXSIZEOF(langs), (char **)langs);
|
||||||
SetExitOnFrameDelete(TRUE);
|
SetExitOnFrameDelete(TRUE);
|
||||||
|
|
||||||
switch (lng)
|
switch (lng)
|
||||||
@@ -99,13 +104,12 @@ bool MyApp::OnInit()
|
|||||||
case 0 : m_locale.Init(wxLANGUAGE_DEFAULT); break;
|
case 0 : m_locale.Init(wxLANGUAGE_DEFAULT); break;
|
||||||
case 1 : m_locale.Init(wxLANGUAGE_FRENCH); break;
|
case 1 : m_locale.Init(wxLANGUAGE_FRENCH); break;
|
||||||
case 2 : m_locale.Init(wxLANGUAGE_GERMAN); break;
|
case 2 : m_locale.Init(wxLANGUAGE_GERMAN); break;
|
||||||
case 3 : m_locale.Init(wxLANGUAGE_ENGLISH); break;
|
case 3 : m_locale.Init(wxLANGUAGE_RUSSIAN); break;
|
||||||
case 4 : m_locale.Init(wxLANGUAGE_ENGLISH_US); break;
|
case 4 : m_locale.Init(wxLANGUAGE_ENGLISH); break;
|
||||||
default:
|
case -1:
|
||||||
return FALSE;
|
case 5 : m_locale.Init(wxLANGUAGE_ENGLISH_US); break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Initialize the catalogs we'll be using
|
// Initialize the catalogs we'll be using
|
||||||
/* not needed any more, done in wxLocale ctor
|
/* not needed any more, done in wxLocale ctor
|
||||||
m_locale.AddCatalog("wxstd"); // 1) for library messages
|
m_locale.AddCatalog("wxstd"); // 1) for library messages
|
||||||
@@ -115,7 +119,10 @@ bool MyApp::OnInit()
|
|||||||
it might not be installed on yours - just ignore the errrors
|
it might not be installed on yours - just ignore the errrors
|
||||||
or comment out this line then */
|
or comment out this line then */
|
||||||
#ifdef __LINUX__
|
#ifdef __LINUX__
|
||||||
//m_locale.AddCatalog("fileutils"); // 3) and another just for testing
|
{
|
||||||
|
wxLogNull noLog;
|
||||||
|
m_locale.AddCatalog("fileutils"); // 3) and another just for testing
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Create the main frame window
|
// Create the main frame window
|
||||||
|
Reference in New Issue
Block a user