Ticket #4655: truncate_words.2.patch

django/utils/text.py

@@ -34 +34 @@
 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)
+    lines = s.splitlines (True)
+    result = []
+    count = 0
+    for line in lines:
+        words = line.split()
+        senLen = len (words)
+        if (count + senLen > length):
+            result.extend (words[0:(length - count)])
+            if not result[-1].endswith('...'):
+                result.append('...')
+                return ' '.join (result)
+        result.append (line)
+        count = count + senLen
+    return ' '.join (result)
 
 def truncate_html_words(s, num):
     """