issue2550811 20% fix: jinja2 template engine now has an example how to use non-ascii unicode contents with a custom filter ('|u').

Author: bernhardreiter

CHANGES.txt

@@ -173,6 +173,10 @@ Fixed:
 - Help-Window now gets focus, this prevents the case that help doesn't
   work because an old help-window is below the main window.
   (Ralf Schlatterbeck)
+- issue2550811 20% fix: jinja2 template engine now has an example 
+  how to use non-ascii unicode contents with a custom filter ('|u'). 
+  See updates on http://www.roundup-tracker.org/cgi-bin/moin.cgi/Jinja2
+  (Bernhard Reiter)
 
 
 2013-07-06: 1.5.0

roundup/cgi/engine_jinja2.py

@@ -34,6 +34,8 @@
 import jinja2
 import gettext
 
+from types import MethodType
+
 # http://jinja.pocoo.org/docs/api/#loaders
 
 from roundup.cgi.templating import context, LoaderBase, TemplateBase
@@ -43,13 +45,22 @@ def __init__(self, dir):
         extensions = [
             'jinja2.ext.autoescape',
         ]
-        print "Jinja2 templates: ", dir 
+        print "Jinja2 templates: ", dir
         print "Extensions: ", extensions
         self._env = jinja2.Environment(
                         loader=jinja2.FileSystemLoader(dir),
                         extensions=extensions
                     )
 
+        # Adding a custom filter that can transform roundup's vars to unicode
+        # This is necessary because jinja2 can only deal with unicode objects
+        # and roundup uses utf-8 for the internal representation.
+        # The automatic conversion will assume 'ascii' and fail sometime.
+        # Analysed with roundup 1.5.0 and jinja 2.7.1. See issue2550811.
+        self._env.filters["u"] = lambda s: \
+            unicode(s(), "utf-8") if type(s) == MethodType \
+                                  else unicode(s, "utf-8")
+
     def check(self, tplname):
         #print tplname
         try:

share/roundup/templates/jinja2/html/issue.item.html

@@ -64,7 +64,7 @@ <h4>Messages</h4>
         </div>
       </div>
       <div class='row-fluid'>
-        <pre>{{ msg.content.hyperlinked() }}</pre>
+        <pre>{{ msg.content.hyperlinked()|u }}</pre>
       </div>
     {% endfor %}
   {% endif %}

share/roundup/templates/jinja2/html/msg.item.html

@@ -36,7 +36,7 @@
 
     <div class='row-fluid'>
       <h4>Content</h4>
-      <pre>{{ context.content.hyperlinked }}</pre>
+      <pre>{{ context.content.hyperlinked|u }}</pre>
     </div>
   {% endif %}