Adds the option to create static pages with several options to customize its behaviour.

[osqa.git] / forum / actions / user.py

diff --git a/forum/actions/user.py b/forum/actions/user.py
index 19dfa5efb0b25d9a070edc8e05d27aee0e432802..df90c66f562ffd163ea818597968a96e6550c405 100644 (file)
--- a/forum/actions/user.py
+++ b/forum/actions/user.py
@@ -1,14 +1,19 @@
 from django.utils.translation import ugettext as _
 from django.db.models import F
 from forum.models.action import ActionProxy
-from forum.models import Award, Badge
+from forum.models import Award, Badge, ValidationHash
 from forum import settings
 from forum.settings import APP_SHORT_NAME
+from forum.utils.mail import send_email, send_template_email
 
 class UserJoinsAction(ActionProxy):
     def repute_users(self):
         self.repute(self.user, int(settings.INITIAL_REP))
 
+    def process_action(self):
+        hash = ValidationHash.objects.create_new(self.user, 'email', [self.user.email])
+        send_template_email([self.user], "auth/email_validation.html", {'validation_code': hash})
+
     def describe(self, viewer=None):
         return _("%(user)s as joined the %(app_name)s Q&A community") % {
             'user': self.hyperlink(self.user.get_profile_url(), self.friendly_username(viewer, self.user)),
@@ -19,7 +24,7 @@ class EditProfileAction(ActionProxy):
     def describe(self, viewer=None):
         return _("%(user)s edited %(hes_or_your)s %(profile_link)s") % {
             'user': self.hyperlink(self.user.get_profile_url(), self.friendly_username(viewer, self.user)),
-            'hes_or_your': self.viewer_or_user_verb(viewer, self.user, _('your'), _('hes')),
+            'hes_or_your': self.viewer_or_user_verb(viewer, self.user, _('your'), _('his')),
             'profile_link': self.hyperlink(self.user.get_profile_url(), _('profile')),
         }
 
@@ -64,7 +69,7 @@ class AwardAction(ActionProxy):
         if award.badge.type == Badge.SILVER:
             self.user.silver += 1
         if award.badge.type == Badge.BRONZE:
-            self.user.silver += 1
+            self.user.bronze += 1
 
         self.user.save()