remove usage of _T(); it's just confusing and it's not needed anymore; use wxTRANSLAT...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58140 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/internat/internat.cpp b/samples/internat/internat.cpp
index 3fc77d56e68ed574a2d39221bab8de3d1a9e5c57..806953e57dd04046a8e4fb1d8edbaf245717e05e 100644 (file)
--- a/samples/internat/internat.cpp
+++ b/samples/internat/internat.cpp
@@ -120,24 +120,24 @@ static const wxLanguage langIds[] =
 // shown before we set the locale anyhow
 const wxString langNames[] =
 {
-    _T("System default"),
-    _T("French"),
-    _T("Italian"),
-    _T("German"),
-    _T("Russian"),
-    _T("Bulgarian"),
-    _T("Czech"),
-    _T("Polish"),
-    _T("Swedish"),
+    "System default",
+    "French",
+    "Italian",
+    "German",
+    "Russian",
+    "Bulgarian",
+    "Czech",
+    "Polish",
+    "Swedish",
 #if wxUSE_UNICODE || defined(__WXMOTIF__)
-    _T("Japanese"),
+    "Japanese",
 #endif
 #if wxUSE_UNICODE
-    _T("Georgian"),
-    _T("English"),
-    _T("English (U.S.)"),
-    _T("Arabic"),
-    _T("Arabic (Egypt)")
+    "Georgian",
+    "English",
+    "English (U.S.)",
+    "Arabic",
+    "Arabic (Egypt)"
 #endif
 };
 
@@ -246,7 +246,7 @@ bool MyApp::OnInit()
 #ifdef __LINUX__
     {
         wxLogNull noLog;
-        m_locale.AddCatalog(_T("fileutils"));
+        m_locale.AddCatalog("fileutils");
     }
 #endif
 
@@ -370,9 +370,10 @@ void MyFrame::OnPlay(wxCommandEvent& WXUNUSED(event))
     {
         // 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..."));
+        // catalog as by default xgettext won't do it; it only knows of _(),
+        // not of wxTRANSLATE(). As internat's readme.txt says you should thus
+        // call xgettext with -kwxTRANSLATE.
+        str = wxTRANSLATE("Bad luck! try again...");
     }
 
     wxMessageBox(str, _("Result"), wxOK | wxICON_INFORMATION);
@@ -417,12 +418,13 @@ void MyFrame::OnTest1(wxCommandEvent& WXUNUSED(event))
     const wxString 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");
+        s << "\n" << v << " -> "
+            << wxGetTranslation(v.c_str()) << "\n";
         wxMessageBox(s);
     }
 }
@@ -432,18 +434,19 @@ void MyFrame::OnTest2(wxCommandEvent& WXUNUSED(event))
     const wxString title = _("Testing _N() (ngettext)");
     wxTextEntryDialog d(this,
         _("Please enter range for plural forms of \"n files deleted\" phrase"),
-        title, _T("0-10"));
+        title, "0-10");
+
     if (d.ShowModal() == wxID_OK)
     {
         int first, last;
-        wxSscanf(d.GetValue(), _T("%d-%d"), &first, &last);
+        wxSscanf(d.GetValue(), "%d-%d", &first, &last);
         wxString s(title);
-        s << _T("\n");
+        s << "\n";
         for (int n = first; n <= last; ++n)
         {
-            s << n << _T(" ") <<
+            s << n << " " <<
                 wxPLURAL("file deleted", "files deleted", n) <<
-                _T("\n");
+                "\n";
         }
         wxMessageBox(s);
     }
@@ -457,11 +460,12 @@ void MyFrame::OnTest3(wxCommandEvent& WXUNUSED(event))
         wxTRANSLATE("line 2"),
         wxTRANSLATE("line 3"),
     };
+
     wxString s(_("Testing wxTRANSLATE() (gettext_noop)"));
-    s << _T("\n");
+    s << "\n";
     for (size_t i = 0; i < WXSIZEOF(lines); ++i)
     {
-        s << lines[i] << _T(" -> ") << wxGetTranslation(lines[i]) << _T("\n");
+        s << lines[i] << " -> " << wxGetTranslation(lines[i]) << "\n";
     }
     wxMessageBox(s);
 }

diff --git a/samples/internat/readme.txt b/samples/internat/readme.txt
index 786a22368c30e0bb21cc8adc13d72988f4101ebf..526cc55ea5af7114ba661cbe432a53cdd924ae1d 100644 (file)
--- a/samples/internat/readme.txt
+++ b/samples/internat/readme.txt
@@ -19,7 +19,7 @@ A. Your system doesn't have the translation in the language you use, sorry.
 Q. Why the message when I enter '9' is not translated?
 A. This is on purpose: the corresponding string wasn't enclosed in _() macro and
    so didn't get into the message catalog when it was created using xgettext.
-   
+
 Q. Why the message when I enter '17' is only partly translated?
 A. This will only work under some versions of Linux, don't worry if the second
    half of the sentence is not translated.
@@ -36,7 +36,7 @@ Q. How to do translations to other language?
 A. First of all, you will need the GNU gettext tools (see the next question).
    After you've probably installed them, type the following (example is for Unix
    and you should do exactly the same under Windows).
-   
+
    # all translations forgiven language should be in a separate directory.
    # Please use the standard abbreviation for the language names!
    mkdir <language>
@@ -44,10 +44,10 @@ A. First of all, you will need the GNU gettext tools (see the next question).
 
    # generate the .po file for the program itself
    # see `xgettext --help' for options, "-C" is important!
-   xgettext -C -n -k_ -kwxPLURAL:1,2 -kwxTRANSLATE -k_T -o internat.po ../internat.cpp
-   
-   # .po file for wxWidgets might be generated in the same way. An already 
-   # generated wxstd.pot as well as translations for some languages can be 
+   xgettext -C -n -k_ -kwxPLURAL:1,2 -kwxTRANSLATE -o internat.po ../internat.cpp
+
+   # .po file for wxWidgets might be generated in the same way. An already
+   # generated wxstd.pot as well as translations for some languages can be
    # found in the locale directory.
    cp ../../locale/<language>.po ./wxstd.pot
    - or -
@@ -64,7 +64,7 @@ A. First of all, you will need the GNU gettext tools (see the next question).
 
    # run the sample to test it
    cd ..
-   ./internat <language> 
+   ./internat <language>
 
 Q. How to get the gettext tools?
 A. For Unix, you should be able to get the source distribution of any GNU mirror