# HG changeset patch
# User Lennard de Rijk <ljvderijk@gmail.com>
# Date 1231346956 0
# Node ID 0b1beae179f5019218311e80ffb925852c8cbe8e
# Parent  eb2e69312953a2761c8802f88425cf8b7b4832cc
Typo and style fixes.

Patch by: Pawel Solyga and Lennard de Rijk

diff -r eb2e69312953 -r 0b1beae179f5 app/gsoc/models/timeline.py
--- a/app/gsoc/models/timeline.py	Tue Jan 06 21:21:09 2009 +0000
+++ b/app/gsoc/models/timeline.py	Wed Jan 07 16:49:16 2009 +0000
@@ -14,7 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""This module contains the Timeline Model."""
+"""This module contains the Timeline Model.
+"""
 
 __authors__ = [
   '"Sverre Rabbelier" <sverre@rabbelier.nl>',
@@ -27,12 +28,13 @@
 
 import soc.models.timeline
 
+
 class Timeline(soc.models.timeline.Timeline):
   """The GSoC Timeline Model.
   """
 
-  accepted_organisation_announced_deadline = db.DateTimeProperty(
-      verbose_name=ugettext_lazy('Accepted Organisations Announced Deadline'))
+  accepted_organization_announced_deadline = db.DateTimeProperty(
+      verbose_name=ugettext_lazy('Accepted Organizations Announced Deadline'))
 
   application_review_deadline = db.DateTimeProperty(
       verbose_name=ugettext_lazy('Application Review Deadline'))
@@ -47,7 +49,7 @@
       verbose_name=ugettext_lazy('Community Bonding Period Start date'))
 
   bonding_end = db.DateTimeProperty(
-      verbose_name=ugettext_lazy('Community Bonding Period Start date'))
+      verbose_name=ugettext_lazy('Community Bonding Period End date'))
 
   coding_start = db.DateTimeProperty(
       verbose_name=ugettext_lazy('Coding Start date'))
@@ -56,7 +58,7 @@
       verbose_name=ugettext_lazy('Coding End date'))
 
   suggested_coding_deadline = db.DateTimeProperty(
-      verbose_name=ugettext_lazy('Suggested Coding End date'))
+      verbose_name=ugettext_lazy('Suggested Coding Deadline'))
 
   midterm_survey_start = db.DateTimeProperty(
       verbose_name=ugettext_lazy('Midterm Survey Start date'))
@@ -71,7 +73,7 @@
       verbose_name=ugettext_lazy('Final Survey End date'))
 
   mentor_summit_start = db.DateTimeProperty(
-      verbose_name=ugettext_lazy('Mentor Summit End date'))
+      verbose_name=ugettext_lazy('Mentor Summit Start date'))
 
   mentor_summit_end = db.DateTimeProperty(
       verbose_name=ugettext_lazy('Mentor Summit End date'))
diff -r eb2e69312953 -r 0b1beae179f5 app/soc/logic/models/timeline.py
--- a/app/soc/logic/models/timeline.py	Tue Jan 06 21:21:09 2009 +0000
+++ b/app/soc/logic/models/timeline.py	Wed Jan 07 16:49:16 2009 +0000
@@ -28,7 +28,7 @@
 
 
 class Logic(base.Logic):
-  """Logic methods for the Timeline model
+  """Logic methods for the Timeline model.
   """
 
   def __init__(self, model=soc.models.timeline.Timeline,
diff -r eb2e69312953 -r 0b1beae179f5 app/soc/models/program.py
--- a/app/soc/models/program.py	Tue Jan 06 21:21:09 2009 +0000
+++ b/app/soc/models/program.py	Wed Jan 07 16:49:16 2009 +0000
@@ -14,7 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""This module contains the Program Model."""
+"""This module contains the Program Model.
+"""
 
 __authors__ = [
   '"Sverre Rabbelier" <sverre@rabbelier.nl>',
@@ -62,9 +63,9 @@
   #: Required field storing the type of workflow this program has
   workflow = db.StringProperty(required=True,
       choices=['gsoc', 'ghop'],
-      verbose_name= ugettext_lazy('Type of workflow'))
-  workflow.example_text = ugettext_lazy('Project-based for GSoC type workflow, ' 
-      'task-based for GHOP type workflow')
+      verbose_name= ugettext_lazy('Workflow type'))
+  workflow.example_text = ugettext_lazy('Project-based for GSoC workflow type, ' 
+      'task-based for GHOP workflow type')
 
   #: Required 1:1 relationship indicating the Program the Timeline
   #: belongs to.
diff -r eb2e69312953 -r 0b1beae179f5 app/soc/models/timeline.py
--- a/app/soc/models/timeline.py	Tue Jan 06 21:21:09 2009 +0000
+++ b/app/soc/models/timeline.py	Wed Jan 07 16:49:16 2009 +0000
@@ -14,7 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""This module contains the Timeline Model."""
+"""This module contains the Timeline Model.
+"""
 
 __authors__ = [
   '"Sverre Rabbelier" <sverre@rabbelier.nl>',
@@ -32,10 +33,10 @@
   """The Timeline Model, representing the timeline for a Program.
   """
 
-  program_start_data = db.DateTimeProperty(
+  program_start = db.DateTimeProperty(
       verbose_name=ugettext_lazy('Program Start date'))
 
-  program_end_data = db.DateTimeProperty(
+  program_end = db.DateTimeProperty(
       verbose_name=ugettext_lazy('Program End date'))
 
   org_signup_start = db.DateTimeProperty(
diff -r eb2e69312953 -r 0b1beae179f5 app/soc/views/models/program.py
--- a/app/soc/views/models/program.py	Tue Jan 06 21:21:09 2009 +0000
+++ b/app/soc/views/models/program.py	Wed Jan 07 16:49:16 2009 +0000
@@ -97,7 +97,7 @@
       fields['timeline'] = entity.timeline
     
   def _createTimelineForType(self, type):
-    """Creates and stores a timeline model for the given type of program
+    """Creates and stores a timeline model for the given type of program.
     """
     
     timelines = {'gsoc' : gsoc.models.timeline.Timeline(),