From 59f6b0b5d82f64e28c3db5ddcb8958ffd4267e5b Mon Sep 17 00:00:00 2001
From: Ben Thorner <ben.thorner@digital.cabinet-office.gov.uk>
Date: Fri, 25 Mar 2022 16:37:36 +0000
Subject: [PATCH] Replace "primary", etc. with "first", etc.

Using "primary" made sense when the other "secondary" provider was
new, but today we see them as equivalent and the terminology is a
bit confusing. In future we may add a third provider as well.
---
 app/main/views/providers.py                          | 12 ++++++------
 .../views/providers/edit-sms-provider-ratio.html     |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/main/views/providers.py b/app/main/views/providers.py
index 606db6f8d..cbdb581d7 100644
--- a/app/main/views/providers.py
+++ b/app/main/views/providers.py
@@ -73,19 +73,19 @@ def edit_sms_provider_ratio():
     if len(providers) < 2:
         abort(400)
 
-    primary_provider, secondary_provider = providers[0:2]
+    first_provider, second_provider = providers[0:2]
 
     if form.validate_on_submit():
-        provider_client.update_provider(primary_provider['id'], form.percentage_left)
-        provider_client.update_provider(secondary_provider['id'], form.percentage_right)
+        provider_client.update_provider(first_provider['id'], form.percentage_left)
+        provider_client.update_provider(second_provider['id'], form.percentage_right)
         return redirect(url_for('.edit_sms_provider_ratio'))
 
     return render_template(
         'views/providers/edit-sms-provider-ratio.html',
-        versions=_chunk_versions_by_day(_get_versions_since_switchover(primary_provider['id'])),
+        versions=_chunk_versions_by_day(_get_versions_since_switchover(first_provider['id'])),
         form=form,
-        primary_provider=providers[0]['display_name'],
-        secondary_provider=providers[1]['display_name'],
+        first_provider=providers[0]['display_name'],
+        second_provider=providers[1]['display_name'],
     )
 
 
diff --git a/app/templates/views/providers/edit-sms-provider-ratio.html b/app/templates/views/providers/edit-sms-provider-ratio.html
index 35b4c6208..e522d132b 100644
--- a/app/templates/views/providers/edit-sms-provider-ratio.html
+++ b/app/templates/views/providers/edit-sms-provider-ratio.html
@@ -22,10 +22,10 @@
         <div class="govuk-grid-column-two-thirds">
           <div class="history-list-percentage-without-border">
             <div class="history-list-percentage-left-label">
-              {{ primary_provider }}
+              {{ first_provider }}
             </div>
             <div class="history-list-percentage-right-label">
-              {{ secondary_provider }}
+              {{ second_provider }}
             </div>
             {% call form_wrapper() %}
               <div class="radio-slider" data-module="radio-slider">
@@ -71,11 +71,11 @@
             <div class="govuk-grid-column-two-thirds">
               <div class="history-list-percentage">
                 <div class="history-list-percentage-left-label">
-                  {{ primary_provider }}<br><br>
+                  {{ first_provider }}<br><br>
                   {{ version.priority|format_thousands }}%
                 </div>
                 <div class="history-list-percentage-right-label">
-                  {{ secondary_provider }}<br><br>
+                  {{ second_provider }}<br><br>
                   {{ (100 - version.priority)|format_thousands }}%
                 </div>
                 <div class="history-list-percentage-marker" style="left: {{ (100 -version.priority)|format_thousands }}%"></div>