# HG changeset patch
# User palgarvio
# Date 1181600844 0
# Node ID 5cff450b9ed57bfeb860a83e74b25cfc20fe0fa5
# Parent  21e3f63ee8a5b837aff54abeb5bd724500850453
Changed translator comments extraction behaviour in python source code. Match is now true only if the TAG is on the start of the comment. The TAG will also be stripped from the comment. Added a unittest which tests this.

diff --git a/babel/messages/extract.py b/babel/messages/extract.py
--- a/babel/messages/extract.py
+++ b/babel/messages/extract.py
@@ -293,14 +293,13 @@
         if funcname and tok == OP and value == '(':
             in_args = True
         elif tok == COMMENT:
-            if in_translator_comments is True:
-                translator_comments.append(value[1:].strip())
-                continue
             for comment_tag in comment_tags:
-                if comment_tag in value:
+                value = value[1:].strip()
+                if value.startswith(comment_tag) or in_translator_comments:
                     if in_translator_comments is not True:
                         in_translator_comments = True
-                    translator_comments.append(value[1:].strip())
+                    comment = value.lstrip(comment_tag).strip()
+                    translator_comments.append(comment)
         elif funcname and in_args:
             if tok == OP and value == ')':
                 in_args = in_translator_comments = False
diff --git a/babel/messages/tests/extract.py b/babel/messages/tests/extract.py
--- a/babel/messages/tests/extract.py
+++ b/babel/messages/tests/extract.py
@@ -30,9 +30,9 @@
 # NOTE: A translation comment
 msg = _(u'Foo Bar')
 """)
-        messages = list(extract.extract_python(buf, ('_',), ['NOTE'], {}))
+        messages = list(extract.extract_python(buf, ('_',), ['NOTE:'], {}))
         self.assertEqual('Foo Bar', messages[0][2])
-        self.assertEqual(['NOTE: A translation comment'], messages[0][3])
+        self.assertEqual(['A translation comment'], messages[0][3])
 
     def test_comment_tag_multiline(self):
         buf = StringIO("""
@@ -40,9 +40,9 @@
 # with a second line
 msg = _(u'Foo Bar')
 """)
-        messages = list(extract.extract_python(buf, ('_',), ['NOTE'], {}))
+        messages = list(extract.extract_python(buf, ('_',), ['NOTE:'], {}))
         self.assertEqual('Foo Bar', messages[0][2])
-        self.assertEqual(['NOTE: A translation comment', 'with a second line'],
+        self.assertEqual(['A translation comment', 'with a second line'],
                          messages[0][3])
         
     def test_translator_comments_with_previous_non_translator_comments(self):
@@ -53,12 +53,23 @@
 # with a second line
 msg = _(u'Foo Bar')
 """)
-        messages = list(extract.extract_python(buf, ('_',), ['NOTE'], {}))
+        messages = list(extract.extract_python(buf, ('_',), ['NOTE:'], {}))
         self.assertEqual('Foo Bar', messages[0][2])
-        self.assertEqual(['NOTE: A translation comment', 'with a second line'],
+        self.assertEqual(['A translation comment', 'with a second line'],
                          messages[0][3])
 
-
+    def test_comment_tags_not_on_start_of_comment(self):
+        buf = StringIO("""
+# This shouldn't be in the output
+# because it didn't start with a comment tag
+# do NOTE: this will no be a translation comment
+# NOTE: This one will be
+msg = _(u'Foo Bar')
+""")
+        messages = list(extract.extract_python(buf, ('_',), ['NOTE:'], {}))
+        self.assertEqual('Foo Bar', messages[0][2])
+        self.assertEqual(['This one will be'], messages[0][3])
+        
 def suite():
     suite = unittest.TestSuite()
     suite.addTest(doctest.DocTestSuite(extract))