Merge lp:~dholbach/help-app/1430735-pt3 into lp:~ubuntu-touch-coreapps-drivers/help-app/trunk

[Daniel Holbach]

[Nicholas Skaggs (nskaggs)]

review: Approve

=== modified file 'edit-here/tests/test_translations.py'
--- edit-here/tests/test_translations.py	2015-03-06 15:47:49 +0000
+++ edit-here/tests/test_translations.py	2015-03-17 09:25:46 +0000
@@ -24,7 +24,9 @@
             for entry in pofile.find_in_msgid('{filename}'):
                 (link_msgid, link_msgstr) = \
                     pofile.find_link_in_markdown_message(entry)
-                self.assertNotIn(link_msgid, link_msgstr)
-                self.assertEqual(1, len(link_msgstr))
-                self.assertIn(po.langs[po_fn]['gettext_code'],
-                              link_msgstr[0])
+                if [doc for doc in self.translations.documents.docs
+                        if doc.endswith(link_msgid)]:
+                    self.assertNotIn(link_msgid, link_msgstr)
+                    self.assertEqual(1, len(link_msgstr))
+                    self.assertIn(po.langs[po_fn]['gettext_code'],
+                                  link_msgstr[0])

=== modified file 'edit-here/translations.py'
--- edit-here/translations.py	2015-03-17 09:25:46 +0000
+++ edit-here/translations.py	2015-03-17 09:25:46 +0000
@@ -212,7 +212,7 @@
         return True
 
     def find_link_in_markdown_message(self, entry):
-        link_regex = r'\[.+?\]\(\{filename\}(.+?)\)'
+        link_regex = r'\[.+?\]\(\{filename\}(.+?)\).*?'
         link_msgid = re.findall(link_regex, entry.msgid)[0]
         link_msgstr = list(re.findall(link_regex, entry.msgstr))
         return (link_msgid, link_msgstr)
@@ -221,13 +221,14 @@
         for entry in self.find_in_msgid('{filename}'):
             (link_msgid, link_msgstr) = \
                 self.find_link_in_markdown_message(entry)
-            translated_doc_fn = os.path.basename(
-                documents.translated_doc_fn(link_msgid, bcp47))
-            if not link_msgstr:
-                entry.msgstr = entry.msgid
-                link_msgstr = [link_msgid]
-            entry.msgstr = entry.msgstr.replace(link_msgstr[0],
-                                                translated_doc_fn)
+            if [doc for doc in documents.docs if doc.endswith(link_msgid)]:
+                translated_doc_fn = os.path.basename(
+                    documents.translated_doc_fn(link_msgid, bcp47))
+                if not link_msgstr:
+                    entry.msgstr = entry.msgid
+                    link_msgstr = [link_msgid]
+                entry.msgstr = entry.msgstr.replace(link_msgstr[0],
+                                                    translated_doc_fn)
         self.save()
 
     def find_translated_title_line(self, original_title):