X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/9308d78c7f1e4d2a4faf3b98d1b24c262f3b6287..4b20a67ddb4ebea2c6e09d51ee48da5a856edef8:/forum/actions/user.py?ds=sidebyside

diff --git a/forum/actions/user.py b/forum/actions/user.py
index df90c66..50d1a73 100644
--- a/forum/actions/user.py
+++ b/forum/actions/user.py
@@ -1,53 +1,79 @@
 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, ValidationHash
+from forum.models import Award, Badge, ValidationHash, User
 from forum import settings
 from forum.settings import APP_SHORT_NAME
-from forum.utils.mail import send_email, send_template_email
+from forum.utils.mail import send_template_email
 
 class UserJoinsAction(ActionProxy):
+    verb = _("joined")
+
     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})
+        send_template_email([self.user], "auth/welcome_email.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)),
-            '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):
+    verb = _("edited profile")
+
     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'), _('his')),
-            '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):
+    verb = _("gave bonus")
+
+    def process_data(self, value, affected):
         self._value = value
+        self._affected = affected
+
 
     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')))
-        
+        self.repute(self._affected, self._value)
+
+        if self._value > 0:
+            self._affected.message_set.create(
+                    message=_("Congratulations, you have been awarded an extra %s reputation points.") % self._value +
+                    '<br />%s' % self.extra.get('message', _('Thank you')))
+        else:
+            self._affected.message_set.create(
+                    message=_("You have been penalized in %s reputation points.") % self._value +
+                    '<br />%s' % self.extra.get('message', ''))
+
     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
-        }
+        try:
+            if int(value) > 0:
+                return _("%(user)s awarded an extra %(value)s reputation points to %(users)s: %(message)s") % {
+                'user': self.hyperlink(self.user.get_profile_url(), self.friendly_username(viewer, self.user)),
+                'value': value, 'users':self.affected_links(viewer), 'message': message
+                }
+            else:
+                return _("%(user)s penalised %(users)s in %(value)s reputation points: %(message)s") % {
+                'user': self.hyperlink(self.user.get_profile_url(), self.friendly_username(viewer, self.user)),
+                'value': value, 'users':self.affected_links(viewer), 'message': message
+                }
+        except Exception, e:
+            return ''
 
 class AwardAction(ActionProxy):
+    verb = _("was awarded")
+
     def process_data(self, badge, trigger):
         self.__dict__['_badge'] = badge
         self.__dict__['_trigger'] = trigger
@@ -73,8 +99,10 @@ class AwardAction(ActionProxy):
 
         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()))
+        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
@@ -95,7 +123,39 @@ class AwardAction(ActionProxy):
 
     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,
+        }
+
+class SuspendAction(ActionProxy):
+    verb = _("suspended")
+
+    def process_data(self, **kwargs):
+        self._suspended = kwargs.pop('suspended')
+        self.extra = kwargs
+
+    def repute_users(self):
+        self.repute(self._suspended, 0)
+
+    def process_action(self):
+        self._suspended.is_active = False
+        self._suspended.save()
+
+    def cancel_action(self):
+        for u in User.objects.filter(reputes__action=self).distinct():
+            u.is_active = True
+            u._pop_suspension_cache()
+            u.save()
+            u.message_set.create(message=_("Your suspension has been removed."))
+
+    def describe(self, viewer=None):
+        if self.extra.get('bantype', 'indefinitely') == 'forxdays' and self.extra.get('forxdays', None):
+            suspension = _("for %s days") % self.extra['forxdays']
+        else:
+            suspension = _("indefinetely")
+
+        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