# HG changeset patch
# User Goffi <goffi@goffi.org>
# Date 1555222911 -7200
# Node ID 7dbdbd132649ee4450fb7db6b56200014c4dd08d
# Parent  d9491cb817268f6c6f474d71cd264b27e1c453f5
template (i18n): activate ext.i18n.trimmed policy, to have clean translation strings. Set minimal jinja2 version to 2.10

diff -r d9491cb81726 -r 7dbdbd132649 sat/tools/common/template.py
--- a/sat/tools/common/template.py	Wed Apr 10 22:15:29 2019 +0200
+++ b/sat/tools/common/template.py	Sun Apr 14 08:21:51 2019 +0200
@@ -383,8 +383,10 @@
         self._locale_str = C.DEFAULT_LOCALE
         self._locale = Locale.parse(self._locale_str)
         self.installTranslations()
+
         # we want to have access to SàT constants in templates
         self.env.globals[u"C"] = C
+
         # custom filters
         self.env.filters[u"next_gidx"] = self._next_gidx
         self.env.filters[u"cur_gidx"] = self._cur_gidx
@@ -401,6 +403,9 @@
         self.env.tests[u"in_the_past"] = self._in_the_past
         self.icons_path = os.path.join(host.media_dir, u"fonts/fontello/svg")
 
+        # policies
+        self.env.policies[u"ext.i18n.trimmed"] = True
+
     def getFrontURL(self, template_data, path=None):
         """Give front URL (i.e. URL seen by end-user) of a path
 
diff -r d9491cb81726 -r 7dbdbd132649 setup.py
--- a/setup.py	Wed Apr 10 22:15:29 2019 +0200
+++ b/setup.py	Sun Apr 14 08:21:51 2019 +0200
@@ -27,7 +27,7 @@
     'babel',
     'dbus-python',
     'html2text',
-    'jinja2',
+    'jinja2>=2.10',
     'langid',
     'lxml >= 3.1.0',
     'markdown >= 3.0',