X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/52703d7e4d7045b82771082a1b5c99045d71bbe7..ca88510e4dd14206f623cababfda1e8a9daf70d4:/forum/actions/user.py

diff --git a/forum/actions/user.py b/forum/actions/user.py
index 68de94b..aef541a 100644
--- a/forum/actions/user.py
+++ b/forum/actions/user.py
@@ -3,13 +3,44 @@ from django.db.models import F
 from forum.models.action import ActionProxy
 from forum.models import Award
 from forum import settings
+from forum.settings import APP_SHORT_NAME
 
 class UserJoinsAction(ActionProxy):
     def repute_users(self):
         self.repute(self.user, int(settings.INITIAL_REP))
 
+    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,
+        }
+
 class EditProfileAction(ActionProxy):
-    pass
+    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')),
+        }
+
+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):
     def process_data(self, badge, trigger):
@@ -27,8 +58,7 @@ class AwardAction(ActionProxy):
         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>.""") %
+        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):
@@ -52,5 +82,5 @@ class AwardAction(ActionProxy):
         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.all()[0].badge.name,
+            'badge_name': self.award.badge.name,
         }
\ No newline at end of file