1 files changed, 40 insertions, 32 deletions
diff --git a/forum/templatetags/extra_tags.py b/forum/templatetags/extra_tags.py
index 7c53c2cb..de853135 100644
--- a/forum/templatetags/extra_tags.py
+++ b/forum/templatetags/extra_tags.py
@@ -1,4 +1,4 @@
-import time
+import time
 import datetime
 import math
 import re
@@ -8,6 +8,7 @@ from django.utils.encoding import smart_unicode
 from django.utils.safestring import mark_safe
 from django.utils.timesince import timesince
 from forum.const import *
+from django.utils.translation import ugettext as _
 
 register = template.Library()
 
@@ -49,10 +50,10 @@ def tag_font_size(max_size, min_size, current_size):
         weight = 0
     return MIN_FONTSIZE + round((MAX_FONTSIZE - MIN_FONTSIZE) * weight)
 
-
+    
 LEADING_PAGE_RANGE_DISPLAYED = TRAILING_PAGE_RANGE_DISPLAYED = 5
 LEADING_PAGE_RANGE = TRAILING_PAGE_RANGE = 4
-NUM_PAGES_OUTSIDE_RANGE = 1
+NUM_PAGES_OUTSIDE_RANGE = 1 
 ADJACENT_PAGES = 2
 @register.inclusion_tag("paginator.html")
 def cnprog_paginator(context):
@@ -64,10 +65,10 @@ def cnprog_paginator(context):
         " Initialize variables "
         in_leading_range = in_trailing_range = False
         pages_outside_leading_range = pages_outside_trailing_range = range(0)
-
+ 
         if (context["pages"] <= LEADING_PAGE_RANGE_DISPLAYED):
             in_leading_range = in_trailing_range = True
-            page_numbers = [n for n in range(1, context["pages"] + 1) if n > 0 and n <= context["pages"]]
+            page_numbers = [n for n in range(1, context["pages"] + 1) if n > 0 and n <= context["pages"]]           
         elif (context["page"] <= LEADING_PAGE_RANGE):
             in_leading_range = True
             page_numbers = [n for n in range(1, LEADING_PAGE_RANGE_DISPLAYED + 1) if n > 0 and n <= context["pages"]]
@@ -76,11 +77,11 @@ def cnprog_paginator(context):
             in_trailing_range = True
             page_numbers = [n for n in range(context["pages"] - TRAILING_PAGE_RANGE_DISPLAYED + 1, context["pages"] + 1) if n > 0 and n <= context["pages"]]
             pages_outside_trailing_range = [n + 1 for n in range(0, NUM_PAGES_OUTSIDE_RANGE)]
-        else:
+        else: 
             page_numbers = [n for n in range(context["page"] - ADJACENT_PAGES, context["page"] + ADJACENT_PAGES + 1) if n > 0 and n <= context["pages"]]
             pages_outside_leading_range = [n + context["pages"] for n in range(0, -NUM_PAGES_OUTSIDE_RANGE, -1)]
             pages_outside_trailing_range = [n + 1 for n in range(0, NUM_PAGES_OUTSIDE_RANGE)]
-
+            
         extend_url = context.get('extend_url', '')
         return {
             "base_url": context["base_url"],
@@ -110,23 +111,23 @@ def cnprog_pagesize(context):
             "pagesize" : context["pagesize"],
             "is_paginated": context["is_paginated"]
         }
-
+        
 @register.simple_tag
 def get_score_badge(user):
-    BADGE_TEMPLATE = '<span class="score" title="%(reputation)s用户积分">%(reputation)s</span>'
+    BADGE_TEMPLATE = '<span class="score" title="%(reputation)s %(reputationword)s">%(reputation)s</span>'
     if user.gold > 0 :
-        BADGE_TEMPLATE = '%s%s' % (BADGE_TEMPLATE, ' <span title="%(gold)s枚金牌">'
-        '<span class="badge1">●</span>'
+        BADGE_TEMPLATE = '%s%s' % (BADGE_TEMPLATE, '<span title="%(gold)s %(badgesword)s">'
+        '<span class="badge1">&#9679;</span>'
         '<span class="badgecount">%(gold)s</span>'
         '</span>')
     if user.silver > 0:
-        BADGE_TEMPLATE = '%s%s' % (BADGE_TEMPLATE, ' <span title="%(silver)s枚银牌">'
-        '<span class="silver">●</span>'
+        BADGE_TEMPLATE = '%s%s' % (BADGE_TEMPLATE, '<span title="%(silver)s %(badgesword)s">'
+        '<span class="silver">&#9679;</span>'
         '<span class="badgecount">%(silver)s</span>'
         '</span>')
     if user.bronze > 0:
-        BADGE_TEMPLATE = '%s%s' % (BADGE_TEMPLATE, ' <span title="%(bronze)s枚铜牌">'
-        '<span class="bronze">●</span>'
+        BADGE_TEMPLATE = '%s%s' % (BADGE_TEMPLATE, '<span title="%(bronze)s %(badgesword)s">'
+        '<span class="bronze">&#9679;</span>'
         '<span class="badgecount">%(bronze)s</span>'
         '</span>')
     BADGE_TEMPLATE = smart_unicode(BADGE_TEMPLATE, encoding='utf-8', strings_only=False, errors='strict')
@@ -135,24 +136,26 @@ def get_score_badge(user):
         'gold' : user.gold,
         'silver' : user.silver,
         'bronze' : user.bronze,
+		'badgesword' : _('badges'),
+		'reputationword' : _('reputation points'),
     })
-
+    
 @register.simple_tag
 def get_score_badge_by_details(rep, gold, silver, bronze):
-    BADGE_TEMPLATE = '<span class="reputation-score" title="%(reputation)s用户积分">%(reputation)s</span>'
+    BADGE_TEMPLATE = '<span class="reputation-score" title="%(reputation)s %(repword)s">%(reputation)s</span>'
     if gold > 0 :
-        BADGE_TEMPLATE = '%s%s' % (BADGE_TEMPLATE, '<span title="%(gold)s枚金牌">'
-        '<span class="badge1">●</span>'
+        BADGE_TEMPLATE = '%s%s' % (BADGE_TEMPLATE, '<span title="%(gold)s %(badgeword)s">'
+        '<span class="badge1">&#9679;</span>'
         '<span class="badgecount">%(gold)s</span>'
         '</span>')
     if silver > 0:
-        BADGE_TEMPLATE = '%s%s' % (BADGE_TEMPLATE, '<span title="%(silver)s枚银牌">'
-        '<span class="badge2">●</span>'
+        BADGE_TEMPLATE = '%s%s' % (BADGE_TEMPLATE, '<span title="%(silver)s %(badgeword)s">'
+        '<span class="badge2">&#9679;</span>'
         '<span class="badgecount">%(silver)s</span>'
         '</span>')
     if bronze > 0:
-        BADGE_TEMPLATE = '%s%s' % (BADGE_TEMPLATE, '<span title="%(bronze)s枚铜牌">'
-        '<span class="badge3">●</span>'
+        BADGE_TEMPLATE = '%s%s' % (BADGE_TEMPLATE, '<span title="%(bronze)s %(badgeword)s">'
+        '<span class="badge3">&#9679;</span>'
         '<span class="badgecount">%(bronze)s</span>'
         '</span>')
     BADGE_TEMPLATE = smart_unicode(BADGE_TEMPLATE, encoding='utf-8', strings_only=False, errors='strict')
@@ -161,19 +164,24 @@ def get_score_badge_by_details(rep, gold, silver, bronze):
         'gold' : gold,
         'silver' : silver,
         'bronze' : bronze,
-    })
-
+		'repword' : _('reputation points'),
+		'badgeword' : _('badges'),
+    })      
+    
 @register.simple_tag
 def get_user_vote_image(dic, key, arrow):
     if dic.has_key(key):
         if int(dic[key]) == int(arrow):
             return '-on'
     return ''
-
+        
 @register.simple_tag
 def get_age(birthday):
     current_time = datetime.datetime(*time.localtime()[0:6])
-    diff = current_time - birthday
+    year = birthday.year
+    month = birthday.month
+    day = birthday.day
+    diff = current_time - datetime.datetime(year,month,day,0,0,0)
     return diff.days / 365
 
 @register.simple_tag
@@ -197,12 +205,12 @@ def format_number(value):
         m = re.match(pattern, strValue)
     return first + result
 
-@register.simple_tag
+@register.simple_tag   
 def convert2tagname_list(question):
     question['tagnames'] = [name for name in question['tagnames'].split(u' ')]
     return ''
 
-@register.simple_tag
+@register.simple_tag    
 def diff_date(date, limen=2):
     current_time = datetime.datetime(*time.localtime()[0:6])
     diff = current_time - date
@@ -210,8 +218,8 @@ def diff_date(date, limen=2):
     if diff_days > limen:
         return date
     else:
-        return timesince(date) + u'前'
-
+        return timesince(date) + _(' ago')
+        
 @register.simple_tag
 def get_latest_changed_timestamp():
     try:
@@ -229,4 +237,4 @@ def get_latest_changed_timestamp():
         timestr = strftime("%H:%M %b-%d-%Y %Z", localtime(latest))
     except:
         timestr = ''
-    return timestr
-\ No newline at end of file
+    return timestr