From 976db274ee427e002615efdd40cdaf7c95bf1272 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Matouillot?= <a.matouillot@gmail.com>
Date: Sat, 14 Sep 2013 21:26:57 +0200
Subject: [PATCH] Fix escape for Label with jinja template

---
 tests/test_widgets.py           | 13 +++++++++++++
 tw2/forms/templates/label.jinja |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/tests/test_widgets.py b/tests/test_widgets.py
index 57267ec..e838182 100644
--- a/tests/test_widgets.py
+++ b/tests/test_widgets.py
@@ -653,6 +653,19 @@ class TestLabel(WidgetTest):
     attrs = {'text': 'something'}
     expected = """<span>something</span>"""
 
+    def test_escape(self):
+        attrs = {'text': 'line 1<br />line 2'}
+        expected = '<span>line 1&lt;br /&gt;line 2</span>'
+        for engine in self._get_all_possible_engines():
+            yield (self._check_rendering_vs_expected,
+                engine, attrs, self.params, expected)
+
+        attrs = {'text': 'line 1<br />line 2', 'escape': False}
+        expected = '<span>line 1<br />line 2</span>'
+        for engine in self._get_all_possible_engines():
+            yield (self._check_rendering_vs_expected,
+                engine, attrs, self.params, expected)
+
 
 class TestForm(WidgetTest):
 
diff --git a/tw2/forms/templates/label.jinja b/tw2/forms/templates/label.jinja
index 4a1658f..396db6b 100644
--- a/tw2/forms/templates/label.jinja
+++ b/tw2/forms/templates/label.jinja
@@ -1 +1 @@
-<span {{ w.attrs|xmlattr }}>{{ w.text }}</span>
\ No newline at end of file
+<span {{ w.attrs|xmlattr }}>{% if w.escape %}{{ w.text|string }}{% else %}{{ w.text|safe }}{% endif %}</span>
\ No newline at end of file