Ticket #1919: truncate_words_preserving_whites.diff

django/utils/text.py

@@ -35 +35 @@
     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)
+    return u''.join(words)
 truncate_words = allow_lazy(truncate_words, unicode)
 
 def truncate_html_words(s, num):