diff -r 59107ce0a618 -r f04a1ec7a07f taskapp/utilities/notification.py --- a/taskapp/utilities/notification.py Wed Jan 05 22:22:10 2011 +0530 +++ b/taskapp/utilities/notification.py Wed Jan 05 22:30:45 2011 +0530 @@ -13,7 +13,7 @@ reply: A boolean task: a task if applicable requested_by: a user makes the request - A reviewer who assigns credits in case of pynts + A reviewer who assigns pynts in case of pynts A reviewer who requests to act as a reviewer remarks: any remarks for rejecting receiving_user: user receiving pynts @@ -32,18 +32,18 @@ notification.pynts = pynts task_url= '%s'%(task.id, task.title) - credits_url = '%s'%(task.id, "click here") + pynts_url = '%s'%(task.id, "click here") reviewer_url = '%s'%(requested_by.id, requested_by.username) admin_url = '%s'%(sent_from.id, sent_from.username) user_url = '%s'%(receiving_user.id, receiving_user.username) if reply: - notification.sub = "Approved request for assign of credits for %s"%task.title[:20] + notification.sub = "Approved request for assign of pynts for %s"%task.title[:20] notification.message = """ Request made by %s to assign %s pynts to %s for the task %s has been approved by %s
- %s if you want the view/assign pynts page of the task.
"""%(reviewer_url, pynts, user_url, task_url, admin_url, credits_url) + %s if you want the view/assign pynts page of the task.
"""%(reviewer_url, pynts, user_url, task_url, admin_url, pynts_url) else: - notification.sub = "Rejected request for assign of credits for %s"%task.title[:20] + notification.sub = "Rejected request for assign of pynts for %s"%task.title[:20] notification.message = """ Request made by %s to assign %s pynts to %s for the task %s has been rejected by %s.
"""%(reviewer_url, pynts, user_url, task_url, admin_url) if remarks: notification.remarks = remarks @@ -177,7 +177,7 @@ notification.sub = "Your claim for the task %s accepted."%task.title[:20] notification.message = "You have been selected to work on the task %s by %s.
"%(task_url, assigned_by_url) - notification.message += "You can now start working on the task and will be credited by the reviewers for your work.
" + notification.message += "You can now start working on the task and will be pynted by the reviewers for your work.
" notification.message += " Here is a list of reviewers for the task and their email addresses.