Fixed #1855: make gettext generates broken po file for definition lis…

…ts with classifier.

CHANGES

@@ -39,7 +39,11 @@ Bugs fixed
 * #1903: Fix strange id generation for glossary terms.
 * #1796, On py3, automated .mo building cause UnicodeDecodeError
 * Fix: ``make text`` will crush if a definition list item has more than 1 classifiers as:
+* #1796: On py3, automated .mo building cause UnicodeDecodeError
+* ``make text`` will crush if a definition list item has more than 1 classifiers as:
+* Fixed #1855: make gettext generates broken po file for definition lists with classifier.
   ``term : classifier1 : classifier2``.
+* #1855: make gettext generates broken po file for definition lists with classifier.
 
 
 Release 1.3.1 (released Mar 17, 2015)

sphinx/util/nodes.py

@@ -36,6 +36,20 @@ def write(self, text):
 
 
 def apply_source_workaround(node):
+    # workaround: nodes.term have wrong rawsource if classifier is specified.
+    # The behavior of docutils-0.11, 0.12 is:
+    # * when ``term text : classifier1 : classifier2`` is specified,
+    # * rawsource of term node will have: ``term text : classifier1 : classifier2``
+    # * rawsource of classifier node will be None
+    if isinstance(node, nodes.classifier) and not node.rawsource:
+        definition_list_item = node.parent
+        node.source = definition_list_item.source
+        node.line = definition_list_item.line - 1
+        node.rawsource = node.astext()  # set 'classifier1' (or 'classifier2')
+    if isinstance(node, nodes.term):
+        # overwrite: ``term : classifier1 : classifier2`` -> ``term text``
+        node.rawsource = node.astext()
+
     if node.source and node.rawsource:
         return
 

tests/roots/test-intl/definition_terms.po

@@ -30,3 +30,13 @@ msgstr "SOME OTHER TERM"
 
 msgid "The corresponding definition #2"
 msgstr "THE CORRESPONDING DEFINITION #2"
+
+msgid "Some term with"
+msgstr "SOME TERM WITH"
+
+msgid "classifier1"
+msgstr "CLASSIFIER1"
+
+msgid "classifier2"
+msgstr "CLASSIFIER2"
+

tests/roots/test-intl/definition_terms.txt

@@ -9,3 +9,6 @@ Some term
 Some other term
    The corresponding definition #2
 
+Some term with : classifier1  : classifier2
+   The corresponding definition
+

tests/test_intl.py

@@ -183,7 +183,10 @@ def test_text_builder(app, status, warning):
               u"\nSOME TERM"
               u"\n   THE CORRESPONDING DEFINITION\n"
               u"\nSOME OTHER TERM"
-              u"\n   THE CORRESPONDING DEFINITION #2\n")
+              u"\n   THE CORRESPONDING DEFINITION #2\n"
+              u"\nSOME TERM WITH : CLASSIFIER1 : CLASSIFIER2"
+              u"\n   THE CORRESPONDING DEFINITION\n"
+              )
     yield assert_equal, result, expect
 
     # --- glossary terms: regression test for #1090