LoCo Team Portal

Merge lp:~mhall119/loco-team-portal/fix-510198 into lp:loco-team-portal

  1. fix-510198
  2. Merge into 0.2
Proposed by Michael Hall
Status: Merged
Merged at revision: not available
Proposed branch: lp:~mhall119/loco-team-portal/fix-510198
Merge into: lp:loco-team-portal
Prerequisite: lp:~mhall119/loco-team-portal/team-events-rss
Diff against target: 182 lines (+20/-20)
3 files modified
loco_directory/events/views.py (+15/-15)
loco_directory/teams/views.py (+3/-3)
loco_directory/venues/views.py (+2/-2)
To merge this branch: bzr merge lp:~mhall119/loco-team-portal/fix-510198
Reviewer Review Type Date Requested Status
LoCo Team Portal Developers Pending
Review via email: mp+17760@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Michael Hall (mhall119) wrote :

For some reason, the translation's proxy object for the user.message_set message isn't being converted into a character string before being bound to the query. Wrapping all messages we pass to user.message_set.create in unicode() will pass the translated text as a unicode string rather than a proxy object.

The only drawback I can see from this is that we force the loading of the translation when we're passing it to message_set, but it would always get loaded very shortly thereafter anyway, so I don't see any real harm in doing this.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'loco_directory/events/views.py'
2--- loco_directory/events/views.py 2010-01-20 17:06:18 +0000
3+++ loco_directory/events/views.py 2010-01-20 17:06:18 +0000
4@@ -118,21 +118,21 @@
5 if is_on_lc or is_contact:
6 if request.method == 'POST':
7 team_event_object.delete()
8- request.user.message_set.create(message=_('Team Event removed'))
9+ request.user.message_set.create(message=unicode(_('Team Event removed')))
10 return redirect( 'event-list' )
11 else:
12 context = {'team_event_object': team_event_object}
13 return render_to_response('events/team_event_delete_confirm.html', context, RequestContext(request))
14
15 else:
16- request.user.message_set.create(message=_('You can not remove this team event.'))
17+ request.user.message_set.create(message=unicode(_('You can not remove this team event.')))
18 return redirect( team_event_object )
19
20 @login_required
21 def team_event_select(request):
22 teams = Team.objects.filter(admins__lpid=request.user.username)
23 if len(teams) == 0:
24- request.user.message_set.create(message=_('You can not add a new team event'))
25+ request.user.message_set.create(message=unicode(_('You can not add a new team event')))
26 return redirect( 'event-list' )
27 elif len(teams) == 1:
28 return redirect('team-event-new', teams[0].lp_name)
29@@ -178,7 +178,7 @@
30 if form.is_valid():
31 team_event = form.save()
32 team_event.teams.add(team_object)
33- request.user.message_set.create(message=_('New event created'))
34+ request.user.message_set.create(message=unicode(_('New event created')))
35 return redirect( team_object )
36 else:
37 form = TeamEventForm()
38@@ -190,7 +190,7 @@
39 return render_to_response('events/team_event_new.html',
40 context, RequestContext(request))
41 else:
42- request.user.message_set.create(message=_('You can not add a new event for this team.'))
43+ request.user.message_set.create(message=unicode(_('You can not add a new event for this team.')))
44 return redirect( team_object )
45
46 @login_required
47@@ -211,7 +211,7 @@
48 form = TeamEventForm(data=request.POST, instance=team_event_object)
49 if form.is_valid():
50 form.save()
51- request.user.message_set.create(message=_('Team Event updated'))
52+ request.user.message_set.create(message=unicode(_('Team Event updated')))
53 return redirect( team_event_object )
54 else:
55 form = TeamEventForm(instance=team_event_object)
56@@ -222,7 +222,7 @@
57 return render_to_response('events/team_event_update.html',
58 context, RequestContext(request))
59 else:
60- request.user.message_set.create(message=_('You can not update this team event.'))
61+ request.user.message_set.create(message=unicode(_('You can not update this team event.')))
62 return redirect( team_event_object )
63
64 @login_required
65@@ -240,7 +240,7 @@
66 form = AttendeeRegistrationForm(instance=attendee_object, data=request.POST)
67 if form.is_valid():
68 form.save()
69- request.user.message_set.create(message=_('Your registration has been saved'))
70+ request.user.message_set.create(message=unicode(_('Your registration has been saved')))
71 return redirect( team_event_object )
72 else:
73 form = AttendeeRegistrationForm(instance=attendee_object, initial={'guests':0})
74@@ -266,7 +266,7 @@
75 team_event_comment.team_event = team_event_object
76 team_event_comment.comment_by = request.user
77 team_event_comment.save()
78- request.user.message_set.create(message=_('Comment saved.'))
79+ request.user.message_set.create(message=unicode(_('Comment saved.')))
80 return redirect( team_event_object )
81 else:
82 form = TeamEventCommentForm()
83@@ -308,13 +308,13 @@
84 if is_on_lc:
85 if request.method == 'POST':
86 global_event_object.delete()
87- request.user.message_set.create(message=_('Global Event removed'))
88+ request.user.message_set.create(message=unicode(_('Global Event removed')))
89 return redirect( 'event-list' )
90 else:
91 context = {'global_event_object': global_event_object}
92 return render_to_response('events/global_event_delete_confirm.html', context, RequestContext(request))
93 else:
94- request.user.message_set.create(message=_('You can not remove this global event.'))
95+ request.user.message_set.create(message=unicode(_('You can not remove this global event.')))
96 return redirect( global_event_object )
97
98 @login_required
99@@ -328,7 +328,7 @@
100 form = GlobalEventForm(data=request.POST)
101 if form.is_valid():
102 form.save()
103- request.user.message_set.create(message=_('New Global Event created'))
104+ request.user.message_set.create(message=unicode(_('New Global Event created')))
105 return redirect( 'event-list' )
106 else:
107 form = GlobalEventForm()
108@@ -339,7 +339,7 @@
109 return render_to_response('events/global_event_new.html',
110 context, RequestContext(request))
111 else:
112- request.user.message_set.create(message=_('You can not add a new global event.'))
113+ request.user.message_set.create(message=unicode(_('You can not add a new global event.')))
114 return redirect( 'event-list' )
115
116 @login_required
117@@ -355,7 +355,7 @@
118 form = GlobalEventForm(data=request.POST, instance=global_event_object)
119 if form.is_valid():
120 form.save()
121- request.user.message_set.create(message=_('Global Event updated'))
122+ request.user.message_set.create(message=unicode(_('Global Event updated')))
123 return redirect( global_event_object )
124 else:
125 form = GlobalEventForm(instance=global_event_object)
126@@ -366,7 +366,7 @@
127 return render_to_response('events/global_event_update.html',
128 context, RequestContext(request))
129 else:
130- request.user.message_set.create(message=_('You can not update this global event.'))
131+ request.user.message_set.create(message=unicode(_('You can not update this global event.')))
132 return redirect( global_event_object )
133
134
135
136=== modified file 'loco_directory/teams/views.py'
137--- loco_directory/teams/views.py 2010-01-18 14:41:22 +0000
138+++ loco_directory/teams/views.py 2010-01-20 17:06:18 +0000
139@@ -78,7 +78,7 @@
140 if not is_on_lc and not is_contact:
141 # FIXME: The message below should be translatable, but it breaks
142 # the <teams/<team>/edit links if you're not logged in.
143- request.user.message_set.create(message='You are not allowed to make changes to the team details.')
144+ request.user.message_set.create(message=unicode(_('You are not allowed to make changes to the team details.')))
145 return redirect( team_object )
146
147 if request.method == "POST":
148@@ -88,10 +88,10 @@
149 form = forms.UpdateTeamForm(data=request.POST, instance=team_object)
150 if form.is_valid():
151 form.save()
152- request.user.message_set.create(message=_('Team details updated'))
153+ request.user.message_set.create(message=unicode(_('Team details updated')))
154 return redirect( team_object )
155 else:
156- request.user.message_set.create(message=_('Team details could not be saved.'))
157+ request.user.message_set.create(message=unicode(_('Team details could not be saved.')))
158 else:
159 if is_on_lc:
160 form = forms.LoCoCouncilForm(instance=team_object)
161
162=== modified file 'loco_directory/venues/views.py'
163--- loco_directory/venues/views.py 2010-01-18 14:41:22 +0000
164+++ loco_directory/venues/views.py 2010-01-20 17:06:18 +0000
165@@ -50,7 +50,7 @@
166 form = VenueForm(data=request.POST)
167 if form.is_valid():
168 form.save()
169- request.user.message_set.create(message=_('New Venue created'))
170+ request.user.message_set.create(message=unicode(_('New Venue created')))
171 return HttpResponseRedirect( reverse( 'venue-list' ) )
172 else:
173 form = VenueForm()
174@@ -72,7 +72,7 @@
175 form = VenueForm(data=request.POST, instance=venue_object)
176 if form.is_valid():
177 form.save()
178- request.user.message_set.create(message=_('Venue updated'))
179+ request.user.message_set.create(message=unicode(_('Venue updated')))
180 return HttpResponseRedirect( reverse( 'venue-detail', args=[venue_object.id] ) )
181 else:
182 form = VenueForm(instance=venue_object)

Subscribers

People subscribed via source and target branches