From: Aniket Schneider Date: Thu, 13 Mar 2014 22:14:10 +0000 (-0400) Subject: Fix more fullurl errors X-Git-Tag: live~27^2 X-Git-Url: https://git.openstreetmap.org./osqa.git/commitdiff_plain/0dd9b948691b781bbd983347291e41d8959cc7b0?ds=sidebyside Fix more fullurl errors --- diff --git a/forum/actions/user.py b/forum/actions/user.py index 5a6aba5..a9ec71a 100644 --- a/forum/actions/user.py +++ b/forum/actions/user.py @@ -1,6 +1,7 @@ from django.utils.translation import ungettext, ugettext as _ from django.core.urlresolvers import reverse from django.db.models import F +from django.contrib import messages from forum.models.action import ActionProxy from forum.models import Award, Badge, ValidationHash, User from forum import settings, REQUEST_HOLDER @@ -252,4 +253,4 @@ class SuspendAction(ActionProxy): return _("%(user)s suspended %(users)s %(suspension)s: %(msg)s") % { 'user': self.hyperlink(self.user.get_profile_url(), self.friendly_username(viewer, self.user)), 'users': self.affected_links(viewer), 'suspension': suspension, 'msg': self.extra.get('publicmsg', _('Bad behaviour')) - } \ No newline at end of file + } diff --git a/forum/skins/default/templates/auth/temp_login_email.html b/forum/skins/default/templates/auth/temp_login_email.html index 32ade89..3c5707f 100644 --- a/forum/skins/default/templates/auth/temp_login_email.html +++ b/forum/skins/default/templates/auth/temp_login_email.html @@ -14,17 +14,17 @@

{% blocktrans %}The following link grants you a one time access to your account at {{ app_name }}.{% endblocktrans %}

-

{% trans "Go to your account" %}

+

{% trans "Go to your account" %}

{% trans "If the above link is not clickable, copy and paste this url into your web browser's address bar:" %}

-

{% fullurl auth_tempsignin user=recipient.id,code=temp_login_code %}

+

{% fullurl "auth_tempsignin" user=recipient.id code=temp_login_code %}

{% endhtmlcontent %} {% textcontent notifications/base_text.html %} {% blocktrans %}The following url grants you a one time access to your account at {{ app_name }}.{% endblocktrans %} -{% fullurl auth_tempsignin user=recipient.id,code=temp_login_code %} +{% fullurl "auth_tempsignin" user=recipient.id code=temp_login_code %} {% endtextcontent %} {% endemail %}