don't include strings that shouldn't be translated in gettext output

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

diff --git a/contrib/utils/wxrc/wxrc.cpp b/contrib/utils/wxrc/wxrc.cpp
index 46703402d987a5d19161b9678dcb07203f1eb87a..92be40659256c96e2e7882585324c294e5d304c2 100644 (file)
--- a/contrib/utils/wxrc/wxrc.cpp
+++ b/contrib/utils/wxrc/wxrc.cpp
@@ -819,7 +819,11 @@ wxArrayString XmlResApp::FindStrings(wxXmlNode *node)
             ))
             // ...and known to contain translatable string
         {
-            arr.Add(ConvertText(n->GetContent()));
+            if (!flagGettext ||
+                node->GetPropVal(_T("translate"), _T("1")) != _T("0"))
+            {
+                arr.Add(ConvertText(n->GetContent()));
+            }
         }
 
         // subnodes:

diff --git a/utils/wxrc/wxrc.cpp b/utils/wxrc/wxrc.cpp
index 46703402d987a5d19161b9678dcb07203f1eb87a..92be40659256c96e2e7882585324c294e5d304c2 100644 (file)
--- a/utils/wxrc/wxrc.cpp
+++ b/utils/wxrc/wxrc.cpp
@@ -819,7 +819,11 @@ wxArrayString XmlResApp::FindStrings(wxXmlNode *node)
             ))
             // ...and known to contain translatable string
         {
-            arr.Add(ConvertText(n->GetContent()));
+            if (!flagGettext ||
+                node->GetPropVal(_T("translate"), _T("1")) != _T("0"))
+            {
+                arr.Add(ConvertText(n->GetContent()));
+            }
         }
 
         // subnodes: