Fixes bad english in userjoins action.

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

diff --git a/forum/actions/user.py b/forum/actions/user.py
index 1ceae09af5cda1a83ef2d7ffb3f0539f1d24e957..f76a281368c13df8e9fee0ed99225307d8c3d610 100644 (file)
--- a/forum/actions/user.py
+++ b/forum/actions/user.py
@@ -1,26 +1,52 @@
 from django.utils.translation import ugettext as _
 from django.db.models import F
 from forum.models.action import ActionProxy
 from django.utils.translation import ugettext as _
 from django.db.models import F
 from forum.models.action import ActionProxy

-from forum.models import Award
+from forum.models import Award, Badge, ValidationHash

 from forum import settings
 from forum.settings import APP_SHORT_NAME
 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))
 
 
 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):
     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)),
-            'app_name': APP_SHORT_NAME,
+        return _("%(user)s %(have_has)s joined the %(app_name)s Q&A community") % {
+        'user': self.hyperlink(self.user.get_profile_url(), self.friendly_username(viewer, self.user)),
+        'have_has': self.viewer_or_user_verb(viewer, self.user, _('have'), _('has')),
+        'app_name': APP_SHORT_NAME,

         }
 
 class EditProfileAction(ActionProxy):
     def describe(self, viewer=None):
         return _("%(user)s edited %(hes_or_your)s %(profile_link)s") % {
         }
 
 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')),
-            'profile_link': self.hyperlink(self.user.get_profile_url(), _('profile')),
+        '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'), _('his')),
+        'profile_link': self.hyperlink(self.user.get_profile_url(), _('profile')),
+        }
+
+class BonusRepAction(ActionProxy):
+    def process_data(self, value):
+        self._value = value
+
+    def repute_users(self):
+        self.repute(self.user, self._value)
+        self.user.message_set.create(
+                message=_("Congratulations, you have been awarded an extra %s reputation points.") % self._value +
+                '<br />%s' % self.extra.get('message', _('Thank you')))
+
+    def describe(self, viewer=None):
+        value = self.extra.get('value', _('unknown'))
+        message = self.extra.get('message', '')
+
+        return _("%(user)s %(was_were)s awarded %(value)s reputation points: %(message)s") % {
+        'user': self.hyperlink(self.user.get_profile_url(), self.friendly_username(viewer, self.user)),
+        'was_were': self.viewer_or_user_verb(viewer, self.user, _('were'), _('was')),
+        'value': value, 'message': message

         }
 
 class AwardAction(ActionProxy):
         }
 
 class AwardAction(ActionProxy):


@@ -39,8 +65,20 @@ class AwardAction(ActionProxy):
         award.save()
         award.badge.awarded_count = F('awarded_count') + 1
         award.badge.save()
         award.save()
         award.badge.awarded_count = F('awarded_count') + 1
         award.badge.save()

-        self.user.message_set.create(message=_("""Congratulations, you have received a badge '%(badge_name)s'. Check out <a href=\"%(profile_url)s\">your profile</a>.""") %
-                                     dict(badge_name=award.badge.name, profile_url=self.user.get_profile_url()))
+
+        if award.badge.type == Badge.GOLD:
+            self.user.gold += 1
+        if award.badge.type == Badge.SILVER:
+            self.user.silver += 1
+        if award.badge.type == Badge.BRONZE:
+            self.user.bronze += 1
+
+        self.user.save()
+
+        self.user.message_set.create(message=_(
+                """Congratulations, you have received a badge '%(badge_name)s'. Check out <a href=\"%(profile_url)s\">your profile</a>."""
+                ) %
+        dict(badge_name=award.badge.name, profile_url=self.user.get_profile_url()))

 
     def cancel_action(self):
         award = self.award
 
     def cancel_action(self):
         award = self.award


@@ -61,7 +99,7 @@ class AwardAction(ActionProxy):
 
     def describe(self, viewer=None):
         return _("%(user)s %(were_was)s awarded the %(badge_name)s badge") % {
 
     def describe(self, viewer=None):
         return _("%(user)s %(were_was)s awarded the %(badge_name)s badge") % {

-            'user': self.hyperlink(self.user.get_profile_url(), self.friendly_username(viewer, self.user)),
-            'were_was': self.viewer_or_user_verb(viewer, self.user, _('were'), _('was')),
-            'badge_name': self.award.badge.name,
+        'user': self.hyperlink(self.user.get_profile_url(), self.friendly_username(viewer, self.user)),
+        'were_was': self.viewer_or_user_verb(viewer, self.user, _('were'), _('was')),
+        'badge_name': self.award.badge.name,

         }
\ No newline at end of file
         }
\ No newline at end of file