X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/017fcf32bef8d38c997b463ee9d5c2a9f6a6c5c3..13c4e406d3b77aa87fc93e6cc67e58b49bd928c0:/samples/internat/internat.cpp

diff --git a/samples/internat/internat.cpp b/samples/internat/internat.cpp
index ee3cf22db6..d0aa9475f0 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
 /////////////////////////////////////////////////////////////////////////////
 
@@ -109,40 +109,57 @@ bool MyApp::OnInit()
     if ( argc == 2 )
     {
         // the parameter must be the lang index
-        wxString(argv[1]).ToLong(&lng);
+        wxString tmp(argv[1]);
+        tmp.ToLong(&lng);
     }
 
+    static const wxLanguage langIds[] =
+    {
+        wxLANGUAGE_DEFAULT,
+        wxLANGUAGE_FRENCH,
+        wxLANGUAGE_GERMAN,
+        wxLANGUAGE_RUSSIAN,
+#if wxUSE_UNICODE
+        wxLANGUAGE_JAPANESE,
+        wxLANGUAGE_GEORGIAN,
+#endif
+        wxLANGUAGE_ENGLISH,
+        wxLANGUAGE_ENGLISH_US
+    };
+
     if ( lng == -1 )
     {
-        const wxString langs[] =
+        // note that it makes no sense to translate these strings, they are
+        // shown before we set the locale anyhow
+        const wxString langNames[] =
         {
-            _T("(System default)"),
+            _T("System default"),
             _T("French"),
             _T("German"),
             _T("Russian"),
+#if wxUSE_UNICODE
+            _T("Japanese"),
+            _T("Georgian"),
+#endif
             _T("English"),
             _T("English (U.S.)")
         };
 
+        // the arrays should be in sync
+        wxCOMPILE_TIME_ASSERT( WXSIZEOF(langNames) == WXSIZEOF(langIds),
+                               LangArraysMismatch );
+
         lng = wxGetSingleChoiceIndex
               (
                 _T("Please choose language:"),
                 _T("Language"), 
-                WXSIZEOF(langs),
-                langs
+                WXSIZEOF(langNames),
+                langNames
               );
     }
 
-    switch ( lng )
-    {
-        case 0 : m_locale.Init(wxLANGUAGE_DEFAULT); break;
-        case 1 : m_locale.Init(wxLANGUAGE_FRENCH); break;
-        case 2 : m_locale.Init(wxLANGUAGE_GERMAN); break;
-        case 3 : m_locale.Init(wxLANGUAGE_RUSSIAN); break;
-        case 4 : m_locale.Init(wxLANGUAGE_ENGLISH); break;
-        case -1:
-        case 5 : m_locale.Init(wxLANGUAGE_ENGLISH_US); break;
-    }
+    if ( lng != -1 )
+        m_locale.Init(langIds[lng]);
 
 
     // Initialize the catalogs we'll be using
@@ -215,36 +232,64 @@ 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: %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
+    (
+        this,
+        wxString(_("I18n sample\n(c) 1998, 1999 Vadim Zeitlin and Julian Smart"))
+            + wxT("\n\n")
+            + localeInfo,
+        _("About Internat"), 
+        wxOK | wxICON_INFORMATION
+    ).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);
 }
@@ -255,3 +300,4 @@ void MyFrame::OnOpen(wxCommandEvent&)
     // got wxstd.mo somewhere in the search path
     wxFile file(wxT("NOTEXIST.ING"));
 }
+