Merge tag 'upstream/7.0.1'

Upstream version 7.0.1

1 files changed, 0 insertions, 16 deletions

diff --git a/scripts/import_po.py b/scripts/import_po.py
index 7e99064..50afab9 100755
--- a/scripts/import_po.py
+++ b/scripts/import_po.py
@@ -25,22 +25,6 @@ MESSAGES = {""".splitlines()
     lines2 = []
     for entry in po:
         lines2.append('    "{0}": "{1}",'. format(entry.msgid, entry.msgstr))
-        ### BACKWARDS COMPATIBILITY PATCH START
-        ### TODO: remove in v7
-        if entry.msgid in ["Posted:", "Also available in:"]:
-            fid = entry.msgid
-            fid = fid.replace(':', '')
-            fstr = entry.msgstr
-            fstr = fstr.replace(':', '').replace('：', '')
-            lines2.append('    "{0}": "{1}",'. format(fid, fstr))
-        elif entry.msgid == 'More posts about %s':
-            fid = entry.msgid
-            fid = fid.replace(' %s', '')
-            fstr = entry.msgstr
-            fstr = fstr.replace(' %s', '').replace('%s', '')
-            lines2.append('    "{0}": "{1}",'. format(fid, fstr))
-        ### BACKWARDS COMPATIBILITY PATCH END
-        ### TODO: remove in v7
     lines.extend(sorted(lines2))
     lines.append("}\n")
     print("Generating:", outf)