X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/39fcada1eefd54b8fab6b6cb12b14ed7acdb5e27..c8f355dd7205132ecd2c1bc27dc4e8944fdd6252:/forum/views/users.py?ds=inline

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