Ticket #6799: ellipsis.diff

django/utils/text.py

@@ -36 +36 @@
     return u''.join(_generator())
 wrap = allow_lazy(wrap, unicode)
 
-def truncate_words(s, num):
+def truncate_words(s, num, end_text='...'):
     "Truncates a string after a certain number of words."
     s = force_unicode(s)
     length = int(num)
     words = s.split()
     if len(words) > length:
         words = words[:length]
-        if not words[-1].endswith('...'):
-            words.append('...')
+        if not words[-1].endswith(end_text):
+            words.append(end_text)
     return u' '.join(words)
 truncate_words = allow_lazy(truncate_words, unicode)
 
-def truncate_html_words(s, num):
+def truncate_html_words(s, num, end_text='...'):
     """
     Truncates html to a certain number of words (not counting tags and
     comments). Closes opened tags if they were correctly closed in the given
@@ -103 +103 @@
     if words <= length:
         # Don't try to close tags if we don't need to truncate
         return s
-    out = s[:ellipsis_pos] + ' ...'
+    out = s[:ellipsis_pos] + end_text
     # Close any tags still open
     for tag in open_tags:
         out += '</%s>' % tag