Minor changes, just trim trailing spaces in webview code.

[wxWidgets.git] / samples / internat / internat.cpp

diff --git a/samples/internat/internat.cpp b/samples/internat/internat.cpp
index 6748536e519cafbb98d5ab7a2ccdec2304fab98f..d285652e7ceeab879b28efb059c31bc283e77df4 100644 (file)
--- a/samples/internat/internat.cpp
+++ b/samples/internat/internat.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // NOTE: don't miss the "readme.txt" file which comes with this sample!
@@ -37,8 +37,8 @@
 #include "wx/log.h"
 #include "wx/cmdline.h"
 
-#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__)
-#include "mondrian.xpm"
+#ifndef wxHAS_IMAGES_IN_RESOURCES
+    #include "../sample.xpm"
 #endif
 
 // ----------------------------------------------------------------------------
@@ -76,6 +76,7 @@ public:
     void OnTest1(wxCommandEvent& event);
     void OnTest2(wxCommandEvent& event);
     void OnTest3(wxCommandEvent& event);
+    void OnTestMsgBox(wxCommandEvent& event);
 
     DECLARE_EVENT_TABLE()
 
@@ -93,7 +94,8 @@ enum
     INTERNAT_PLAY,
     INTERNAT_TEST_1,
     INTERNAT_TEST_2,
-    INTERNAT_TEST_3
+    INTERNAT_TEST_3,
+    INTERNAT_TEST_MSGBOX
 };
 
 // language data
@@ -163,6 +165,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(INTERNAT_TEST_1, MyFrame::OnTest1)
     EVT_MENU(INTERNAT_TEST_2, MyFrame::OnTest2)
     EVT_MENU(INTERNAT_TEST_3, MyFrame::OnTest3)
+    EVT_MENU(INTERNAT_TEST_MSGBOX, MyFrame::OnTestMsgBox)
 END_EVENT_TABLE()
 
 IMPLEMENT_APP(MyApp)
@@ -226,7 +229,7 @@ bool MyApp::OnInit()
 
     // don't use wxLOCALE_LOAD_DEFAULT flag so that Init() doesn't return
     // false just because it failed to load wxstd catalog
-    if ( !m_locale.Init(m_lang, wxLOCALE_CONV_ENCODING) )
+    if ( !m_locale.Init(m_lang, wxLOCALE_DONT_LOAD_DEFAULT) )
     {
         wxLogWarning(_("This language is not supported by the system."));
 
@@ -240,12 +243,16 @@ bool MyApp::OnInit()
     wxLocale::AddCatalogLookupPathPrefix(".");
 
     // Initialize the catalogs we'll be using
+    const wxLanguageInfo* pInfo = wxLocale::GetLanguageInfo(m_lang);
     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
     // a localized error message:
-    m_locale.AddCatalog("wxstd.mo");
+    m_locale.AddCatalog("wxstd");
         // NOTE: it's not an error if we couldn't find it!
 
     // this catalog is installed in standard location on Linux systems and
@@ -264,7 +271,6 @@ bool MyApp::OnInit()
 
     // Show the frame
     frame->Show(true);
-    SetTopWindow(frame);
 
     return true;
 }
@@ -280,7 +286,7 @@ MyFrame::MyFrame(wxLocale& locale)
                  _("International wxWidgets App")),
          m_locale(locale)
 {
-    SetIcon(wxICON(mondrian));
+    SetIcon(wxICON(sample));
 
     // Make a menubar
     wxMenu *file_menu = new wxMenu;
@@ -289,7 +295,7 @@ MyFrame::MyFrame(wxLocale& locale)
 
     // since wxID_ABOUT and wxID_EXIT are stock IDs they will automatically get
     // translated help strings; nice isn't it?
-    file_menu->Append(wxID_ABOUT, _("&About..."));
+    file_menu->Append(wxID_ABOUT, _("&About"));
     file_menu->AppendSeparator();
     file_menu->Append(wxID_EXIT, _("E&xit"));
 
@@ -300,6 +306,8 @@ MyFrame::MyFrame(wxLocale& locale)
     test_menu->Append(INTERNAT_TEST_1, _("&1 _() (gettext)"), _("Tests the _() macro"));
     test_menu->Append(INTERNAT_TEST_2, _("&2 _N() (ngettext)"), _("Tests the _N() macro"));
     test_menu->Append(INTERNAT_TEST_3, _("&3 wxTRANSLATE() (gettext_noop)"), _("Tests the wxTRANSLATE() macro"));
+    test_menu->Append(INTERNAT_TEST_MSGBOX, _("&Message box test"),
+                      _("Tests message box buttons labels translation"));
 
     wxMenuBar *menu_bar = new wxMenuBar;
     menu_bar->Append(file_menu, _("&File"));
@@ -330,8 +338,8 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
     wxString sysname = m_locale.GetSysName();
     wxString canname = m_locale.GetCanonicalName();
 
-    localeInfo.Printf(_("Language: %s\nSystem locale name:\n%s\nCanonical locale name: %s\n"),
-        locale.c_str(), sysname.c_str(), canname.c_str() );
+    localeInfo.Printf(_("Language: %s\nSystem locale name: %s\nCanonical locale name: %s\n"),
+                      locale.c_str(), sysname.c_str(), canname.c_str() );
 
     wxMessageDialog dlg(
                         this,
@@ -367,9 +375,9 @@ void MyFrame::OnPlay(wxCommandEvent& WXUNUSED(event))
     }
     else if ( num == 9 )
     {
-        // this message is not translated (not in catalog) because we used _T()
+        // this message is not translated (not in catalog) because we used wxT()
         // and not _() around it
-        str = _T("You've found a bug in this program!");
+        str = wxT("You've found a bug in this program!");
     }
     else if ( num == 17 )
     {
@@ -390,7 +398,7 @@ void MyFrame::OnPlay(wxCommandEvent& WXUNUSED(event))
         str = wxGetTranslation(wxTRANSLATE("Bad luck! try again..."));
 
         // note also that if we want 'str' to contain a localized string
-        // we need to use wxGetTranslation explicitely as wxTRANSLATE just
+        // we need to use wxGetTranslation explicitly as wxTRANSLATE just
         // tells xgettext to extract the string but has no effect on the
         // runtime of the program!
     }
@@ -420,9 +428,13 @@ void MyFrame::OnTestLocaleAvail(wxCommandEvent& WXUNUSED(event))
     }
 
     if ( wxLocale::IsAvailable(info->Language) )
+    {
         wxLogMessage(_("Locale \"%s\" is available."), s_locale.c_str());
+    }
     else
+    {
         wxLogWarning(_("Locale \"%s\" is not available."), s_locale.c_str());
+    }
 }
 
 void MyFrame::OnOpen(wxCommandEvent& WXUNUSED(event))
@@ -496,4 +508,17 @@ void MyFrame::OnTest3(wxCommandEvent& WXUNUSED(event))
     wxMessageBox(s);
 }
 
-
+void MyFrame::OnTestMsgBox(wxCommandEvent& WXUNUSED(event))
+{
+    if ( wxMessageBox
+         (
+            _("Are the labels of the buttons in this message box "
+              "translated into the current locale language?"),
+            _("wxWidgets i18n sample"),
+            wxYES_NO,
+            this
+         ) != wxYES )
+    {
+        wxMessageBox(_("Please report the details of your platform to us."));
+    }
+}