Fixed http://jira.osqa.net/browse/OSQA-216.

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@159 0cfe37f9-358a-4d5e-be75-b63607b5c754

diff --git a/forum/actions/user.py b/forum/actions/user.py
index 2695f9f80841c18b800eb96dc4644a80d4c9283e..b281f1495672b2eadcb95a5681f52106690ed386 100644 (file)
--- a/forum/actions/user.py
+++ b/forum/actions/user.py
@@ -47,7 +47,8 @@ class AwardAction(ActionProxy):
             return None\r
 \r
     def describe(self, viewer=None):\r
-        return _("%(user)s was awarded the %(badge_name)s badge") % {\r
+        return _("%(user)s %(were_was)s awarded the %(badge_name)s badge") % {\r
             'user': self.hyperlink(self.user.get_profile_url(), self.friendly_username(viewer, self.user)),\r
+            'were_was': self.viewer_or_user_verb(viewer, self.user, _('were'), _('was')),\r
             'badge_name': self.award.all()[0].badge.name,\r
         }
\ No newline at end of file

diff --git a/forum/models/action.py b/forum/models/action.py
index 10eb1658a5f54cb39858a3c1b2355cdbd0b028dc..583b27c078fcf46c55eb6c3017082caaabf1effe 100644 (file)
--- a/forum/models/action.py
+++ b/forum/models/action.py
@@ -187,6 +187,9 @@ class ActionProxy(Action):
     def friendly_ownername(self, owner, user):\r
         return (owner == user) and _('your') or user.username\r
 \r
+    def viewer_or_user_verb(self, viewer, user, viewer_verb, user_verb):\r
+        return (viewer == user) and viewer_verb or user_verb    \r
+\r
     def hyperlink(self, url, title, **attrs):\r
         return '<a href="%s" %s>%s</a>' % (url, " ".join('%s="%s"' % i for i in attrs.items()), title)\r
 \r