X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/ecd9fa68ea62902f79744b458e4ea2ed95ce00ac..b25b1df19ea98a93e2c175b265e15d625ad1bc65:/forum/actions/node.py diff --git a/forum/actions/node.py b/forum/actions/node.py index f5aad16..dbbb658 100644 --- a/forum/actions/node.py +++ b/forum/actions/node.py @@ -42,7 +42,7 @@ class AnswerAction(NodeEditAction): def describe(self, viewer=None): question = self.node.parent - return _("%(user)s answered %(asker)s %(question)s") % { + return _("%(user)s answered %(asker)s on %(question)s") % { 'user': self.hyperlink(self.user.get_profile_url(), self.friendly_username(viewer, self.user)), 'asker': self.hyperlink(question.author.get_profile_url(), self.friendly_username(viewer, question.author)), 'question': self.hyperlink(self.node.get_absolute_url(), question.title) @@ -136,6 +136,7 @@ class CloseAction(ActionProxy): def process_action(self): self.node.marked = True self.node.nstate.closed = self + self.node.last_edited = self self.node.update_last_activity(self.user, save=True) def cancel_action(self): @@ -178,16 +179,16 @@ class WikifyAction(ActionProxy): verb = _("wikified") def process_action(self): - self.node.nstate.wiky = self + self.node.nstate.wiki = self self.node.last_edited = self self.node.update_last_activity(self.user, save=True) def cancel_action(self): - self.node.nstate.wiky = None + self.node.nstate.wiki = None self.node.update_last_activity(self.user, save=True) def describe(self, viewer=None): - return _("%(user)s marked %(node)s as community wiky.") % { + return _("%(user)s marked %(node)s as community wiki.") % { 'user': self.hyperlink(self.user.get_profile_url(), self.friendly_username(viewer, self.user)), 'node': self.describe_node(viewer, self.node), }