Changeset a50f67b

Timestamp:

Oct 6, 2012, 8:04:31 PM (13 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, space-access, stable, stage

Children:

670a2bd

Parents:

826a126

git-author:

Alex Dehnert <adehnert@…> (10/06/12 20:04:31)

git-committer:

Alex Dehnert <adehnert@…> (10/06/12 20:04:31)

Message:

Clearer terms for confirming membership (ASA-#151)

File:

• asadb/forms/views.py (modified) (1 diff)

asadb/forms/views.py

@@ -399 +399 @@
             if group in update_obj.groups.all():
                 update_obj.groups.remove(group)
-                message = "You have been successfully removed from %s." % (group, )
+                message = "You have successfully unconfirmed membership in %s." % (group, )
             else:
-                message = "Sorry, but you're not in %s." % (group, )
+                message = "Removal failed because you had not confirmed membership in %s." % (group, )
                 message_type = "warn"
         elif request.POST['action'] == 'add':
             if group in update_obj.groups.all():
-                message = "Sorry, but you're already in %s." % (group, )
+                message = "Membership in %s already confirmed." % (group, )
                 message_type = "warn"
             else:
                 update_obj.groups.add(group)
-                message = "You have been successfully added to %s." % (group, )
+                message = "You have successfully confirmed membership in %s." % (group, )
         else:
             message = "Uh, somehow you tried to do something besides adding and removing..."