Ticket #7027: fix_tag_translation.diff

django/utils/text.py

@@ -196 +196 @@
-    return str(ustring_re.sub(fix, s))
-javascript_quote = allow_lazy(javascript_quote, unicode)
-
-'("(?:[^"\\\\]*(?:\\\\.[^"\\\\]*)*)"|\'(?:[^\'\\\\]*(?:\\\\.[^\'\\\\]*)*)\'|[^\\s]+)'
+r"""((?:_\()?"(?:[^"\\]*(?:\\.[^"\\]*)*)"\)?|(?:_\()?'(?:[^'\\]*(?:\\.[^'\\]*)*)'\)?|[^\s]+)"""
-def smart_split(text):
-    r"""
-    Generator that splits a string by spaces, leaving quoted phrases together.
-    Supports both single and double quotes, and supports escaping quotes with
-    backslashes. In the output, strings will keep their initial and trailing
-
+ Also, gettext markers '_(', ')' are preserved.
-
-    >>> list(smart_split(r'This is "a person\'s" test.'))
-    [u'This', u'is', u'"a person\\\'s"', u'test.']
@@ -210 +210 @@
-        [u'Another', u"'person's'", u'test.']
-        >>> list(smart_split(r'A "\"funky\" style" test.')) 
-        [u'A', u'""funky" style"', u'test.']
+    >>> list(smart_split(' _("my quoted string") '))
+    [u'_("my quoted string")']
+    >>> list(smart_split(" _('my quoted string') "))
+    [u"_('my quoted string')"]
-    """
-    text = force_unicode(text)
-    for bit in smart_split_re.finditer(text):
-        bit = bit.group(0)
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        else:
-            yield bit
-smart_split = allow_lazy(smart_split, unicode)

tests/regressiontests/text/tests.py

@@ -15 +15 @@
-[u'"a', u"'one"]
->>> print list(smart_split(r'''all friends' tests'''))[1]
-friends'
+>>> list(smart_split(' _("my quoted string") '))
+[u'_("my quoted string")']
+>>> list(smart_split(" _('my quoted string') "))
+[u"_('my quoted string')"]
+>>> print list(smart_split(" _('my \"quoted\" string') "))[0]
+_('my "quoted" string')
-
-### urlquote #############################################################
->>> from django.utils.http import urlquote, urlquote_plus