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

[Chris Johnston]

Changes announce to announcement plus other changes.

=== modified file 'loco_directory/events/models.py'
--- loco_directory/events/models.py	2010-08-24 15:24:24 +0000
+++ loco_directory/events/models.py	2010-09-11 03:54:48 +0000
@@ -17,11 +17,11 @@
     """
     a simple basic event
     """
-    name = models.CharField(max_length=150, verbose_name=_('Name of the Event'))
+    name = models.CharField(max_length=150, verbose_name=_('Event Name'))
     date_begin = models.DateTimeField(help_text=_('start date and local time of the event'), verbose_name=_('Begins'), db_index=True)
     date_end = models.DateTimeField(help_text=_('end date and local time of the event'), verbose_name=_('Ends'), db_index=True)
     description = models.TextField(help_text=_('Description of the Event'), blank=True, null=True)
-    announce = models.URLField(help_text=_('URL to the announcement'), max_length=200, verify_exists=False, blank=True, null=True)
+    announce = models.URLField(verbose_name=_('Announcement'), help_text=_('URL to the announcement'), max_length=200, verify_exists=False, blank=True, null=True)
     date_created = models.DateTimeField(help_text=_('the date and time when the event was created'), default=datetime.datetime.now(), db_index=True)
 
     def __unicode__(self):
@@ -110,7 +110,7 @@
     """
     teams = models.ManyToManyField(Team, help_text=_('teams of this event.'), verbose_name=_('Teams Participating'), db_index=True)
     global_event = models.ForeignKey(GlobalEvent, help_text=_('this team event is part of the selected global event'), verbose_name=_('Related Global Event'), blank=True, null=True)
-    venue = models.ForeignKey(Venue, help_text=_('Venue of the Event'), verbose_name=_('Venue of the Event'), blank=True, null=True) 
+    venue = models.ForeignKey(Venue, help_text=_('Venue of the Event'), verbose_name=_('Event Venue'), blank=True, null=True) 
     def __unicode__(self):
         return "%s %s %s" % (self.name, self.venue, self.date_begin or "")