OSQA-525, use old style syntax for the if-statements, adds a bit of backwards compati...

[osqa.git] / forum / templatetags / extra_filters.py

diff --git a/forum/templatetags/extra_filters.py b/forum/templatetags/extra_filters.py
index b9fb4b350905eddfe0d62beb4e8c351164513d91..8dea68c9c0d4c3c944c526450ba4fcafb73064e5 100644 (file)
--- a/forum/templatetags/extra_filters.py
+++ b/forum/templatetags/extra_filters.py
@@ -19,12 +19,16 @@ def can_edit_post(user, post):
 @register.filter
 def decorated_int(number, cls="thousand"):
     try:
+        number = int(number)    # allow strings or numbers passed in
         if number > 999:
-            if number > 9999:
-                s = str(number)[:-3]
+            thousands = float(number) / 1000.0
+
+            if number < 99500:
+                format = "%.1f"
             else:
-                s = str(number)
-                s = "%s.%s" % (s[0], s[1])
+                format = "%.0f"
+
+            s = format % thousands
 
             return mark_safe("<span class=\"%s\">%sk</span>" % (cls, s))
         return number