From: Václav Slavík <vslavik@fastmail.fm>
Date: Sun, 29 Aug 2004 18:27:51 +0000 (+0000)
Subject: don't include strings that shouldn't be translated in gettext output
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/8da9d91cc488964f48de53cceb155c1f63dc374e

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 46703402d9..92be406592 100644
--- 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 46703402d9..92be406592 100644
--- 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: