Fixing the decorate_int filter in way it can work with string, round properly and...

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@627 0cfe37f9-358a-4d5e-be75-b63607b5c754

diff --git a/forum/templatetags/extra_filters.py b/forum/templatetags/extra_filters.py
index b9fb4b350905eddfe0d62beb4e8c351164513d91..e13923fe30330f7bd7f8575b21655a435a8668ea 100644 (file)
--- a/forum/templatetags/extra_filters.py
+++ b/forum/templatetags/extra_filters.py
@@ -19,12 +19,11 @@ def can_edit_post(user, post):
 @register.filter
 def decorated_int(number, cls="thousand"):
     try:
 @register.filter
 def decorated_int(number, cls="thousand"):
     try:

+        number = int(number)    # allow strings or numbers passed in

         if number > 999:
         if number > 999:

-            if number > 9999:
-                s = str(number)[:-3]
-            else:
-                s = str(number)
-                s = "%s.%s" % (s[0], s[1])
+            thousands = float(number) / 1000.0
+            format = "%.1f" if number < 99500 else "%.0f"
+            s = format % thousands

 
             return mark_safe("<span class=\"%s\">%sk</span>" % (cls, s))
         return number
 
             return mark_safe("<span class=\"%s\">%sk</span>" % (cls, s))
         return number