X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/b8dacc53495e1c3a4a2e16a800168a9908725936..ddce82ce7b9c030a00fa700d11094ac4b24b6176:/forum/actions/user.py

diff --git a/forum/actions/user.py b/forum/actions/user.py
index b281f14..74771a6 100644
--- a/forum/actions/user.py
+++ b/forum/actions/user.py
@@ -1,54 +1,68 @@
-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 import settings
-
-class UserJoinsAction(ActionProxy):
-    def repute_users(self):
-        self.repute(self.user, int(settings.INITIAL_REP))
-
-class EditProfileAction(ActionProxy):
-    pass
-
-class AwardAction(ActionProxy):
-    def process_data(self, badge, trigger):
-        self.__dict__['_badge'] = badge
-        self.__dict__['_trigger'] = trigger
-
-    def process_action(self):
-        badge = self.__dict__['_badge']
-        trigger = self.__dict__['_trigger']
-
-        award = Award(user=self.user, badge=badge, trigger=trigger, action=self)
-        if self.node:
-            award.node = self.node
-
-        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'. " \
-                + u"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
-        badge = award.badge
-        badge.awarded_count = F('awarded_count') - 1
-        badge.save()
-        award.delete()
-
-    @classmethod
-    def get_for(cls, user, node, badge):
-        try:
-            award = Award.objects.get(user=user, node=node, badge=badge)
-            return award.action
-        except:
-            return None
-
-    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.all()[0].badge.name,
+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 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):
+    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):
+        self.__dict__['_badge'] = badge
+        self.__dict__['_trigger'] = trigger
+
+    def process_action(self):
+        badge = self.__dict__['_badge']
+        trigger = self.__dict__['_trigger']
+
+        award = Award(user=self.user, badge=badge, trigger=trigger, action=self)
+        if self.node:
+            award.node = self.node
+
+        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()))
+
+    def cancel_action(self):
+        award = self.award
+        badge = award.badge
+        badge.awarded_count = F('awarded_count') - 1
+        badge.save()
+        award.delete()
+
+    @classmethod
+    def get_for(cls, user, badge, node=False):
+        try:
+            if node is False:
+                return Award.objects.get(user=user, badge=badge).action
+            else:
+                return Award.objects.get(user=user, node=node, badge=badge).action
+        except:
+            return None
+
+    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,
         }
\ No newline at end of file