From 432339a72c20f78abf1999892a39c71b5d853174 Mon Sep 17 00:00:00 2001
From: Julien Phalip <jphalip@gmail.com>
Date: Mon, 28 May 2012 11:03:34 -0700
Subject: [PATCH] Fixed #18393 -- Prevented blocktrans to crash when a variable
 name is badly formatted.

---
 django/templatetags/i18n.py                     |   2 +-
 .../i18n/other/locale/fr/LC_MESSAGES/django.mo  | Bin 454 -> 528 bytes
 .../i18n/other/locale/fr/LC_MESSAGES/django.po  |   6 ++++++
 tests/regressiontests/i18n/tests.py             |  16 +++++++++++++++-
 4 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/django/templatetags/i18n.py b/django/templatetags/i18n.py
index ca79f41edc0..e090781080d 100644
--- a/django/templatetags/i18n.py
+++ b/django/templatetags/i18n.py
@@ -148,7 +148,7 @@ class BlockTranslateNode(Node):
         context.pop()
         try:
             result = result % data
-        except KeyError:
+        except (KeyError, ValueError):
             with translation.override(None):
                 result = self.render(context)
         return result
diff --git a/tests/regressiontests/i18n/other/locale/fr/LC_MESSAGES/django.mo b/tests/regressiontests/i18n/other/locale/fr/LC_MESSAGES/django.mo
index f0a21797676abbe377b4637c57fe40fce594a5b2..478338bc886a2445f9a1c7004b49f4bac719d5fb 100644
GIT binary patch
delta 144
zcmX@cJb@+lo)F7a1|VPtVi_Pd0b*7l_5orLNC09nAWj5gkbDIYJ2NscfHX-0@l7Bb
zB>ovl0}%rg5W@iTL|<tR-%5r2l8n@%jlso?vcCCw3W=p9MX3sT`MC<I#U%==8U?9E
K#rb)fdJF*Q{ugfm

delta 89
zcmbQha*Wyco)F7a1|VPpVi_RT0b*7lwgF-g2moR+APxj#XGR8w3?MBD#A|?TAOh<H
OQV=jPR(j*qI7R@H3J941

diff --git a/tests/regressiontests/i18n/other/locale/fr/LC_MESSAGES/django.po b/tests/regressiontests/i18n/other/locale/fr/LC_MESSAGES/django.po
index 8e9b9e10344..dafb6139ae8 100644
--- a/tests/regressiontests/i18n/other/locale/fr/LC_MESSAGES/django.po
+++ b/tests/regressiontests/i18n/other/locale/fr/LC_MESSAGES/django.po
@@ -17,5 +17,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: template.html:3
+# Note: Intentional: variable name is translated.
 msgid "My name is %(person)s."
 msgstr "Mon nom est %(personne)s."
+
+#: template.html:3
+# Note: Intentional: the variable name is badly formatted (missing 's' at the end)
+msgid "My other name is %(person)s."
+msgstr "Mon autre nom est %(person)."
\ No newline at end of file
diff --git a/tests/regressiontests/i18n/tests.py b/tests/regressiontests/i18n/tests.py
index 5e95ee36ec8..78e41321af7 100644
--- a/tests/regressiontests/i18n/tests.py
+++ b/tests/regressiontests/i18n/tests.py
@@ -270,10 +270,11 @@ class TranslationTests(TestCase):
         self.assertEqual(to_language('sr_Lat'), 'sr-lat')
 
     @override_settings(LOCALE_PATHS=(os.path.join(here, 'other', 'locale'),))
-    def test_bad_placeholder(self):
+    def test_bad_placeholder_1(self):
         """
         Error in translation file should not crash template rendering
         (%(person)s is translated as %(personne)s in fr.po)
+        Refs #16516.
         """
         from django.template import Template, Context
         with translation.override('fr'):
@@ -281,6 +282,19 @@ class TranslationTests(TestCase):
             rendered = t.render(Context({'person': 'James'}))
             self.assertEqual(rendered, 'My name is James.')
 
+    @override_settings(LOCALE_PATHS=(os.path.join(here, 'other', 'locale'),))
+    def test_bad_placeholder_2(self):
+        """
+        Error in translation file should not crash template rendering
+        (%(person) misses a 's' in fr.po, causing the string formatting to fail)
+        Refs #18393.
+        """
+        from django.template import Template, Context
+        with translation.override('fr'):
+            t = Template('{% load i18n %}{% blocktrans %}My other name is {{ person }}.{% endblocktrans %}')
+            rendered = t.render(Context({'person': 'James'}))
+            self.assertEqual(rendered, 'My other name is James.')
+
 
 class FormattingTests(TestCase):