Jinja use i18n and trim_blocks, plus get_template fix for footer

djmitche · Nov 1, 2009 · 58697a6 · 58697a6
1 parent 82e2d40
commit 58697a6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/buildbot/status/web/base.py b/buildbot/status/web/base.py
@@ -298,7 +298,7 @@ def path_to_root(self, request):
 
     def footer(self, req):
         status = self.getStatus(req)
-        template = req.templates.get_template("footer.html")
+        template = req.site.buildbot_service.templates.get_template("footer.html")
         return template.render(projectURL = status.getProjectURL(),
                                projectName = status.getProjectName(),
                                welcomeurl = self.path_to_root(req) + "index.html",

diff --git a/buildbot/status/web/baseweb.py b/buildbot/status/web/baseweb.py
@@ -484,7 +484,9 @@ def __init__(self, http_port=None, distrib_port=None, allowForce=False,
         root = os.path.join(os.getcwd(), 'templates')
         loader = jinja2.ChoiceLoader([jinja2.FileSystemLoader(root),
                                       default_loader])
-        self.templates = jinja2.Environment(loader=loader)
+        self.templates = jinja2.Environment(loader=loader,
+                                            extensions=['jinja2.ext.i18n'],
+                                            trim_blocks=True)
 
         # keep track of cached connections so we can break them when we shut
         # down. See ticket #102 for more details.