OSQA-315, better Unicode support for the usernames in the Accept Rate and the Award...

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

diff --git a/forum/templatetags/extra_tags.py b/forum/templatetags/extra_tags.py
index e34e996da6b25a80b2c990b7a7d0fff51f15aa12..04b260feed56cfca22ecb9c66be262748df4097f 100644 (file)
--- a/forum/templatetags/extra_tags.py
+++ b/forum/templatetags/extra_tags.py
@@ -89,12 +89,15 @@ def get_accept_rate(user):
 
     # In order to represent the accept rate in percentages we divide the number of the accepted answers to the
     # total answers count and make a hundred multiplication.
-    accept_rate = (float(accepted_answers_count) / float(total_answers_count) * 100)
+    try:
+        accept_rate = (float(accepted_answers_count) / float(total_answers_count) * 100)
+    except ZeroDivisionError:
+        accept_rate = 0
 
     # If the user has more than one accepted answers the rate title will be in plural.
     if accepted_answers_count > 1:
         accept_rate_number_title = _('%(user)s has %(count)d accepted answers') % {
-            'user' : user.username,
+            'user' :  user.username,
             'count' : int(accepted_answers_count)
         }
     # If the user has one accepted answer we'll be using singular.
@@ -102,7 +105,7 @@ def get_accept_rate(user):
         accept_rate_number_title = _('%s has one accepted answer') % user.username
     # This are the only options. Otherwise there are no accepted answers at all.
     else:
-        accept_rate_number_title = _('%s has no accepted answers') % user.username
+        accept_rate_number_title = _('%s has no accepted answers') % smart_unicode(user.username)
 
     html_output = """
     <span title="%(accept_rate_title)s" class="accept_rate">%(accept_rate_label)s:</span>

diff --git a/forum/templatetags/node_tags.py b/forum/templatetags/node_tags.py
index 6680f59c4e14e6dbf6ed29d4f3656202f83f7cc9..6a88355233f682556eb148f0b0364e89351e9fc3 100644 (file)
--- a/forum/templatetags/node_tags.py
+++ b/forum/templatetags/node_tags.py
@@ -4,6 +4,7 @@ import re
 from forum.models import Question, Action\r
 from django.utils.translation import ungettext, ugettext as _\r
 from django.utils.html import strip_tags\r
+from django.utils.encoding import smart_unicode\r
 from django.utils.safestring import mark_safe\r
 from django.core.urlresolvers import reverse\r
 from django import template\r
@@ -93,7 +94,7 @@ def post_controls(post, user):
         # Users should be able to award points for an answer. Users cannot award their own answers\r
         if user != post.author and user.is_authenticated():\r
             controls.append(post_control(_("award points"), reverse('award_points', kwargs={'user_id' : post.author.id,\r
-                                         'answer_id' : post.id}), title=_("award points to %s") % post.author,\r
+                                         'answer_id' : post.id}), title=_("award points to %s") % smart_unicode(post.author.username),\r
                                          command=True, withprompt=True))\r
 \r
     # The other controls are visible only to authenticated users.\r