Ticket #3963: truncate_optional_replacement.patch

django/utils/text.py

@@ -31 +31 @@
             yield word
     return "".join(_generator())
 
-def truncate_words(s, num):
+def truncate_words(s, num, replacement='...'):
     "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('...')
+        if not words[-1].endswith(replacement):
+            words.append(replacement)
     return ' '.join(words)
 
-def truncate_html_words(s, num):
+def truncate_html_words(s, num, replacement=' ...'):
     """
     Truncates html to a certain number of words (not counting tags and comments).
     Closes opened tags if they were correctly closed in the given html.
@@ -94 +94 @@
     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] + replacement
     # Close any tags still open
     for tag in open_tags:
         out += '</%s>' % tag

django/template/defaultfilters.py

@@ -148 +148 @@
     """
     Truncates a string after a certain number of words
 
-    Argument: Number of words to truncate after
+    Arguments: Number of words to truncate after, and an optional replacement
+    adding to the truncated text
     """
+
+    if not ',' in arg:
+        arg += ','
+    bits = arg.split(',')
+    if len(bits) > 2:
+        return value # Fail silently if comma is used as replacement.
+
     from django.utils.text import truncate_words
     try:
-        length = int(arg)
+        length = int(bits[0])
     except ValueError: # invalid literal for int()
         return value # Fail silently.
     if not isinstance(value, basestring):
         value = str(value)
-    return truncate_words(value, length)
+    if bits[1]:
+        return truncate_words(value, length, bits[1])
+    else:
+        return truncate_words(value, length)
 truncatewords = stringfilter(truncatewords)
 
 def truncatewords_html(value, arg):
     """
     Truncates HTML after a certain number of words
 
-    Argument: Number of words to truncate after
+    Argument: Number of words to truncate after, and an optional replacement
+    adding to the truncated text
     """
+
+    if not ',' in arg:
+        arg += ','
+    bits = arg.split(',')
+    if len(bits) > 2:
+        return value # Fail silently if comma is used as replacement.
+
     from django.utils.text import truncate_html_words
     try:
-        length = int(arg)
+        length = int(bits[0])
     except ValueError: # invalid literal for int()
         return value # Fail silently.
     if not isinstance(value, basestring):
         value = str(value)
-    return truncate_html_words(value, length)
+
+    if bits[1]:
+        return truncate_html_words(value, length, bits[1])
+    else:
+        return truncate_html_words(value, length)
 truncatewords_html = stringfilter(truncatewords_html)
 
 def upper(value):