merging in oscar's patch for OSQA-247. Made a the message about receiving a new...

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

diff --git a/forum/actions/user.py b/forum/actions/user.py
index 0e894ba0260136e0be08177e88ca2836b9d3bdb8..1ceae09af5cda1a83ef2d7ffb3f0539f1d24e957 100644 (file)
--- a/forum/actions/user.py
+++ b/forum/actions/user.py
@@ -3,13 +3,25 @@ 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 AwardAction(ActionProxy):
     def process_data(self, badge, trigger):
@@ -27,8 +39,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):