Permalink
Browse files

We will have a 2.5.1 release

--HG--
branch : trunk
  • Loading branch information...
mitsuhiko committed Jul 1, 2010
1 parent 850629f commit 02ea18a29d171767fc3f224d9e8e5303977f80f2
Showing with 12 additions and 5 deletions.
  1. +3 −3 CHANGES
  2. +0 −1 jinja2/_speedups.c
  3. +9 −1 jinja2/testsuite/ext.py
View
@@ -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
View
@@ -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"
View
@@ -51,7 +51,9 @@
'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 @@ def test_num_called_num(self):
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):

0 comments on commit 02ea18a

Please sign in to comment.