Merge lp:~dholbach/loco-team-portal/570616 into lp:loco-team-portal

[Daniel Holbach]

[Michael Hall (mhall119)]

Looks good

review: Approve

=== modified file 'loco_directory/events/views.py'
--- loco_directory/events/views.py	2010-05-04 06:46:59 +0000
+++ loco_directory/events/views.py	2010-05-31 10:19:24 +0000
@@ -118,21 +118,21 @@
     if is_on_lc or is_contact:
         if request.method == 'POST':		
             team_event_object.delete()
-            request.user.message_set.create(message=_('Team Event removed'))
+            request.user.message_set.create(message=_('Team Event removed.'))
             return redirect( 'event-list' )
         else:
             context = {'team_event_object': team_event_object}
             return render_to_response('events/team_event_delete_confirm.html', context, RequestContext(request))
 
     else:
-        request.user.message_set.create(message=_('You can not remove this team event.'))
+        request.user.message_set.create(message=_('You can not remove this team event. You are not admin/owner of the Launchpad team or on the LoCo Council.'))
         return redirect( team_event_object )
 
 @login_required
 def team_event_select(request):
     teams = Team.objects.filter(lp_name__in=[g.name for g in request.user.groups.all()])
     if len(teams) == 0:
-        request.user.message_set.create(message=_('You can not add a new team event'))
+        request.user.message_set.create(message=_('You can not add a new team event. You are not member of any of the LoCo Teams.'))
         return redirect( 'event-list' )
     elif len(teams) == 1:
         return redirect('team-event-new', teams[0].lp_name)
@@ -178,7 +178,7 @@
             if form.is_valid():
                 team_event = form.save()
                 team_event.teams.add(team_object)
-                request.user.message_set.create(message=_('New event created'))
+                request.user.message_set.create(message=_('New event created.'))
                 return redirect( team_object )
         else:
             form = TeamEventForm()
@@ -190,7 +190,8 @@
         return render_to_response('events/team_event_new.html', 
                                          context, RequestContext(request))
     else:
-        request.user.message_set.create(message=_('You can not add a new event for this team.'))
+        # XXX: Once we move to a new ACL system, this needs fixing.
+        request.user.message_set.create(message=_('You can not add a new event for this team. You are not member of the team or on the LoCo Council.'))
         return redirect( team_object )
 
 @login_required
@@ -213,7 +214,7 @@
             form = TeamEventForm(data=request.POST, instance=team_event_object)
             if form.is_valid():
                 form.save()
-                request.user.message_set.create(message=_('Team Event updated'))
+                request.user.message_set.create(message=_('Team Event updated.'))
                 return redirect( team_event_object )
         else:
             form = TeamEventForm(instance=team_event_object)
@@ -224,7 +225,7 @@
         return render_to_response('events/team_event_update.html', 
                                          context, RequestContext(request))
     else:
-        request.user.message_set.create(message=_('You can not update this team event.'))
+        request.user.message_set.create(message=_('You can not update this team event. You are not member of the team or on the LoCo Council.'))
         return redirect( team_event_object )
 
 @login_required
@@ -242,7 +243,7 @@
         form = AttendeeRegistrationForm(instance=attendee_object, data=request.POST)
         if form.is_valid():
             form.save()
-            request.user.message_set.create(message=_('Your registration has been saved'))
+            request.user.message_set.create(message=_('Your registration has been saved.'))
             return redirect( team_event_object )
     else:
         form = AttendeeRegistrationForm(instance=attendee_object, initial={'guests':0})
@@ -310,13 +311,13 @@
     if is_on_lc:
         if request.method == 'POST':		
             global_event_object.delete()
-            request.user.message_set.create(message=_('Global Event removed'))
+            request.user.message_set.create(message=_('Global Event removed.'))
             return redirect( 'event-list' )
         else:
             context = {'global_event_object': global_event_object}
             return render_to_response('events/global_event_delete_confirm.html', context, RequestContext(request))
     else:
-        request.user.message_set.create(message=_('You can not remove this global event.'))
+        request.user.message_set.create(message=_('You can not remove this global event. You are not on the LoCo Council.'))
         return redirect( global_event_object )
 
 @login_required
@@ -330,7 +331,7 @@
             form = GlobalEventForm(data=request.POST)
             if form.is_valid():
                 form.save()
-                request.user.message_set.create(message=_('New Global Event created'))
+                request.user.message_set.create(message=_('New Global Event created.'))
                 return redirect( 'event-list' )
         else:
             form = GlobalEventForm()
@@ -341,7 +342,7 @@
         return render_to_response('events/global_event_new.html', 
                                          context, RequestContext(request))
     else:
-        request.user.message_set.create(message=_('You can not add a new global event.'))
+        request.user.message_set.create(message=_('You can not add a new global event. You are not on the LoCo Council.'))
         return redirect( 'event-list' )
 
 @login_required
@@ -357,7 +358,7 @@
             form = GlobalEventForm(data=request.POST, instance=global_event_object)
             if form.is_valid():
                 form.save()
-                request.user.message_set.create(message=_('Global Event updated'))
+                request.user.message_set.create(message=_('Global Event updated.'))
                 return redirect( global_event_object )
         else:
             form = GlobalEventForm(instance=global_event_object)
@@ -368,7 +369,7 @@
         return render_to_response('events/global_event_update.html', 
                                          context, RequestContext(request))
     else:
-        request.user.message_set.create(message=_('You can not update this global event.'))
+        request.user.message_set.create(message=_('You can not update this global event. You are not on the LoCo Council.'))
         return redirect( global_event_object )
 
 

=== modified file 'loco_directory/locale/loco-directory.pot'
--- loco_directory/locale/loco-directory.pot	2010-05-28 13:41:32 +0000
+++ loco_directory/locale/loco-directory.pot	2010-05-31 10:19:24 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-28 13:41+0000\n"
+"POT-Creation-Date: 2010-05-31 10:16+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -126,63 +126,71 @@
 msgstr ""
 
 #: events/views.py:121
-msgid "Team Event removed"
+msgid "Team Event removed."
 msgstr ""
 
 #: events/views.py:128
-msgid "You can not remove this team event."
+msgid ""
+"You can not remove this team event. You are not admin/owner of the Launchpad "
+"team or on the LoCo Council."
 msgstr ""
 
 #: events/views.py:135
-msgid "You can not add a new team event"
+msgid ""
+"You can not add a new team event. You are not member of any of the LoCo "
+"Teams."
 msgstr ""
 
 #: events/views.py:181
-msgid "New event created"
-msgstr ""
-
-#: events/views.py:193
-msgid "You can not add a new event for this team."
-msgstr ""
-
-#: events/views.py:216
-msgid "Team Event updated"
-msgstr ""
-
-#: events/views.py:227
-msgid "You can not update this team event."
-msgstr ""
-
-#: events/views.py:245
-msgid "Your registration has been saved"
-msgstr ""
-
-#: events/views.py:271
+msgid "New event created."
+msgstr ""
+
+#: events/views.py:194
+msgid ""
+"You can not add a new event for this team. You are not member of the team or "
+"on the LoCo Council."
+msgstr ""
+
+#: events/views.py:217
+msgid "Team Event updated."
+msgstr ""
+
+#: events/views.py:228
+msgid ""
+"You can not update this team event. You are not member of the team or on the "
+"LoCo Council."
+msgstr ""
+
+#: events/views.py:246
+msgid "Your registration has been saved."
+msgstr ""
+
+#: events/views.py:272
 msgid "Comment saved."
 msgstr ""
 
-#: events/views.py:313
-msgid "Global Event removed"
-msgstr ""
-
-#: events/views.py:319
-msgid "You can not remove this global event."
-msgstr ""
-
-#: events/views.py:333
-msgid "New Global Event created"
-msgstr ""
-
-#: events/views.py:344
-msgid "You can not add a new global event."
-msgstr ""
-
-#: events/views.py:360
-msgid "Global Event updated"
-msgstr ""
-
-#: events/views.py:371
-msgid "You can not update this global event."
+#: events/views.py:314
+msgid "Global Event removed."
+msgstr ""
+
+#: events/views.py:320
+msgid "You can not remove this global event. You are not on the LoCo Council."
+msgstr ""
+
+#: events/views.py:334
+msgid "New Global Event created."
+msgstr ""
+
+#: events/views.py:345
+msgid "You can not add a new global event. You are not on the LoCo Council."
+msgstr ""
+
+#: events/views.py:361
+msgid "Global Event updated."
+msgstr ""
+
+#: events/views.py:372
+msgid "You can not update this global event. You are not on the LoCo Council."
 msgstr ""
 
 #: teams/forms.py:22 templates/teams/team_list.html:18