From c8b7a961ff4ec4a57b2388c15277f55fc41b4deb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Fri, 24 Nov 2000 17:20:20 +0000 Subject: [PATCH] added i18n support to the compiler git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8809 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/utils/wxrc/wxrc.cpp | 108 ++++++++++++++++++++++++++++++++++-- utils/wxrc/wxrc.cpp | 108 ++++++++++++++++++++++++++++++++++-- 2 files changed, 208 insertions(+), 8 deletions(-) diff --git a/contrib/utils/wxrc/wxrc.cpp b/contrib/utils/wxrc/wxrc.cpp index eacf6222b2..f36768d150 100644 --- a/contrib/utils/wxrc/wxrc.cpp +++ b/contrib/utils/wxrc/wxrc.cpp @@ -62,8 +62,12 @@ private: void DeleteTempFiles(const wxArrayString& flist); void MakePackageZIP(const wxArrayString& flist); void MakePackageCPP(const wxArrayString& flist); + + void OutputGettext(); + wxArrayString FindStrings(); + wxArrayString FindStrings(wxXmlNode *node); - bool flagVerbose, flagCPP, flagCompress; + bool flagVerbose, flagCPP, flagCompress, flagGettext; wxString parOutput, parFuncname, parOutputPath; wxArrayString parFiles; int retCode; @@ -79,14 +83,16 @@ int XmlResApp::OnRun() { static const wxCmdLineEntryDesc cmdLineDesc[] = { + { wxCMD_LINE_SWITCH, "h", "help", "show help message" }, { wxCMD_LINE_SWITCH, "v", "verbose", "be verbose" }, { wxCMD_LINE_SWITCH, "c", "cpp-code", "output C++ source rather than .rsc file" }, { wxCMD_LINE_SWITCH, "u", "uncompressed", "do not compress .xml files (C++ only)" }, + { wxCMD_LINE_SWITCH, "g", "gettext", "output .po catalog (to stdout or file if -o used)" }, { wxCMD_LINE_OPTION, "n", "function", "C++ function name (with -c) [InitXmlResource]" }, { wxCMD_LINE_OPTION, "o", "output", "output file [resource.xrs/cpp]" }, { wxCMD_LINE_OPTION, "l", "list-of-handlers", "output list of neccessary handlers to this file" }, - { wxCMD_LINE_PARAM, NULL, NULL, "input file", + { wxCMD_LINE_PARAM, NULL, NULL, "input file(s)", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_MULTIPLE }, { wxCMD_LINE_NONE } @@ -105,7 +111,10 @@ int XmlResApp::OnRun() case 0: retCode = 0; ParseParams(parser); - CompileRes(); + if (flagGettext) + OutputGettext(); + else + CompileRes(); #if wxUSE_GUI return FALSE; #else @@ -128,12 +137,18 @@ int XmlResApp::OnRun() void XmlResApp::ParseParams(const wxCmdLineParser& cmdline) { + flagGettext = cmdline.Found("g"); flagVerbose = cmdline.Found("v"); flagCPP = cmdline.Found("c"); flagCompress = flagCPP && !cmdline.Found("u"); if (!cmdline.Found("o", &parOutput)) - parOutput = flagCPP ? "resource.cpp" : "resource.xrs"; + { + if (flagGettext) + parOutput = wxEmptyString; + else + parOutput = flagCPP ? "resource.cpp" : "resource.xrs"; + } parOutputPath = wxPathOnly(parOutput); if (!parOutputPath) parOutputPath = "."; @@ -379,3 +394,88 @@ void " + parFuncname + "()\n\ } + + + +void XmlResApp::OutputGettext() +{ + wxArrayString str = FindStrings(); + + wxFFile fout; + if (!parOutput) fout.Attach(stdout); + else fout.Open(parOutput, _T("wt")); + + for (size_t i = 0; i < str.GetCount(); i++) + fout.Write(_T("msgid \"") + str[i] + _T("\"\nmsgstr \"\"\n\n")); + + if (!parOutput) fout.Detach(); +} + + + +wxArrayString XmlResApp::FindStrings() +{ + wxArrayString arr, a2; + + for (size_t i = 0; i < parFiles.Count(); i++) + { + if (flagVerbose) + wxPrintf("processing " + parFiles[i] + "...\n"); + + wxXmlDocument doc; + if (!doc.Load(parFiles[i])) + { + wxLogError("Error parsing file " + parFiles[i]); + retCode = 1; + continue; + } + a2 = FindStrings(doc.GetRoot()); + WX_APPEND_ARRAY(arr, a2); + } + + return arr; +} + + + +wxArrayString XmlResApp::FindStrings(wxXmlNode *node) +{ + wxArrayString arr; + + wxXmlNode *n = node; + if (n == NULL) return arr; + n = n->GetChildren(); + + while (n) + { + if ((node->GetType() == wxXML_ELEMENT_NODE) && + // parent is an element, i.e. has subnodes... + (n->GetType() == wxXML_TEXT_NODE || + n->GetType() == wxXML_CDATA_SECTION_NODE) && + // ...it is textnode... + ( + node/*not n!*/->GetName() == _T("label") || + (node/*not n!*/->GetName() == _T("value") && + !n->GetContent().IsNumber()) || + node/*not n!*/->GetName() == _T("help") || + node/*not n!*/->GetName() == _T("longhelp") || + node/*not n!*/->GetName() == _T("tooltip") || + node/*not n!*/->GetName() == _T("htmlcode") || + node/*not n!*/->GetName() == _T("title") + )) + // ...and known to contain filename + { + arr.Add(n->GetContent()); + } + + // subnodes: + if (n->GetType() == wxXML_ELEMENT_NODE) + { + wxArrayString a2 = FindStrings(n); + WX_APPEND_ARRAY(arr, a2); + } + + n = n->GetNext(); + } + return arr; +} diff --git a/utils/wxrc/wxrc.cpp b/utils/wxrc/wxrc.cpp index eacf6222b2..f36768d150 100644 --- a/utils/wxrc/wxrc.cpp +++ b/utils/wxrc/wxrc.cpp @@ -62,8 +62,12 @@ private: void DeleteTempFiles(const wxArrayString& flist); void MakePackageZIP(const wxArrayString& flist); void MakePackageCPP(const wxArrayString& flist); + + void OutputGettext(); + wxArrayString FindStrings(); + wxArrayString FindStrings(wxXmlNode *node); - bool flagVerbose, flagCPP, flagCompress; + bool flagVerbose, flagCPP, flagCompress, flagGettext; wxString parOutput, parFuncname, parOutputPath; wxArrayString parFiles; int retCode; @@ -79,14 +83,16 @@ int XmlResApp::OnRun() { static const wxCmdLineEntryDesc cmdLineDesc[] = { + { wxCMD_LINE_SWITCH, "h", "help", "show help message" }, { wxCMD_LINE_SWITCH, "v", "verbose", "be verbose" }, { wxCMD_LINE_SWITCH, "c", "cpp-code", "output C++ source rather than .rsc file" }, { wxCMD_LINE_SWITCH, "u", "uncompressed", "do not compress .xml files (C++ only)" }, + { wxCMD_LINE_SWITCH, "g", "gettext", "output .po catalog (to stdout or file if -o used)" }, { wxCMD_LINE_OPTION, "n", "function", "C++ function name (with -c) [InitXmlResource]" }, { wxCMD_LINE_OPTION, "o", "output", "output file [resource.xrs/cpp]" }, { wxCMD_LINE_OPTION, "l", "list-of-handlers", "output list of neccessary handlers to this file" }, - { wxCMD_LINE_PARAM, NULL, NULL, "input file", + { wxCMD_LINE_PARAM, NULL, NULL, "input file(s)", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_MULTIPLE }, { wxCMD_LINE_NONE } @@ -105,7 +111,10 @@ int XmlResApp::OnRun() case 0: retCode = 0; ParseParams(parser); - CompileRes(); + if (flagGettext) + OutputGettext(); + else + CompileRes(); #if wxUSE_GUI return FALSE; #else @@ -128,12 +137,18 @@ int XmlResApp::OnRun() void XmlResApp::ParseParams(const wxCmdLineParser& cmdline) { + flagGettext = cmdline.Found("g"); flagVerbose = cmdline.Found("v"); flagCPP = cmdline.Found("c"); flagCompress = flagCPP && !cmdline.Found("u"); if (!cmdline.Found("o", &parOutput)) - parOutput = flagCPP ? "resource.cpp" : "resource.xrs"; + { + if (flagGettext) + parOutput = wxEmptyString; + else + parOutput = flagCPP ? "resource.cpp" : "resource.xrs"; + } parOutputPath = wxPathOnly(parOutput); if (!parOutputPath) parOutputPath = "."; @@ -379,3 +394,88 @@ void " + parFuncname + "()\n\ } + + + +void XmlResApp::OutputGettext() +{ + wxArrayString str = FindStrings(); + + wxFFile fout; + if (!parOutput) fout.Attach(stdout); + else fout.Open(parOutput, _T("wt")); + + for (size_t i = 0; i < str.GetCount(); i++) + fout.Write(_T("msgid \"") + str[i] + _T("\"\nmsgstr \"\"\n\n")); + + if (!parOutput) fout.Detach(); +} + + + +wxArrayString XmlResApp::FindStrings() +{ + wxArrayString arr, a2; + + for (size_t i = 0; i < parFiles.Count(); i++) + { + if (flagVerbose) + wxPrintf("processing " + parFiles[i] + "...\n"); + + wxXmlDocument doc; + if (!doc.Load(parFiles[i])) + { + wxLogError("Error parsing file " + parFiles[i]); + retCode = 1; + continue; + } + a2 = FindStrings(doc.GetRoot()); + WX_APPEND_ARRAY(arr, a2); + } + + return arr; +} + + + +wxArrayString XmlResApp::FindStrings(wxXmlNode *node) +{ + wxArrayString arr; + + wxXmlNode *n = node; + if (n == NULL) return arr; + n = n->GetChildren(); + + while (n) + { + if ((node->GetType() == wxXML_ELEMENT_NODE) && + // parent is an element, i.e. has subnodes... + (n->GetType() == wxXML_TEXT_NODE || + n->GetType() == wxXML_CDATA_SECTION_NODE) && + // ...it is textnode... + ( + node/*not n!*/->GetName() == _T("label") || + (node/*not n!*/->GetName() == _T("value") && + !n->GetContent().IsNumber()) || + node/*not n!*/->GetName() == _T("help") || + node/*not n!*/->GetName() == _T("longhelp") || + node/*not n!*/->GetName() == _T("tooltip") || + node/*not n!*/->GetName() == _T("htmlcode") || + node/*not n!*/->GetName() == _T("title") + )) + // ...and known to contain filename + { + arr.Add(n->GetContent()); + } + + // subnodes: + if (n->GetType() == wxXML_ELEMENT_NODE) + { + wxArrayString a2 = FindStrings(n); + WX_APPEND_ARRAY(arr, a2); + } + + n = n->GetNext(); + } + return arr; +}