Ticket #1919: truncate_words_preserving_whitespace.diff

django/utils/text.py

@@ -20 +20 @@
                   text.split(' ')
                  )
 
+whitespace_re = re.compile(r'(\s+)')
 def truncate_words(s, num):
     "Truncates a string after a certain number of words."
     length = int(num)
-    words = s.split()
-    if len(words) > length:
-        words = words[:length]
-        if not words[-1].endswith('...'):
-            words.append('...')
-    return ' '.join(words)
+    words = whitespace_re.split(s)
+    outwords = []
+    wordcount = 0
+    for word in words:
+        if word == '':
+            continue
+        if whitespace_re.search(word):
+            outwords.append(word)
+            continue # don't count towards length
+        if wordcount >= length:
+            break
+        outwords.append(word)
+        cutoff_word = word
+        wordcount += 1
+    else:
+        cutoff_word = None
+    if cutoff_word is not None and not cutoff_word.endswith('...'):
+        outwords.append('...')
+    return ''.join(outwords)
 
 def get_valid_filename(s):
     """