From 0e20ca44a3fdac4060a5b217d70ed9ca8d29a2a2 Mon Sep 17 00:00:00 2001
From: Leo Hemsted <leo.hemsted@digital.cabinet-office.gov.uk>
Date: Fri, 1 Feb 2019 16:31:34 +0000
Subject: [PATCH] rename branding to email_branding

to help transition to having letter branding as well
---
 app/main/forms.py                  | 10 +++++-----
 app/main/views/service_settings.py |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/main/forms.py b/app/main/forms.py
index 4cc423401..4c0c784f5 100644
--- a/app/main/forms.py
+++ b/app/main/forms.py
@@ -782,7 +782,7 @@ class RadioFieldWithRequiredMessage(RadioField):
             raise ValueError(self.required_message)
 
 
-class ServiceSetBranding(StripWhitespaceForm):
+class ServiceSetEmailBranding(StripWhitespaceForm):
 
     branding_style = RadioFieldWithNoneOption(
         'Branding style',
@@ -793,14 +793,14 @@ class ServiceSetBranding(StripWhitespaceForm):
 
     DEFAULT = (FieldWithNoneOption.NONE_OPTION_VALUE, 'GOV.UK')
 
-    def __init__(self, all_email_brandings, current_email_branding):
+    def __init__(self, all_branding_options, current_branding):
 
-        super().__init__(branding_style=current_email_branding)
+        super().__init__(branding_style=current_branding)
 
         self.branding_style.choices = sorted(
-            all_email_brandings + [self.DEFAULT],
+            all_branding_options + [self.DEFAULT],
             key=lambda branding: (
-                branding[0] != current_email_branding,
+                branding[0] != current_branding,
                 branding[0] is not self.DEFAULT[0],
                 branding[1].lower(),
             ),
diff --git a/app/main/views/service_settings.py b/app/main/views/service_settings.py
index ed8c5a5a4..4f5371417 100644
--- a/app/main/views/service_settings.py
+++ b/app/main/views/service_settings.py
@@ -45,7 +45,7 @@ from app.main.forms import (
     ServiceLetterContactBlockForm,
     ServicePreviewBranding,
     ServiceReplyToEmailForm,
-    ServiceSetBranding,
+    ServiceSetEmailBranding,
     ServiceSmsSenderForm,
     ServiceSwitchChannelForm,
     SMSPrefixForm,
@@ -759,9 +759,9 @@ def set_free_sms_allowance(service_id):
 def service_set_email_branding(service_id):
     email_branding = email_branding_client.get_all_email_branding()
 
-    form = ServiceSetBranding(
-        all_email_brandings=get_branding_as_value_and_label(email_branding),
-        current_email_branding=current_service.email_branding_id,
+    form = ServiceSetEmailBranding(
+        all_branding_options=get_branding_as_value_and_label(email_branding),
+        current_branding=current_service.email_branding_id,
     )
 
     if form.validate_on_submit():