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

[Daniel Holbach]

[Nicholas Skaggs (nskaggs)]

review: Approve

=== modified file 'edit-here/translations.py'
--- edit-here/translations.py	2015-03-17 09:16:29 +0000
+++ edit-here/translations.py	2015-03-17 09:16:29 +0000
@@ -29,7 +29,7 @@
 except:
     require('python3-markdown')
 
-from pelicanconf import PATH, MD_EXTENSIONS, META_TAGS
+from pelicanconf import PATH, MD_EXTENSIONS, META_TAGS, HIDE_FROM_POT
 
 # This defines how complete we expect translations to be before we
 # generate HTML from them. Needs to be string.
@@ -149,6 +149,39 @@
                 results += [entry]
         return results
 
+    def hide_attr_list_statements(self):
+        entries = []
+        for statement in HIDE_FROM_POT:
+            entries.extend(self.find_in_msgid(statement))
+        statements = r'|'.join(HIDE_FROM_POT)
+        for entry in entries:
+            matches = re.findall(r'(.*?)\s*?(%s)\s*?' % statements,
+                                 entry.msgid)
+            # [('How do I update my system?', '!!T')]
+            if len(matches) == 1 and len(matches[0]) == 2:
+                entry.msgid = matches[0][0]
+                entry.comment = matches[0][1]
+            if matches[0][1] in entry.msgstr:
+                entry.msgstr = entry.msgstr.replace(' %s' % matches[0][1], '')
+        self.save()
+
+    def readd_attr_list_statements(self):
+        entries = []
+        for entry_group in [self.pofile.translated_entries(),
+                            self.pofile.fuzzy_entries(),
+                            self.pofile.untranslated_entries()]:
+            for entry in entry_group:
+                for statement in HIDE_FROM_POT:
+                    if statement in entry.comment:
+                        entries += [entry]
+        for entry in entries:
+            if not entry.msgid.endswith(entry.comment):
+                entry.msgid += ' %s' % entry.comment
+            if entry.msgstr and not entry.msgstr.endswith(entry.comment):
+                entry.msgstr += ' %s' % entry.comment
+            entry.comment = ''
+        self.save()
+
     def safeguard_meta_tags(self):
         for tag in META_TAGS:
             for entry in self.find_in_msgid(tag):
@@ -248,11 +281,13 @@
             return False
         if not self.pot_file_ob.replace_title_lines():
             return False
+        self.pot_file_ob.hide_attr_list_statements()
         for po_fn in self.langs:
             self.load_pofile(po_fn)
             self.langs[po_fn]['pofile'].merge(self.pot_file_ob.pofile)
             if not self.langs[po_fn]['pofile'].replace_title_lines():
                 return False
+            self.langs[po_fn]['pofile'].hide_attr_list_statements()
         return True
 
     # we generate a fake translation for en-US which is going to be
@@ -306,6 +341,7 @@
 
     def write_translated_markdown(self, po, po4a):
         for po_fn in po.langs:
+            po.langs[po_fn]['pofile'].readd_attr_list_statements()
             for doc_fn in self.docs:
                 output = self._call_po4a_translate(doc_fn, po_fn, po4a)
                 title_line = output.split('\n')[0].split('Title: ')[1]
@@ -322,6 +358,7 @@
                     os.makedirs(os.path.dirname(new_path))
                 with open(new_path, 'w', encoding='utf-8') as f:
                     f.write(text)
+            po.langs[po_fn]['pofile'].hide_attr_list_statements()
 
 
 class Translations(object):