1 files changed, 54 insertions, 17 deletions

diff --git a/npybabel.py b/npybabel.py
index 81cd6abf60a..b2888cd4a2c 100755
--- a/npybabel.py
+++ b/npybabel.py
@@ -5,33 +5,50 @@ import sys
 from pkg_resources import load_entry_point
 import re
 import json
-import xml.etree.ElementTree as elt
+from lxml import etree as elt
+from babel.messages import extract
 
 if __name__ == '__main__':
     sys.exit(
         load_entry_point('Babel==0.9.6', 'console_scripts', 'pybabel')()
     )
-    
+
 XMLJS_EXPR = re.compile(r"""(?:\_t *\( *((?:"(?:[^"\\]|\\.)*")|(?:'(?:[^'\\]|\\.)*')) *\))""")
 
+TRANSLATION_FLAG_COMMENT = "openerp-web"
+
 def extract_xmljs(fileobj, keywords, comment_tags, options):
+    """Extract messages from Javascript code embedded into XML documents.
+    This complements the ``extract_javascript`` extractor which works
+    only on pure .js files, and the``extract_qweb`` extractor, which only
+    extracts XML text.
+
+    :param fileobj: the file-like object the messages should be extracted
+                    from
+    :param keywords: a list of keywords (i.e. function names) that should
+                     be recognized as translation functions
+    :param comment_tags: a list of translator tags to search for and
+                         include in the results
+    :param options: a dictionary of additional options (optional)
+    :return: an iterator over ``(lineno, funcname, message, comments)``
+             tuples
+    :rtype: ``iterator``
+    """
     content = fileobj.read()
     found = XMLJS_EXPR.finditer(content)
-    result = []
     index = 0
     line_nbr = 0
     for f in found:
-        mes = f.group(1)
-        mes = json.loads(mes)
+        msg = f.group(1)
+        msg = json.loads(msg)
         while index < f.start():
             if content[index] == "\n":
                 line_nbr += 1
             index += 1
-        result.append((line_nbr, None, mes, ""))
-    return result
+        yield (line_nbr, None, msg, [TRANSLATION_FLAG_COMMENT])
 
 def extract_qweb(fileobj, keywords, comment_tags, options):
-    """Extract messages from XXX files.
+    """Extract messages from qweb template files.
     :param fileobj: the file-like object the messages should be extracted
                     from
     :param keywords: a list of keywords (i.e. function names) that should
@@ -44,22 +61,42 @@ def extract_qweb(fileobj, keywords, comment_tags, options):
     :rtype: ``iterator``
     """
     result = []
-    def handle_text(str):
-        str = (str or "").strip()
-        if not str:
-            return
-        result.append((0, None, str, ""))
-    
+    def handle_text(text, lineno):
+        text = (text or "").strip()
+        if len(text) > 1: # Avoid mono-char tokens like ':' ',' etc.
+            result.append((lineno, None, text, [TRANSLATION_FLAG_COMMENT]))
+
     def iter_elements(current_element):
         for el in current_element:
             if "t-js" not in el.attrib and \
                     not ("t-jquery" in el.attrib and "t-operation" not in el.attrib) and \
                     not ("t-translation" in el.attrib and el.attrib["t-translation"].strip() == "off"):
-                handle_text(el.text)
+                handle_text(el.text, el.sourceline)
                 iter_elements(el)
-            handle_text(el.tail)
-    
+            handle_text(el.tail, el.sourceline)
+
     tree = elt.parse(fileobj)
     iter_elements(tree.getroot())
 
     return result
+
+def extract_javascript(fileobj, keywords, comment_tags, options):
+    """Extract messages from Javascript source files. This extractor delegates
+    to babel's buit-in javascript extractor, but adds a special comment
+    used as a flag to identify web translations. 
+
+    :param fileobj: the file-like object the messages should be extracted
+                    from
+    :param keywords: a list of keywords (i.e. function names) that should
+                     be recognized as translation functions
+    :param comment_tags: a list of translator tags to search for and
+                         include in the results
+    :param options: a dictionary of additional options (optional)
+    :return: an iterator over ``(lineno, funcname, message, comments)``
+             tuples
+    :rtype: ``iterator``
+    """
+    for (message_lineno, funcname, messages, comments) in \
+        extract.extract_javascript(fileobj, keywords, comment_tags, options):
+        comments.append(TRANSLATION_FLAG_COMMENT)
+        yield (message_lineno, funcname, messages, comments)