Merge lp:~cjohnston/loco-team-portal/bugfix-lp-539919 into lp:loco-team-portal

Proposed by Chris Johnston
Status: Merged
Merged at revision: not available
Proposed branch: lp:~cjohnston/loco-team-portal/bugfix-lp-539919
Merge into: lp:loco-team-portal
Diff against target: 32 lines (+4/-4)
2 files modified
loco_directory/events/models.py (+2/-2)
loco_directory/locale/loco-directory.pot (+2/-2)
To merge this branch: bzr merge lp:~cjohnston/loco-team-portal/bugfix-lp-539919
Reviewer Review Type Date Requested Status
Dave Walker Approve
Michael Hall (community) Approve
Review via email: mp+21757@code.launchpad.net

Description of the change

Added changes to .pot

To post a comment you must log in.
Revision history for this message
Michael Hall (mhall119) wrote :

I like this wording much better. Are there any objections to it?

review: Approve
Revision history for this message
Dave Walker (davewalker) wrote :

Great work chris, merging now.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'loco_directory/events/models.py'
--- loco_directory/events/models.py 2010-03-16 22:41:14 +0000
+++ loco_directory/events/models.py 2010-03-19 22:49:24 +0000
@@ -146,8 +146,8 @@
146 146
147 team_event = models.ForeignKey(TeamEvent, help_text=_('the Team Event'))147 team_event = models.ForeignKey(TeamEvent, help_text=_('the Team Event'))
148 attendee = models.ForeignKey(User, help_text=_('the name of the attendee'))148 attendee = models.ForeignKey(User, help_text=_('the name of the attendee'))
149 promise = models.CharField(help_text=_('how safe do you come'), max_length=50, choices=ATTENDEE_PROMISE_CHOICES)149 promise = models.CharField(verbose_name=_('Attending Status'), max_length=50, choices=ATTENDEE_PROMISE_CHOICES)
150 guests = models.PositiveSmallIntegerField(help_text=_('the number of guests coming with attendee'))150 guests = models.PositiveSmallIntegerField(verbose_name=_('Additional Guests'))
151 151
152 def __unicode__(self):152 def __unicode__(self):
153 return self.attendee153 return self.attendee
154154
=== modified file 'loco_directory/locale/loco-directory.pot'
--- loco_directory/locale/loco-directory.pot 2010-03-17 08:34:44 +0000
+++ loco_directory/locale/loco-directory.pot 2010-03-19 22:49:24 +0000
@@ -113,11 +113,11 @@
113msgstr ""113msgstr ""
114114
115#: events/models.py:149115#: events/models.py:149
116msgid "how safe do you come"116msgid "Attending Status"
117msgstr ""117msgstr ""
118118
119#: events/models.py:150119#: events/models.py:150
120msgid "the number of guests coming with attendee"120msgid "Additional Guests"
121msgstr ""121msgstr ""
122122
123#: events/views.py:121123#: events/views.py:121

Subscribers

People subscribed via source and target branches