X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5c0ee4a80ace91cee016b1b88566d3b60b07e2bb..a0845d45830eb22769107a61a6cb3485fa21922b:/samples/internat/internat.cpp

diff --git a/samples/internat/internat.cpp b/samples/internat/internat.cpp
index bc13c68259..c87774265e 100644
--- a/samples/internat/internat.cpp
+++ b/samples/internat/internat.cpp
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
+// Copyright:   (c) Julian Smart
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
@@ -61,6 +61,9 @@ public:
     void OnAbout(wxCommandEvent& event);
     void OnPlay(wxCommandEvent& event);
     void OnOpen(wxCommandEvent& event);
+    void OnTest1(wxCommandEvent& event);
+    void OnTest2(wxCommandEvent& event);
+    void OnTest3(wxCommandEvent& event);
 
     DECLARE_EVENT_TABLE()
 
@@ -74,21 +77,26 @@ public:
 // ID for the menu commands
 enum
 {
-    INTERNAT_QUIT = 1,
-    INTERNAT_TEXT,
+    INTERNAT_TEXT = wxID_HIGHEST + 1,
     INTERNAT_TEST,
+    INTERNAT_TEST_1,
+    INTERNAT_TEST_2,
+    INTERNAT_TEST_3,
     INTERNAT_OPEN
 };
 
 // ----------------------------------------------------------------------------
-// wxWindows macros
+// wxWidgets macros
 // ----------------------------------------------------------------------------
 
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
-    EVT_MENU(INTERNAT_QUIT, MyFrame::OnQuit)
+    EVT_MENU(wxID_EXIT, MyFrame::OnQuit)
     EVT_MENU(wxID_ABOUT, MyFrame::OnAbout)
     EVT_MENU(INTERNAT_TEST, MyFrame::OnPlay)
     EVT_MENU(INTERNAT_OPEN, MyFrame::OnOpen)
+    EVT_MENU(INTERNAT_TEST_1, MyFrame::OnTest1)
+    EVT_MENU(INTERNAT_TEST_2, MyFrame::OnTest2)
+    EVT_MENU(INTERNAT_TEST_3, MyFrame::OnTest3)
 END_EVENT_TABLE()
 
 IMPLEMENT_APP(MyApp)
@@ -119,9 +127,18 @@ bool MyApp::OnInit()
         wxLANGUAGE_FRENCH,
         wxLANGUAGE_GERMAN,
         wxLANGUAGE_RUSSIAN,
+        wxLANGUAGE_BULGARIAN,
+        wxLANGUAGE_CZECH,
+        wxLANGUAGE_POLISH,
+        wxLANGUAGE_SWEDISH,
+#if wxUSE_UNICODE || defined(__WXMOTIF__)
         wxLANGUAGE_JAPANESE,
+#endif
+#if wxUSE_UNICODE
+        wxLANGUAGE_GEORGIAN,
+#endif
         wxLANGUAGE_ENGLISH,
-        wxLANGUAGE_ENGLISH_US,
+        wxLANGUAGE_ENGLISH_US
     };
 
     if ( lng == -1 )
@@ -134,7 +151,16 @@ bool MyApp::OnInit()
             _T("French"),
             _T("German"),
             _T("Russian"),
+            _T("Bulgarian"),
+            _T("Czech"),
+            _T("Polish"),
+            _T("Swedish"),
+#if wxUSE_UNICODE || defined(__WXMOTIF__)
             _T("Japanese"),
+#endif
+#if wxUSE_UNICODE
+            _T("Georgian"),
+#endif
             _T("English"),
             _T("English (U.S.)")
         };
@@ -146,7 +172,7 @@ bool MyApp::OnInit()
         lng = wxGetSingleChoiceIndex
               (
                 _T("Please choose language:"),
-                _T("Language"), 
+                _T("Language"),
                 WXSIZEOF(langNames),
                 langNames
               );
@@ -155,6 +181,13 @@ bool MyApp::OnInit()
     if ( lng != -1 )
         m_locale.Init(langIds[lng]);
 
+    // normally this wouldn't be necessary as the catalog files would be found
+    // in the default locations, but under Windows then the program is not
+    // installed the catalogs are in the parent directory (because the binary
+    // is in a subdirectory of samples/internat) where we wouldn't find them by
+    // default
+    wxLocale::AddCatalogLookupPathPrefix(wxT("."));
+    wxLocale::AddCatalogLookupPathPrefix(wxT(".."));
 
     // Initialize the catalogs we'll be using
     m_locale.AddCatalog(wxT("internat"));
@@ -180,11 +213,15 @@ bool MyApp::OnInit()
     wxMenu *file_menu = new wxMenu;
     file_menu->Append(wxID_ABOUT, _("&About..."));
     file_menu->AppendSeparator();
-    file_menu->Append(INTERNAT_QUIT, _("E&xit"));
+    file_menu->Append(wxID_EXIT, _("E&xit"));
 
     wxMenu *test_menu = new wxMenu;
     test_menu->Append(INTERNAT_OPEN, _("&Open bogus file"));
     test_menu->Append(INTERNAT_TEST, _("&Play a game"));
+    test_menu->AppendSeparator();
+    test_menu->Append(INTERNAT_TEST_1, _("&1 _() (gettext)"));
+    test_menu->Append(INTERNAT_TEST_2, _("&2 _N() (ngettext)"));
+    test_menu->Append(INTERNAT_TEST_3, _("&3 wxTRANSLATE() (gettext_noop)"));
 
     wxMenuBar *menu_bar = new wxMenuBar;
     menu_bar->Append(file_menu, _("&File"));
@@ -192,10 +229,10 @@ bool MyApp::OnInit()
     frame->SetMenuBar(menu_bar);
 
     // Show the frame
-    frame->Show(TRUE);
+    frame->Show(true);
     SetTopWindow(frame);
 
-    return TRUE;
+    return true;
 }
 
 // ----------------------------------------------------------------------------
@@ -205,10 +242,8 @@ bool MyApp::OnInit()
 // main frame constructor
 MyFrame::MyFrame(wxLocale& locale)
        : wxFrame(NULL,
-                 -1,
-                 _("International wxWindows App"),
-                 wxPoint(50, 50),
-                 wxSize(350, 60)),
+                 wxID_ANY,
+                 _("International wxWidgets App")),
          m_locale(locale)
 {
     // Empty
@@ -216,7 +251,7 @@ MyFrame::MyFrame(wxLocale& locale)
 
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event) )
 {
-    Close(TRUE);
+    Close(true);
 }
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
@@ -226,43 +261,127 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
     wxString sysname = m_locale.GetSysName();
     wxString canname = m_locale.GetCanonicalName();
 
-    localeInfo.Printf( _("Language: %s\nSystem locale name: %s\nCanonical locale name: %s\n"),
+    localeInfo.Printf(_("Language: %s\nSystem locale name:\n%s\nCanonical locale name: %s\n"),
         locale.c_str(), sysname.c_str(), canname.c_str() );
 
-    wxMessageDialog(this, wxString(_("I18n sample\n(c) 1998, 1999 Vadim Zeitlin and Julian Smart"))
-        + wxT("\n\n") + localeInfo,
-        _("About Internat"), wxOK | wxICON_INFORMATION).ShowModal();
+    wxMessageDialog dlg(
+                        this,
+                        wxString(_("I18n sample\n(c) 1998, 1999 Vadim Zeitlin and Julian Smart"))
+                                 + wxT("\n\n")
+                                 + localeInfo,
+                                 _("About Internat"),
+                        wxOK | wxICON_INFORMATION
+                       );
+    dlg.ShowModal();
 }
 
 void MyFrame::OnPlay(wxCommandEvent& WXUNUSED(event))
 {
-    wxString str = wxGetTextFromUser(_("Enter your number:"),
-        _("Try to guess my number!"), wxEmptyString, this);
-
-    if ( str.IsEmpty() ) return;
+    wxString str = wxGetTextFromUser
+                   (
+                    _("Enter your number:"),
+                    _("Try to guess my number!"),
+                    wxEmptyString,
+                    this
+                   );
+
+    if ( str.empty() )
+    {
+        // cancelled
+        return;
+    }
 
-    int num;
-    wxSscanf(str, wxT("%d"), &num);
-    if ( num == 0 )
+    long num;
+    if ( !str.ToLong(&num) || num < 0 )
+    {
         str = _("You've probably entered an invalid number.");
-    else if ( num == 9 )  // this message is not translated (not in catalog)
+    }
+    else if ( num == 9 )
+    {
+        // this message is not translated (not in catalog) because we used _T()
+        // and not _() around it
         str = _T("You've found a bug in this program!");
-    else if ( num != 17 ) // a more implicit way to write _()
-        str = wxGetTranslation(wxT("Bad luck! try again..."));
-    else
+    }
+    else if ( num == 17 )
     {
-        str.Empty();
-        // string must be split in two -- otherwise the translation won't be found
+        str.clear();
+
+        // string must be split in two -- otherwise the translation would't be
+        // found
         str << _("Congratulations! you've won. Here is the magic phrase:")
             << _("cannot create fifo `%s'");
     }
+    else
+    {
+        // this is a more implicit way to write _() but note that if you use it
+        // you must ensure that the strings get extracted in the message
+        // catalog as by default xgettext won't do it (it only knows of _(),
+        // not wxGetTranslation())
+        str = wxGetTranslation(_T("Bad luck! try again..."));
+    }
 
     wxMessageBox(str, _("Result"), wxOK | wxICON_INFORMATION);
 }
 
 void MyFrame::OnOpen(wxCommandEvent&)
 {
-    // open a bogus file -- the error message should be also translated if you've
-    // got wxstd.mo somewhere in the search path
+    // open a bogus file -- the error message should be also translated if
+    // you've got wxstd.mo somewhere in the search path
     wxFile file(wxT("NOTEXIST.ING"));
 }
+
+void MyFrame::OnTest1(wxCommandEvent& WXUNUSED(event))
+{
+    const wxChar* title = _("Testing _() (gettext)");
+    wxTextEntryDialog d(this, _("Please enter text to translate"),
+        title, wxTRANSLATE("default value"));
+    if (d.ShowModal() == wxID_OK)
+    {
+        wxString v = d.GetValue();
+        wxString s(title);
+        s << _T("\n") << v << _T(" -> ")
+            << wxGetTranslation(v.c_str()) << _T("\n");
+        wxMessageBox(s);
+    }
+}
+
+void MyFrame::OnTest2(wxCommandEvent& WXUNUSED(event))
+{
+    const wxChar* title = _("Testing _N() (ngettext)");
+    wxTextEntryDialog d(this,
+        _("Please enter range for plural forms of \"n files deleted\" phrase"),
+        title, _T("0-10"));
+    if (d.ShowModal() == wxID_OK)
+    {
+        int first, last;
+        wxSscanf(d.GetValue(), _T("%d-%d"), &first, &last);
+        wxString s(title);
+        s << _T("\n");
+        for (int n = first; n <= last; ++n)
+        {
+            s << n << _T(" ") <<
+                wxPLURAL("file deleted", "files deleted", n) <<
+                _T("\n");
+        }
+        wxMessageBox(s);
+    }
+}
+
+void MyFrame::OnTest3(wxCommandEvent& WXUNUSED(event))
+{
+    const wxChar* lines[] =
+    {
+        wxTRANSLATE("line 1"),
+        wxTRANSLATE("line 2"),
+        wxTRANSLATE("line 3"),
+    };
+    wxString s(_("Testing wxTRANSLATE() (gettext_noop)"));
+    s << _T("\n");
+    for (size_t i = 0; i < WXSIZEOF(lines); ++i)
+    {
+        s << lines[i] << _T(" -> ") << wxGetTranslation(lines[i]) << _T("\n");
+    }
+    wxMessageBox(s);
+}
+
+