- applied patch that adds more i18n support to XRC handlers

- added ; to ends of lines in gettext output - needed for older gettext tools?

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

diff --git a/contrib/utils/wxrc/wxrc.cpp b/contrib/utils/wxrc/wxrc.cpp
index ca65863eaf6f3df907f51ab327edb81933847a0a..65a606db6e4135b4a0aa5ecdc266f278bc9a3efe 100644 (file)
--- a/contrib/utils/wxrc/wxrc.cpp
+++ b/contrib/utils/wxrc/wxrc.cpp
@@ -514,7 +514,7 @@ void XmlResApp::OutputGettext()
     else fout.Open(parOutput, _T("wt"));
     
     for (size_t i = 0; i < str.GetCount(); i++)
     else fout.Open(parOutput, _T("wt"));
     
     for (size_t i = 0; i < str.GetCount(); i++)

-        fout.Write(_T("_(\"") + str[i] + _T("\")\n"));
+        fout.Write(_T("_(\"") + str[i] + _T("\");\n"));

     
     if (!parOutput) fout.Detach();
 }
     
     if (!parOutput) fout.Detach();
 }


@@ -601,7 +601,8 @@ wxArrayString XmlResApp::FindStrings(wxXmlNode *node)
                 node/*not n!*/->GetName() == _T("longhelp") ||
                 node/*not n!*/->GetName() == _T("tooltip") ||
                 node/*not n!*/->GetName() == _T("htmlcode") ||
                 node/*not n!*/->GetName() == _T("longhelp") ||
                 node/*not n!*/->GetName() == _T("tooltip") ||
                 node/*not n!*/->GetName() == _T("htmlcode") ||

-                node/*not n!*/->GetName() == _T("title")
+                node/*not n!*/->GetName() == _T("title") ||
+                node/*not n!*/->GetName() == _T("item")

             ))
             // ...and known to contain translatable string
         {
             ))
             // ...and known to contain translatable string
         {

diff --git a/utils/wxrc/wxrc.cpp b/utils/wxrc/wxrc.cpp
index ca65863eaf6f3df907f51ab327edb81933847a0a..65a606db6e4135b4a0aa5ecdc266f278bc9a3efe 100644 (file)
--- a/utils/wxrc/wxrc.cpp
+++ b/utils/wxrc/wxrc.cpp
@@ -514,7 +514,7 @@ void XmlResApp::OutputGettext()
     else fout.Open(parOutput, _T("wt"));
     
     for (size_t i = 0; i < str.GetCount(); i++)
     else fout.Open(parOutput, _T("wt"));
     
     for (size_t i = 0; i < str.GetCount(); i++)

-        fout.Write(_T("_(\"") + str[i] + _T("\")\n"));
+        fout.Write(_T("_(\"") + str[i] + _T("\");\n"));

     
     if (!parOutput) fout.Detach();
 }
     
     if (!parOutput) fout.Detach();
 }


@@ -601,7 +601,8 @@ wxArrayString XmlResApp::FindStrings(wxXmlNode *node)
                 node/*not n!*/->GetName() == _T("longhelp") ||
                 node/*not n!*/->GetName() == _T("tooltip") ||
                 node/*not n!*/->GetName() == _T("htmlcode") ||
                 node/*not n!*/->GetName() == _T("longhelp") ||
                 node/*not n!*/->GetName() == _T("tooltip") ||
                 node/*not n!*/->GetName() == _T("htmlcode") ||

-                node/*not n!*/->GetName() == _T("title")
+                node/*not n!*/->GetName() == _T("title") ||
+                node/*not n!*/->GetName() == _T("item")

             ))
             // ...and known to contain translatable string
         {
             ))
             // ...and known to contain translatable string
         {