Ticket #1919: 1919-1.diff

django/utils/text.py

@@ -36 +36 @@
     return u''.join(_generator())
 wrap = allow_lazy(wrap, unicode)
 
+word_re = re.compile(r'((?:\*|_)*\w+(?:\*|_)*)',re.UNICODE)
 def truncate_words(s, num):
-    "Truncates a string after a certain number of words."
+    "Truncates a string after a certain number of words, preserving whites."
     s = force_unicode(s)
     length = int(num)
-    words = s.split()
-    if len(words) > length:
-        words = words[:length]
+    words = word_re.split(s,length)
+    if len(words) > (2*length):
+        words = words[:-1]
         if not words[-1].endswith('...'):
-            words.append('...')
-    return u' '.join(words)
+            words.append(' ...')
+    return u''.join(words)
 truncate_words = allow_lazy(truncate_words, unicode)
 
 def truncate_html_words(s, num):

tests/regressiontests/templates/tests.py

@@ -781 +781 @@
             'timeuntil04' : ('{{ a|timeuntil:b }}', {'a':NOW - timedelta(days=1), 'b':NOW - timedelta(days=2)}, '1 day'),
             'timeuntil05' : ('{{ a|timeuntil:b }}', {'a':NOW - timedelta(days=2), 'b':NOW - timedelta(days=2, minutes=1)}, '1 minute'),
 
+            # TRUNCATEWORDS TAG ################################################
+            # Ensure that newlines are preserved
+            'truncatewords01': ('{{ var|truncatewords:4 }}',
+                                {'var': """
+                                        Hello,
+                                        boys.
+                                        How
+                                        are
+                                        you
+                                        gentlemen.
+                                        """},
+                                        """
+                                        Hello,
+                                        boys.
+                                        How
+                                        are ..."""
+                                        ),
+
             ### URL TAG ########################################################
             # Successes
             'url01' : ('{% url regressiontests.templates.views.client client.id %}', {'client': {'id': 1}}, '/url_tag/client/1/'),