OSQA-617, better Unicode support for the User Profile and User Links. Using the Djang...

[osqa.git] / forum / views / users.py

diff --git a/forum/views/users.py b/forum/views/users.py
index 60e4b38cc991ab2fc4435d36f903b122a7676efb..8766851c31faa021833881ebd3f2f463ff7be8da 100644 (file)
--- a/forum/views/users.py
+++ b/forum/views/users.py
@@ -11,6 +11,7 @@ from forum.http_responses import HttpResponseUnauthorized
 from django.utils.translation import ugettext as _\r
 from django.utils.http import urlquote_plus\r
 from django.utils.html import strip_tags\r
+from django.utils.encoding import smart_unicode\r
 from django.utils import simplejson\r
 from django.core.urlresolvers import reverse, NoReverseMatch\r
 from forum.forms import *\r
@@ -269,7 +270,7 @@ def user_view(template, tab_name, tab_title, tab_description, private=False, tab
         decorated = decorate.params.withfn(params)(fn)\r
 \r
         def result(context, request, user):\r
-            rev_page_title = user.username + " - " + tab_description\r
+            rev_page_title = smart_unicode(user.username) + " - " + tab_description\r
 \r
             context.update({\r
                 "tab": "users",\r
@@ -338,7 +339,7 @@ def user_recent(request, user):
     return {"view_user" : user, "activities" : activities}\r
 \r
 \r
-@user_view('users/reputation.html', 'reputation', _('karma history'), _('graph of user karma'))\r
+@user_view('users/reputation.html', 'reputation', _('reputation history'), _('graph of user karma'))\r
 def user_reputation(request, user):\r
     rep = list(user.reputes.order_by('date'))\r
     values = [r.value for r in rep]\r
@@ -368,7 +369,7 @@ def user_favorites(request, user):
 \r
 @user_view('users/subscriptions.html', 'subscriptions', _('subscription'), _('subscriptions'), True, tabbed=False)\r
 def user_subscriptions(request, user):\r
-    enabled = user.subscription_settings.enable_notifications\r
+    enabled = True\r
 \r
     tab = request.GET.get('tab', "settings")\r
 \r
@@ -382,14 +383,6 @@ def user_subscriptions(request, user):
                 form.save()\r
                 message = _('New subscription settings are now saved')\r
 \r
-                if 'notswitch' in request.POST:\r
-                    enabled = not enabled\r
-\r
-                    if enabled:\r
-                        message = _('Notifications are now enabled')\r
-                    else:\r
-                        message = _('Notifications are now disabled')\r
-\r
                 user.subscription_settings.enable_notifications = enabled\r
                 user.subscription_settings.save()\r
 \r