Merge commit '9bea91a' into merge_small_prs

diff --git a/forum/actions/user.py b/forum/actions/user.py
index 5a6aba5ec7918ccd28215684a2a93f498c20deb5..a9ec71ae605309bf6cd961a42d196fcf2a536dc1 100644 (file)
--- 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/mail_validation.html b/forum/skins/default/templates/auth/mail_validation.html
index 82029d620862c0f7dd6952ddd1a9ebbb4887cfc7..7e6a2f3022d7b4c1d2c3f5ccb13dfc0308c1582c 100644 (file)
--- a/forum/skins/default/templates/auth/mail_validation.html
+++ b/forum/skins/default/templates/auth/mail_validation.html
@@ -13,17 +13,17 @@
     {% htmlcontent notifications/base.html %}
         <p style="{{ p_style }}">{% trans "Please use the following link to help us verify your email address:" %}</p>
 
-        <p style="{{ p_style }}"><a  style="{{ a_style }}" href="{% fullurl auth_validate_email user=recipient.id,code=validation_code %}">{% trans "Validate my email address" %}</a></p>
+        <p style="{{ p_style }}"><a  style="{{ a_style }}" href="{% fullurl "auth_validate_email" user=recipient.id code=validation_code %}">{% trans "Validate my email address" %}</a></p>
 
         <p style="{{ p_style }}">{% trans "If the above link is not clickable, copy and paste this url into your web browser's address bar:" %}</p>
 
-        <p style="{{ p_style }}">{% fullurl auth_validate_email user=recipient.id,code=validation_code %}</p>
+        <p style="{{ p_style }}">{% fullurl "auth_validate_email" user=recipient.id code=validation_code %}</p>
     {% endhtmlcontent %}
 
 {% textcontent notifications/base_text.html %}
 {% trans "Copy and paste this url into your web browser's address bar to help us verify your email address:" %}
 
-{% fullurl auth_validate_email user=recipient.id,code=validation_code %}
+{% fullurl "auth_validate_email" user=recipient.id code=validation_code %}
 {% endtextcontent %}
 
 {% endemail %}

diff --git a/forum/skins/default/templates/auth/temp_login_email.html b/forum/skins/default/templates/auth/temp_login_email.html
index 32ade899f9fab341036be8d16807bf3b5d0d02d0..3c5707f0f0956a87a223d22099ce8f089df36ce3 100644 (file)
--- a/forum/skins/default/templates/auth/temp_login_email.html
+++ b/forum/skins/default/templates/auth/temp_login_email.html
@@ -14,17 +14,17 @@
         <p style="{{ p_style }}">
             {% blocktrans %}The following link grants you a one time access to your account at {{ app_name }}.{% endblocktrans %}
         </p>
-        <p style="{{ p_style }}"><a  style="{{ a_style }}" href="{% fullurl auth_tempsignin user=recipient.id,code=temp_login_code %}">{% trans "Go to your account" %}</a></p>
+        <p style="{{ p_style }}"><a  style="{{ a_style }}" href="{% fullurl "auth_tempsignin" user=recipient.id code=temp_login_code %}">{% trans "Go to your account" %}</a></p>
 
         <p style="{{ p_style }}">{% trans "If the above link is not clickable, copy and paste this url into your web browser's address bar:" %}</p>
 
-        <p style="{{ p_style }}">{% fullurl auth_tempsignin user=recipient.id,code=temp_login_code %}</p>
+        <p style="{{ p_style }}">{% fullurl "auth_tempsignin" user=recipient.id code=temp_login_code %}</p>
     {% 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 %}