From b7508896fbe19ec2cdeb81565cd587091b6b68d0 Mon Sep 17 00:00:00 2001
From: Doug Beck <doug@douglasbeck.com>
Date: Wed, 15 Apr 2015 17:01:11 -0400
Subject: Fixed #24257 -- Corrected i18n handling of percent signs.

Refactored tests to use a sample project.

Updated extraction:
* Removed special handling of single percent signs.
* When extracting messages from template text, doubled all percent signs
  so they are not interpreted by gettext as string format flags. All
  strings extracted by gettext, if containing a percent sign, will now
  be labeled "#, python-format".

Updated translation:
* Used "%%" for "%" in template text before calling gettext.
* Updated {% trans %} rendering to restore "%" from "%%".
---
 django/utils/translation/trans_real.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'django/utils')

diff --git a/django/utils/translation/trans_real.py b/django/utils/translation/trans_real.py
index 8a2527022d..e05b5613a5 100644
--- a/django/utils/translation/trans_real.py
+++ b/django/utils/translation/trans_real.py
@@ -534,7 +534,6 @@ block_re = re.compile(r"""^\s*blocktrans(\s+.*context\s+((?:"[^"]*?")|(?:'[^']*?
 endblock_re = re.compile(r"""^\s*endblocktrans$""")
 plural_re = re.compile(r"""^\s*plural$""")
 constant_re = re.compile(r"""_\(((?:".*?")|(?:'.*?'))\)""")
-one_percent_re = re.compile(r"""(?<!%)%(?!%)""")
 
 
 def templatize(src, origin=None):
@@ -631,7 +630,7 @@ def templatize(src, origin=None):
                 else:
                     singular.append('%%(%s)s' % t.contents)
             elif t.token_type == TOKEN_TEXT:
-                contents = one_percent_re.sub('%%', t.contents)
+                contents = t.contents.replace('%', '%%')
                 if inplural:
                     plural.append(contents)
                 else:
@@ -667,7 +666,7 @@ def templatize(src, origin=None):
                         g = g.strip('"')
                     elif g[0] == "'":
                         g = g.strip("'")
-                    g = one_percent_re.sub('%%', g)
+                    g = g.replace('%', '%%')
                     if imatch.group(2):
                         # A context is provided
                         context_match = context_re.match(imatch.group(2))
-- 
cgit v1.3