Chris Johnston has proposed merging lp:~chrisjohnston/loco-directory/728108
into lp:loco-directory.
Requested reviews:
loco-directory-dev (loco-directory-dev)
Related bugs:
#728108 Change the help text for starting and ending times
https://bugs.launchpad.net/bugs/728108
For more details, see:
https://code.launchpad.net/~chrisjohnston/loco-directory/728108/+merge/51980
--
https://code.launchpad.net/~chrisjohnston/loco-directory/728108/+merge/51980
Your team loco-directory-dev is requested to review the proposed merge of
lp:~chrisjohnston/loco-directory/728108 into lp:loco-directory.
=== modified file 'loco_directory/events/models.py'
--- loco_directory/events/models.py 2011-02-23 00:50:39 +0000
+++ loco_directory/events/models.py 2011-03-02 23:12:33 +0000
@@ -18,8 +18,8 @@
a simple basic 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)
+ date_begin = models.DateTimeField(help_text=_('Local date and time the event starts'), verbose_name=_('Begins'), db_index=True)
+ date_end = models.DateTimeField(help_text=_('Local date and time the event ends'), verbose_name=_('Ends'), db_index=True)
description = models.TextField(help_text=_('Description of the Event'), 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)
=== modified file 'loco_directory/meetings/models.py'
--- loco_directory/meetings/models.py 2011-02-03 16:53:41 +0000
+++ loco_directory/meetings/models.py 2011-03-02 23:12:33 +0000
@@ -11,8 +11,8 @@
a simple basic meeting
"""
name = models.CharField(max_length=150, verbose_name=_('Meeting Name'))
- date_begin = models.DateTimeField(help_text=_('start date and local time of the meeting in UTC'), verbose_name=_('Begins'), db_index=True)
- date_end = models.DateTimeField(help_text=_('end date and local time of the meeting in UTC'), verbose_name=_('Ends'), db_index=True)
+ date_begin = models.DateTimeField(help_text=_('start date and time of the meeting in UTC'), verbose_name=_('Begins'), db_index=True)
+ date_end = models.DateTimeField(help_text=_('end date and time of the meeting in UTC'), verbose_name=_('Ends'), db_index=True)
channel = models.CharField(max_length=150, verbose_name=_('Meeting Channel'), help_text=_('Channel that the meeting will be held in. Include #'), null=True)
logs = models.URLField(verbose_name=_('Meeting Log'), help_text=_('After the meeting, add a link to the meeting log'), max_length=200, verify_exists=False, blank=True, null=True)
minutes = models.URLField(verbose_name=_('Meeting Minutes'), help_text=_('After the meeting, add a link to the meeting minutes'), max_length=200, verify_exists=False, blank=True, null=True)
_______________________________________________
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
