Ticket #11240: 11240-test.diff

tests/i18n/commands/compilation.py

@@ -65 +65 @@
         from django.template import Template, Context
         call_command('compilemessages', locale=self.LOCALE, stdout=StringIO())
         with translation.override(self.LOCALE):
-            t = Template('{% load i18n %}{% trans "Looks like a str fmt spec %% o but shouldn\'t be interpreted as such" %}')
-            rendered = t.render(Context({}))
-            self.assertEqual(rendered, 'IT translation contains %% for the above string')
-
-            t = Template('{% load i18n %}{% trans "Completed 50%% of all the tasks" %}')
-            rendered = t.render(Context({}))
-            self.assertEqual(rendered, 'IT translation of Completed 50%% of all the tasks')
+            t1 = Template('{% load i18n %}{% trans "Looks like a str fmt spec % o but shouldn\'t be interpreted as such" %}')
+            t2 = Template('{% load i18n %}{% blocktrans %}Looks like a str fmt spec % o but shouldn\'t be interpreted as such{% endblocktrans %}')
+            for templ in (t1, t2):
+                rendered = templ.render(Context({}))
+                self.assertEqual(rendered, 'IT translation contains % for the above string')
+
+            t1 = Template('{% load i18n %}{% trans "Completed 50% of all the tasks" %}')
+            t2 = Template('{% load i18n %}{% blocktrans %}Completed 50% of all the tasks{% endblocktrans %}')
+            for templ in (t1, t2):
+                rendered = t.render(Context({}))
+                self.assertEqual(rendered, 'IT translation of Completed 50% of all the tasks')
 
 
 @override_settings(LOCALE_PATHS=(os.path.join(test_dir, 'locale'),))