Chris Johnston has proposed merging lp:~chrisjohnston/loco-directory/wording
into lp:loco-directory.
Requested reviews:
loco-directory-dev (loco-directory-dev)
For more details, see:
https://code.launchpad.net/~chrisjohnston/loco-directory/wording/+merge/65283
--
https://code.launchpad.net/~chrisjohnston/loco-directory/wording/+merge/65283
Your team loco-directory-dev is requested to review the proposed merge of
lp:~chrisjohnston/loco-directory/wording into lp:loco-directory.
=== modified file 'loco_directory/events/models.py'
--- loco_directory/events/models.py 2011-06-17 17:10:41 +0000
+++ loco_directory/events/models.py 2011-06-21 00:02:32 +0000
@@ -20,10 +20,10 @@
a simple basic event
"""
name = models.CharField(max_length=150, verbose_name=_('Event Name'))
- 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)
+ date_begin = models.DateTimeField(help_text=_('Local date and time that the event starts'), verbose_name=_('Begins'), db_index=True)
+ date_end = models.DateTimeField(help_text=_('Local date and time that 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)
+ announce = models.URLField(verbose_name=_('Announcement'), help_text=_('URL for 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):
@@ -121,7 +121,7 @@
"""
a event of one or more teams
"""
- teams = models.ManyToManyField(Team, help_text=_('teams of this event.'), verbose_name=_('Teams Participating'), db_index=True)
+ teams = models.ManyToManyField(Team, help_text=_('teams planning 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 for the Event'), verbose_name=_('Event Venue'), blank=True, null=True)
channel = models.CharField(help_text=_('Channel for the Event hosted on the freenode IRC network. Ex. #ubuntu-us-fl'), max_length=25, verbose_name=_('Event Channel'), blank=True, null=True)
@@ -195,7 +195,7 @@
a model for comments about a team event
"""
team_event = models.ForeignKey(TeamEvent, help_text=_('the Team Event'))
- date_created = models.DateTimeField(help_text=_('the date and time when the event comment was created'), default=datetime.datetime.now(), db_index=True)
+ date_created = models.DateTimeField(help_text=_('Comment date and time'), default=datetime.datetime.now(), db_index=True)
commenter_profile = models.ForeignKey(UserProfile, null=True)
comment = models.TextField(help_text=_('Enter your comment for this event.'), db_index=True)
=== modified file 'loco_directory/meetings/models.py'
--- loco_directory/meetings/models.py 2011-06-17 17:10:41 +0000
+++ loco_directory/meetings/models.py 2011-06-21 00:02:32 +0000
@@ -13,9 +13,9 @@
a simple basic meeting
"""
name = models.CharField(max_length=150, verbose_name=_('Meeting Name'))
- 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)
+ date_begin = models.DateTimeField(help_text=_('Local date and time that the meeting starts'), verbose_name=_('Begins'), db_index=True)
+ date_end = models.DateTimeField(help_text=_('Local date and time that the meeting ends'), 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. Ex. #ubuntu-us-fl'), 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)
date_created = models.DateTimeField(help_text=_('the date and time when the event was created'), default=datetime.datetime.now(), db_index=True)
@@ -74,7 +74,7 @@
"""
a meeting of one or more teams
"""
- teams = models.ManyToManyField(Team, help_text=_('teams of this meeting.'), verbose_name=_('Teams Participating'), db_index=True)
+ teams = models.ManyToManyField(Team, help_text=_('team planning this meeting.'), verbose_name=_('Teams Participating'), db_index=True)
meeting_tz = models.CharField(max_length=32, verbose_name=_('Timezone'), default='', choices=[('team', 'Team Default')]+[(tz, tz) for tz in pytz.all_timezones], blank=False, null=False)
template = 'meetings/team_meeting_li.inc.html'
@@ -157,13 +157,13 @@
ordering = ('parent__id', 'order', 'created_date')
meeting = models.ForeignKey(BaseMeeting, verbose_name=_('Meeting'), related_name='agenda', help_text=_('meeting during which this agenda item is to be discussed'))
- title = models.CharField(verbose_name=_('Title'), max_length = 150, help_text=_('descriptive name for this item'))
- owner = models.ForeignKey(UserProfile, verbose_name=_('Owner'), help_text=_('person proposing or responsible for this item'))
- created_date = models.DateTimeField(verbose_name=_('Created Date'), auto_now_add=True, help_text=_('timestamp of when this item was created'))
- description = models.TextField(verbose_name=_('Description'), help_text=_('detailed description of this item'), blank=True, null=True)
- parent = models.ForeignKey('self', verbose_name=_('Parent Agenda Item'), related_name='children', help_text=_('agenda item that contains this item'), blank=True, null=True)
- order = models.PositiveIntegerField(verbose_name=_('Order'), help_text=_('index number of where this item falls in the agenda'), default=1)
- log = models.URLField(verbose_name=_('Log URL'), max_length=200, verify_exists=False, help_text=_('URL to this item\'s discussion'), blank=True, null=True)
+ title = models.CharField(verbose_name=_('Title'), max_length = 150, help_text=_('descriptive name for this agenda item'))
+ owner = models.ForeignKey(UserProfile, verbose_name=_('Owner'), help_text=_('person proposing or responsible for this agenda item'))
+ created_date = models.DateTimeField(verbose_name=_('Created Date'), auto_now_add=True, help_text=_('timestamp of when this agenda item was created'))
+ description = models.TextField(verbose_name=_('Description'), help_text=_('detailed description of this agenda item'), blank=True, null=True)
+ parent = models.ForeignKey('self', verbose_name=_('Parent Agenda Item'), related_name='children', help_text=_('agenda item that contains this agenda item'), blank=True, null=True)
+ order = models.PositiveIntegerField(verbose_name=_('Order'), help_text=_('index number of where this agenda item falls in the agenda'), default=1)
+ log = models.URLField(verbose_name=_('Log URL'), max_length=200, verify_exists=False, help_text=_('URL to this agenda item\'s discussion'), blank=True, null=True)
objects = AgendaItemManager()
_______________________________________________
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
