Issue 2323 - Resolve links automatically in templates as well

cms/converters.py

 # coding: utf-8
 
 # This file is part of the Adblock Plus web scripts,
 # Copyright (C) 2006-2015 Eyeo GmbH
 #
 # Adblock Plus is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
 # published by the Free Software Foundation.
 #
 # Adblock Plus is distributed in the hope that it will be useful,
@@ skipping 312 matching lines @@
     self._env = jinja2.Environment(loader=self._SourceLoader(self._params["source"]), autoescape=True)
     self._env.filters.update(filters)
     self._env.globals.update(globals)
 
   def get_html(self, source):
     template = self._env.from_string(source)
     module = template.make_module(self._params)
     for key, value in module.__dict__.iteritems():
       if not key.startswith("_"):
         self._params[key] = value
-    return unicode(module)
+
+    result = unicode(module)

[Sebastian Noack, 2015/04/20 11:47:38]

Nit: I'd rather chain the function calls instead introducing a bogus return
value variable:

  return self.process_links(unicode(module))

However, it's not important. So LGTM with or without this nit addressed.

[Wladimir Palant, 2015/04/20 11:50:37]

I'd rather keep it this way - the other generators are also built this way, with
multiple conversion steps.

+    result = self.process_links(result)
+    return result
 
   def translate(self, default, name, comment=None):
     # Note: We currently ignore the comment, it is only relevant when
     # generating the master translation.
     localedata = self._params["localedata"]
     return jinja2.Markup(self.localize_string(name, default, localedata, html_escapes))
 
   def get_string(self, name, page):
     localedata = self._params["source"].read_locale(self._params["locale"], page)
     default = localedata[name]
@@ skipping 35 matching lines @@
         stack.pop()
       stack[-1]["subitems"].append(item)
       stack.append(item)
     return structured
 
 converters = {
   "html": RawConverter,
   "md": MarkdownConverter,
   "tmpl": TemplateConverter,
 }