We will have a 2.5.1 release

--HG--
branch : trunk

diff --git a/CHANGES b/CHANGES
index 5f2d6c66620e6b35eaa338046688eb3f339ebdf6..133a913d9cbbae4eabd989908afa27596a2ad043 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,9 +1,9 @@
 Jinja2 Changelog
 ================
 
-Version 2.6
------------
-(codename to be selected, release date to be announced)
+Version 2.5.1
+-------------
+(bugfix release, release date to be announced)
 
 - StopIteration exceptions raised by functions called from templates
   are now intercepted and converted to undefineds.  This solves a

diff --git a/jinja2/_speedups.c b/jinja2/_speedups.c
index 3b2d71cfc33339d1723da1b1f0adbccfb382fff7..5c7ff2d920921fd2a0a8e252cbb235b8fbb76eeb 100644 (file)
--- a/jinja2/_speedups.c
+++ b/jinja2/_speedups.c
@@ -202,7 +202,6 @@ tb_set_next(PyObject *self, PyObject *args)
        return Py_None;
 }
 
-
 static PyMethodDef module_methods[] = {
        {"escape", (PyCFunction)escape, METH_O,
         "escape(s) -> markup\n\n"

diff --git a/jinja2/testsuite/ext.py b/jinja2/testsuite/ext.py
index 338308c8ea0bbf0de69b28ac0e599bd6d3e7037b..f252d67bb625090c0ac4d0d7995f44974a2ddb15 100644 (file)
--- a/jinja2/testsuite/ext.py
+++ b/jinja2/testsuite/ext.py
@@ -51,7 +51,9 @@ newstyle_i18n_templates = {
     'stringformat.html': '{{ _("User: %(num)s", num=user_count) }}',
     'ngettext.html': '{{ ngettext("%(num)s apple", "%(num)s apples", apples) }}',
     'ngettext_long.html': '{% trans num=apples %}{{ num }} apple{% pluralize %}'
-                          '{{ num }} apples{% endtrans %}'
+                          '{{ num }} apples{% endtrans %}',
+    'transvars1.html': '{% trans %}User: {{ num }}{% endtrans %}',
+    'transvars2.html': '{% trans num=count %}User: {{ num }}{% endtrans %}'
 }
 
 
@@ -345,6 +347,12 @@ class NewstyleInternationalizationTestCase(JinjaTestCase):
         assert re.search(r"l_ngettext, u?'\%\(num\)s apple', u?'\%\(num\)s "
                          r"apples', 3", source) is not None
 
+    def test_trans_vars(self):
+        t1 = newstyle_i18n_env.get_template('transvars1.html')
+        t2 = newstyle_i18n_env.get_template('transvars2.html')
+        assert t1.render(num=1, LANGUAGE='de') == 'Benutzer: 1'
+        assert t2.render(count=23, LANGUAGE='de') == 'Benutzer: 23'
+
 
 class AutoEscapeTestCase(JinjaTestCase):