Chris Johnston has proposed merging lp:~chrisjohnston/loco-directory/722570
into lp:loco-directory.
Requested reviews:
loco-directory-dev (loco-directory-dev)
Related bugs:
#722570 Poor wording if not a member of a LoCo Team
https://bugs.launchpad.net/bugs/722570
For more details, see:
https://code.launchpad.net/~chrisjohnston/loco-directory/722570/+merge/50844
Fixes problem described in bug as well as some other issues that were found.
--
https://code.launchpad.net/~chrisjohnston/loco-directory/722570/+merge/50844
Your team loco-directory-dev is requested to review the proposed merge of
lp:~chrisjohnston/loco-directory/722570 into lp:loco-directory.
=== modified file 'loco_directory/events/views.py'
--- loco_directory/events/views.py 2011-02-22 02:53:01 +0000
+++ loco_directory/events/views.py 2011-02-23 01:09:57 +0000
@@ -144,14 +144,14 @@
return render_to_response('events/team_event_delete_confirm.html', context, RequestContext(request))
else:
- request.user.message_set.create(message='%s %s' % (_('You can not remove this team event.'), _('You are not admin/owner of the Launchpad team or on the LoCo Council.')))
+ request.user.message_set.create(message='%s %s' % (_('You can not remove this team event.'), _('You are not an 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='%s %s' % (_('You can not add a new team event.'), _('You are not member of any of the LoCo Teams.')))
+ request.user.message_set.create(message='%s %s' % (_('You can not add a new team event.'), _('You are not a member of any LoCo Teams.')))
return redirect( 'event-list' )
elif len(teams) == 1:
from django.core import urlresolvers
@@ -219,7 +219,7 @@
context, RequestContext(request))
else:
# XXX: Once we move to a new ACL system, this needs fixing.
- request.user.message_set.create(message='%s %s' % (_('You can not add a new event for this team.'), _('You are not member of the team or on the LoCo Council.')))
+ request.user.message_set.create(message='%s %s' % (_('You can not add a new event for this team.'), _('You are not a member of the team or on the LoCo Council.')))
return redirect( team_object )
@login_required
@@ -254,7 +254,7 @@
context, RequestContext(request))
else:
# XXX: Once we move to a new ACL system, this needs fixing.
- request.user.message_set.create(message='%s %s' % (_('You can not add a new event for this team.'), _('You are not member of the team or on the LoCo Council.')))
+ request.user.message_set.create(message='%s %s' % (_('You can not add a new event for this team.'), _('You are not a member of the team or on the LoCo Council.')))
return redirect( team_object )
@login_required
@@ -288,7 +288,7 @@
return render_to_response('events/team_event_update.html',
context, RequestContext(request))
else:
- request.user.message_set.create(message='%s %s' % (_('You can not update this team event.'), _('You are not member of the team or on the LoCo Council.')))
+ request.user.message_set.create(message='%s %s' % (_('You can not update this team event.'), _('You are not a member of the team or on the LoCo Council.')))
return redirect( team_event_object )
@login_required
=== modified file 'loco_directory/meetings/views.py'
--- loco_directory/meetings/views.py 2011-02-22 02:53:01 +0000
+++ loco_directory/meetings/views.py 2011-02-23 01:09:57 +0000
@@ -127,14 +127,14 @@
return render_to_response('meetings/team_meeting_delete_confirm.html', context, RequestContext(request))
else:
- request.user.message_set.create(message='%s %s' % (_('You can not remove this team meeting.'), _('You are not admin/owner of the Launchpad team or on the LoCo Council.')))
+ request.user.message_set.create(message='%s %s' % (_('You can not remove this team meeting.'), _('You are not an admin/owner of the Launchpad team or on the LoCo Council.')))
return redirect( team_meeting_object )
@login_required
def team_meeting_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='%s %s' % (_('You can not remove this team meeting.'), _('You are not member of any of the LoCo Teams.')))
+ request.user.message_set.create(message='%s %s' % (_('You can not remove this team meeting.'), _('You are not a member of any LoCo Teams.')))
return redirect( 'meeting-list' )
elif len(teams) == 1:
from django.core import urlresolvers
@@ -197,7 +197,7 @@
context, RequestContext(request))
else:
# XXX: Once we move to a new ACL system, this needs fixing.
- request.user.message_set.create(message='%s %s' % (_('You can not add a new meeting for this team.'), _('You are not member of the team or on the LoCo Council.')))
+ request.user.message_set.create(message='%s %s' % (_('You can not add a new meeting for this team.'), _('You are not a member of the team or on the LoCo Council.')))
return redirect( team_object )
@login_required
@@ -232,7 +232,7 @@
context, RequestContext(request))
else:
# XXX: Once we move to a new ACL system, this needs fixing.
- request.user.message_set.create(message='%s %s' % (_('You can not add a new meeting for this team.'), _('You are not member of the team or on the LoCo Council.')))
+ request.user.message_set.create(message='%s %s' % (_('You can not add a new meeting for this team.'), _('You are not a member of the team or on the LoCo Council.')))
return redirect( team_object )
@login_required
@@ -266,7 +266,7 @@
return render_to_response('meetings/team_meeting_update.html',
context, RequestContext(request))
else:
- request.user.message_set.create(message='%s %s' % (_('You can not update this team meeting.'), _('You are not member of the team or on the LoCo Council.')))
+ request.user.message_set.create(message='%s %s' % (_('You can not update this team meeting.'), _('You are not a member of the team or on the LoCo Council.')))
return redirect( team_meeting_object )
@login_required
@@ -308,7 +308,7 @@
context, RequestContext(request))
else:
# XXX: Once we move to a new ACL system, this needs fixing.
- request.user.message_set.create(message='%s %s' % (_('You can not add a new agenda item for this team meeting.'), _('You are not member of the team or on the LoCo Council.')))
+ request.user.message_set.create(message='%s %s' % (_('You can not add a new agenda item for this team meeting.'), _('You are not a member of the team or on the LoCo Council.')))
return redirect( team_meeting_object )
@login_required
@@ -345,7 +345,7 @@
return render_to_response('meetings/agenda_item_update.html',
context, RequestContext(request))
else:
- request.user.message_set.create(message='%s %s' % (_('You can not update this team meeting agenda.'), _('You are not member of the team or on the LoCo Council.')))
+ request.user.message_set.create(message='%s %s' % (_('You can not update this team meeting agenda.'), _('You are not a member of the team or on the LoCo Council.')))
return redirect( team_meeting_object )
@login_required
@@ -376,5 +376,5 @@
return render_to_response('meetings/agenda_item_delete_confirm.html', context, RequestContext(request))
else:
- request.user.message_set.create(message='%s %s' % (_('You can not remove this agenda item.'), _('You are not admin/owner of the Launchpad team or on the LoCo Council.')))
+ request.user.message_set.create(message='%s %s' % (_('You can not remove this agenda item.'), _('You are not an admin/owner of the Launchpad team or on the LoCo Council.')))
return redirect( team_meeting_object )
_______________________________________________
Mailing list: https://launchpad.net/~loco-directory-dev
Post to : [email protected]
Unsubscribe : https://launchpad.net/~loco-directory-dev
More help : https://help.launchpad.net/ListHelp
