[rkward-cvs] SF.net SVN: rkward-code:[4953] trunk/rkward

[tfry at users.sf.net]

Revision: 4953
          http://sourceforge.net/p/rkward/code/4953
Author:   tfry
Date:     2014-10-25 06:43:33 +0000 (Sat, 25 Oct 2014)
Log Message:
-----------
Some more tweaks to the extraction script

Modified Paths:
--------------
    trunk/rkward/ChangeLog
    trunk/rkward/scripts/extract_plugin_messages.py

Modified: trunk/rkward/ChangeLog
===================================================================
--- trunk/rkward/ChangeLog	2014-10-25 06:23:20 UTC (rev 4952)
+++ trunk/rkward/ChangeLog	2014-10-25 06:43:33 UTC (rev 4953)
@@ -6,6 +6,7 @@
     - Message extraction: Should we do this in R, using XiMpLe? That might allow us to give better context / comments
     - Don't forget to write documentation
     - What should be the policy regarding installing translations (80% criterion)
+    - Where should the extraction script look for i18n comments (before element, within element)?
 
 --- Version 0.6.2 - Oct-20-2014
 - In data editor, indicate NAs, explicitly

Modified: trunk/rkward/scripts/extract_plugin_messages.py
===================================================================
--- trunk/rkward/scripts/extract_plugin_messages.py	2014-10-25 06:23:20 UTC (rev 4952)
+++ trunk/rkward/scripts/extract_plugin_messages.py	2014-10-25 06:43:33 UTC (rev 4953)
@@ -38,10 +38,10 @@
 
 tag_stack = []
 def backtrace ():
-  ret = infile["infile"]
+  ret = "i18n: file: " + infile["infile"] + "\n"
+  ret += "i18n: ectx: "
   if (infile["caption"] != ""):
-    ret += " (" + infile["caption"] + ")"
-  ret += ":"
+    ret += "(" + infile["caption"] + ")"
   for tag in tag_stack:
     ret += " -> " + tag
   return (ret)
@@ -75,12 +75,14 @@
 
 # Look for an i18n comment in the given node, and write it out to the outfile
 def getI18nComment (node):
+  ret = "/* "
   for cn in node.childNodes:
     if cn.nodeType == cn.COMMENT_NODE:
-      comment = cn.data.strip ()
-      if (comment.startswith ("I18N:") or comment.startswith ("TRANSLATORS:")):
-        return "/*i18n: " + comment + "\nOrigin was " + backtrace () + " */\n"
-  return "/*i18n: Origin was " + backtrace () + " */\n"
+      comment = normalize (cn.data.strip ())
+      if (comment.lower ().startswith ("i18n:") or comment.lower ().startswith ("translators:")):
+        ret += "i18n: " + comment + "\n"
+  ret += backtrace () + " */\n"
+  return (ret)
 
 # Main workhorse: Look at given node and recurse into children
 def handleNode (node):
@@ -101,7 +103,7 @@
         outfile.write (getI18nComment (node))
         outfile.write ("i18n (" + quote (normalize (chunk)) + ");\n")
     elif (getText (node) != ""):
-      sys.stderr.write ("Found text content where none expected: " + backtrace () + "\n")
+      sys.stderr.write ("WARNING: Found text content where none expected: " + backtrace () + "\n")
   if (not ((node.nodeType == node.ELEMENT_NODE) and (node.tagName in text_containers))):
     # Don't go looking into the contents of text containers any further (may contain HTML markup)
     for child in node.childNodes:
@@ -136,9 +138,9 @@
   xmldoc = minidom.parse (filename)
   if (xmldoc.documentElement.hasAttribute ("po_id") and (xmldoc.documentElement.getAttribute ("po_id") != current_po_id)):
     toplevel_sources.append (filename)
-    sys.stderr.write ("Added " + filename + " to toplevel\n")
+    #sys.stderr.write ("Added " + filename + " to toplevel\n")
   else:
-    sys.stderr.write ("Recursing into " + filename + "\n")
+    #sys.stderr.write ("Recursing into " + filename + "\n")
     oldinfile = copy.deepcopy (infile)
     infile["infile"] = filename
     infile["file_prefix"] = xmldoc.documentElement.getAttribute ("base_prefix")
@@ -171,7 +173,7 @@
   if (po_id == ""):
     po_id = default_po
   if (po_id == ""):
-    sys.stderr.write ("No po_id attribute on file " + toplevel_sources[i] + " and no default specified\n")
+    sys.stderr.write ("WARNING: No po_id attribute on file " + toplevel_sources[i] + " and no default specified. Skipping.\n")
     continue
   initialize_pot_file (po_id)
   handleSubFile (toplevel_sources[i])  # Some duplication of parsing, instead of duplication of code
@@ -181,7 +183,8 @@
 # Run xgettext on all generated .pot.cpp files
 for potcpp in initialized_pot_files:
   potcppfile = os.path.join (outdir, potcpp + ".pot.cpp")
+  # NOTE: using --no-location, as that just adds meaningless references to the temporary .pot.cpp-file.
   os.system ("xgettext --from-code=UTF-8 -C -kde -ci18n -ki18n:1 -ki18nc:1c,2 -ki18np:1,2 -ki18ncp:1c,2,3 -ktr2i18n:1 " + 
-             "-kI18N_NOOP:1 -kI18N_NOOP2:1c,2 -kaliasLocale -kki18n:1 -kki18nc:1c,2 -kki18np:1,2 -kki18ncp:1c,2,3 " +
+             "-kI18N_NOOP:1 -kI18N_NOOP2:1c,2 -kaliasLocale -kki18n:1 -kki18nc:1c,2 -kki18np:1,2 -kki18ncp:1c,2,3 --no-location " +
              "--msgid-bugs-address=" + BUGADDR + " -o " + os.path.join (outdir, "rkward__" + potcpp + ".pot ") + potcppfile)
   os.remove (potcppfile)