From 0bde2d238f429f2f6f14012ddd60cad34f83f8fc Mon Sep 17 00:00:00 2001
From: Imdad Ahad <imdad.ahad@digital.cabinet-office.gov.uk>
Date: Mon, 24 Oct 2016 13:38:55 +0100
Subject: [PATCH] Fix casing and multi-line stuff

---
 app/main/forms.py                  | 17 ++++++++++++-----
 app/main/views/service_settings.py |  8 ++++++--
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/app/main/forms.py b/app/main/forms.py
index 5c3d07e58..65a4c4828 100644
--- a/app/main/forms.py
+++ b/app/main/forms.py
@@ -346,11 +346,18 @@ class Feedback(Form):
 
 
 class RequestToGoLiveForm(Form):
-    channel = Stringfield('Are you sending emails or text messages or both?')
-    start_date = Stringfield('When will you be ready to start sending messages?')
-    start_volume = Stringfield('How many messages do you expect to send per month to start with? Give an estimate in numbers.')
-    peak_volume = Stringfield('Will the number of messages a month increase and when will that start? Give an estimate.')
-    upload_or_api = Stringfield('Are you uploading a list of contacts that you’re sending your message to, or are you integrating your system with ours?')  
+    channel = StringField('Are you sending emails or text messages or both?')
+    start_date = StringField('When will you be ready to start sending messages?')
+    start_volume = StringField(
+        'How many messages do you expect to send per month to start with? Give an estimate in numbers.'
+    )
+    peak_volume = StringField(
+        'Will the number of messages a month increase and when will that start? Give an estimate.'
+    )
+    upload_or_api = StringField(
+        'Are you uploading a list of contacts that you’re sending your message to, ' +
+        'or are you integrating your system with ours?'
+    )
 
 
 class ProviderForm(Form):
diff --git a/app/main/views/service_settings.py b/app/main/views/service_settings.py
index c4fdae628..a085fc556 100644
--- a/app/main/views/service_settings.py
+++ b/app/main/views/service_settings.py
@@ -110,7 +110,11 @@ def service_request_to_go_live(service_id):
             'department_id': current_app.config.get('DESKPRO_DEPT_ID'),
             'agent_team_id': current_app.config.get('DESKPRO_ASSIGNED_AGENT_TEAM_ID'),
             'subject': 'Request to go live',
-            'message': "On behalf of {} ({})\n\nExpected usage\n---\n\nChannel: {}\nStart date: {}\nStart volume: {}\nPeak volume: {}\nUpload or API: {}".format(
+            'message':
+            ('On behalf of {} ({})\n\nExpected usage\n---'
+            '\nChannel: {}\nStart date: {}\nStart volume: {}'
+            '\nPeak volume: {}\nUpload or API: {}')
+            .format(
                 current_service['name'],
                 url_for('main.service_dashboard', service_id=current_service['id'], _external=True),
                 form.channel.data,
@@ -118,7 +122,7 @@ def service_request_to_go_live(service_id):
                 form.start_volume.data,
                 form.peak_volume.data,
                 form.upload_or_api.data
-                
+
             )
         }
         headers = {