From bf29da857ac261a5115c7646158f0e5be84a0d35 Mon Sep 17 00:00:00 2001
From: Kat <54268893+kosiakkatrina@users.noreply.github.com>
Date: Mon, 21 Oct 2024 12:24:36 +0100
Subject: [PATCH] Update year combo format

---
 app/helpers/filters_helper.rb                             | 4 ++--
 app/helpers/review_helper.rb                              | 2 +-
 app/helpers/tasklist_helper.rb                            | 2 +-
 app/models/bulk_upload.rb                                 | 2 +-
 app/models/forms/bulk_upload_lettings/checking_file.rb    | 2 +-
 app/models/forms/bulk_upload_lettings/needstype.rb        | 2 +-
 .../forms/bulk_upload_lettings/prepare_your_file.rb       | 2 +-
 app/models/forms/bulk_upload_lettings/upload_your_file.rb | 2 +-
 app/models/forms/bulk_upload_lettings/year.rb             | 2 +-
 app/models/forms/bulk_upload_sales/checking_file.rb       | 2 +-
 app/models/forms/bulk_upload_sales/prepare_your_file.rb   | 2 +-
 app/models/forms/bulk_upload_sales/upload_your_file.rb    | 2 +-
 app/models/forms/bulk_upload_sales/year.rb                | 2 +-
 app/models/validations/sales/setup_validations.rb         | 6 +-----
 app/models/validations/setup_validations.rb               | 6 +-----
 .../forms/prepare_your_file_2023.html.erb                 | 2 +-
 .../forms/prepare_your_file_2024.html.erb                 | 2 +-
 app/views/bulk_upload_lettings_results/show.html.erb      | 2 +-
 app/views/bulk_upload_lettings_results/summary.html.erb   | 2 +-
 app/views/bulk_upload_lettings_resume/chosen.html.erb     | 2 +-
 app/views/bulk_upload_lettings_resume/completed.html.erb  | 2 +-
 app/views/bulk_upload_lettings_resume/confirm.html.erb    | 2 +-
 .../bulk_upload_lettings_resume/deletion_report.html.erb  | 2 +-
 app/views/bulk_upload_lettings_resume/fix_choice.html.erb | 2 +-
 .../chosen.html.erb                                       | 2 +-
 .../confirm.html.erb                                      | 2 +-
 .../confirm_soft_errors.html.erb                          | 2 +-
 app/views/bulk_upload_sales_results/show.html.erb         | 2 +-
 app/views/bulk_upload_sales_results/summary.html.erb      | 2 +-
 app/views/bulk_upload_sales_resume/chosen.html.erb        | 2 +-
 app/views/bulk_upload_sales_resume/completed.html.erb     | 2 +-
 app/views/bulk_upload_sales_resume/confirm.html.erb       | 2 +-
 .../bulk_upload_sales_resume/deletion_report.html.erb     | 2 +-
 app/views/bulk_upload_sales_resume/fix_choice.html.erb    | 2 +-
 .../chosen.html.erb                                       | 2 +-
 .../confirm.html.erb                                      | 2 +-
 .../confirm_soft_errors.html.erb                          | 2 +-
 config/locales/en.yml                                     | 4 ++--
 config/locales/validations/sales/setup.en.yml             | 4 ++--
 .../bulk_upload_lettings_results_controller_spec.rb       | 4 ++--
 .../bulk_upload_lettings_resume_controller_spec.rb        | 8 ++++----
 ...oad_lettings_soft_validations_check_controller_spec.rb | 2 +-
 .../requests/bulk_upload_sales_results_controller_spec.rb | 2 +-
 spec/requests/bulk_upload_sales_resume_controller_spec.rb | 8 ++++----
 ...upload_sales_soft_validations_check_controller_spec.rb | 2 +-
 45 files changed, 55 insertions(+), 63 deletions(-)

diff --git a/app/helpers/filters_helper.rb b/app/helpers/filters_helper.rb
index e43614d45..36c493650 100644
--- a/app/helpers/filters_helper.rb
+++ b/app/helpers/filters_helper.rb
@@ -286,8 +286,8 @@ private
     end
   end
 
-  def year_combo(year)
-    "#{year}/#{year - 2000 + 1}"
+  def year_combo(year) 
+    "#{year} to #{year + 1}"
   end
 
   def formatted_years_filter(session_filters)
diff --git a/app/helpers/review_helper.rb b/app/helpers/review_helper.rb
index 87fb691eb..bf1d70d64 100644
--- a/app/helpers/review_helper.rb
+++ b/app/helpers/review_helper.rb
@@ -6,7 +6,7 @@ module ReviewHelper
       "You can review and make changes to this log until #{log.form.submission_deadline.to_formatted_s(:govuk_date)}.".html_safe
     else
       start_year = log.startdate ? collection_start_year_for_date(log.startdate) : log.form.start_date.year
-      "This log is from the #{start_year}/#{start_year + 1} collection window, which is now closed."
+      "This log is from the #{start_year} to #{start_year + 1} collection window, which is now closed."
     end
   end
 
diff --git a/app/helpers/tasklist_helper.rb b/app/helpers/tasklist_helper.rb
index bdc71b4ab..2caef019a 100644
--- a/app/helpers/tasklist_helper.rb
+++ b/app/helpers/tasklist_helper.rb
@@ -55,7 +55,7 @@ module TasklistHelper
     else
       start_year = log.startdate ? collection_start_year_for_date(log.startdate) : log.form.start_date.year
 
-      "This log is from the #{start_year}/#{start_year + 1} collection window, which is now closed."
+      "This log is from the #{start_year} to #{start_year + 1} collection window, which is now closed."
     end
   end
 
diff --git a/app/models/bulk_upload.rb b/app/models/bulk_upload.rb
index ad76c2192..93f661225 100644
--- a/app/models/bulk_upload.rb
+++ b/app/models/bulk_upload.rb
@@ -59,7 +59,7 @@ class BulkUpload < ApplicationRecord
   end
 
   def year_combo
-    "#{year}/#{year - 2000 + 1}"
+    "#{year} to #{year + 1}"
   end
 
   def end_year
diff --git a/app/models/forms/bulk_upload_lettings/checking_file.rb b/app/models/forms/bulk_upload_lettings/checking_file.rb
index 3b43cb269..2ce12df46 100644
--- a/app/models/forms/bulk_upload_lettings/checking_file.rb
+++ b/app/models/forms/bulk_upload_lettings/checking_file.rb
@@ -21,7 +21,7 @@ module Forms
       end
 
       def year_combo
-        "#{year}/#{year + 1 - 2000}"
+        "#{year} to #{year + 1}"
       end
 
       def save!
diff --git a/app/models/forms/bulk_upload_lettings/needstype.rb b/app/models/forms/bulk_upload_lettings/needstype.rb
index 32ed0acf3..b15c05b52 100644
--- a/app/models/forms/bulk_upload_lettings/needstype.rb
+++ b/app/models/forms/bulk_upload_lettings/needstype.rb
@@ -28,7 +28,7 @@ module Forms
       end
 
       def year_combo
-        "#{year}/#{year + 1 - 2000}"
+        "#{year} to #{year + 1}"
       end
 
       def save!
diff --git a/app/models/forms/bulk_upload_lettings/prepare_your_file.rb b/app/models/forms/bulk_upload_lettings/prepare_your_file.rb
index b66c1649f..d0a577ee1 100644
--- a/app/models/forms/bulk_upload_lettings/prepare_your_file.rb
+++ b/app/models/forms/bulk_upload_lettings/prepare_your_file.rb
@@ -41,7 +41,7 @@ module Forms
       end
 
       def year_combo
-        "#{year}/#{year + 1 - 2000}"
+        "#{year} to #{year + 1}"
       end
 
       def save!
diff --git a/app/models/forms/bulk_upload_lettings/upload_your_file.rb b/app/models/forms/bulk_upload_lettings/upload_your_file.rb
index 954c6e6e6..82b5c75d5 100644
--- a/app/models/forms/bulk_upload_lettings/upload_your_file.rb
+++ b/app/models/forms/bulk_upload_lettings/upload_your_file.rb
@@ -25,7 +25,7 @@ module Forms
       end
 
       def year_combo
-        "#{year}/#{year + 1 - 2000}"
+        "#{year} to #{year + 1}"
       end
 
       def next_path
diff --git a/app/models/forms/bulk_upload_lettings/year.rb b/app/models/forms/bulk_upload_lettings/year.rb
index 396b91a79..ca2e9c144 100644
--- a/app/models/forms/bulk_upload_lettings/year.rb
+++ b/app/models/forms/bulk_upload_lettings/year.rb
@@ -16,7 +16,7 @@ module Forms
 
       def options
         possible_years.map do |year|
-          OpenStruct.new(id: year, name: "#{year}/#{year + 1}")
+          OpenStruct.new(id: year, name: "#{year} to #{year + 1}")
         end
       end
 
diff --git a/app/models/forms/bulk_upload_sales/checking_file.rb b/app/models/forms/bulk_upload_sales/checking_file.rb
index 243d64070..4e512b29b 100644
--- a/app/models/forms/bulk_upload_sales/checking_file.rb
+++ b/app/models/forms/bulk_upload_sales/checking_file.rb
@@ -21,7 +21,7 @@ module Forms
       end
 
       def year_combo
-        "#{year}/#{year + 1 - 2000}"
+        "#{year} to #{year + 1}"
       end
 
       def save!
diff --git a/app/models/forms/bulk_upload_sales/prepare_your_file.rb b/app/models/forms/bulk_upload_sales/prepare_your_file.rb
index 6bac024cc..aaca752a2 100644
--- a/app/models/forms/bulk_upload_sales/prepare_your_file.rb
+++ b/app/models/forms/bulk_upload_sales/prepare_your_file.rb
@@ -40,7 +40,7 @@ module Forms
       end
 
       def year_combo
-        "#{year}/#{year + 1 - 2000}"
+        "#{year} to #{year + 1}"
       end
 
       def save!
diff --git a/app/models/forms/bulk_upload_sales/upload_your_file.rb b/app/models/forms/bulk_upload_sales/upload_your_file.rb
index 5a0114caf..83ce04e10 100644
--- a/app/models/forms/bulk_upload_sales/upload_your_file.rb
+++ b/app/models/forms/bulk_upload_sales/upload_your_file.rb
@@ -24,7 +24,7 @@ module Forms
       end
 
       def year_combo
-        "#{year}/#{year + 1 - 2000}"
+        "#{year} to #{year + 1}"
       end
 
       def next_path
diff --git a/app/models/forms/bulk_upload_sales/year.rb b/app/models/forms/bulk_upload_sales/year.rb
index 1de8dec04..ecf74c636 100644
--- a/app/models/forms/bulk_upload_sales/year.rb
+++ b/app/models/forms/bulk_upload_sales/year.rb
@@ -16,7 +16,7 @@ module Forms
 
       def options
         possible_years.map do |year|
-          OpenStruct.new(id: year, name: "#{year}/#{year + 1}")
+          OpenStruct.new(id: year, name: "#{year} to #{year + 1}")
         end
       end
 
diff --git a/app/models/validations/sales/setup_validations.rb b/app/models/validations/sales/setup_validations.rb
index a28777a17..18f68d482 100644
--- a/app/models/validations/sales/setup_validations.rb
+++ b/app/models/validations/sales/setup_validations.rb
@@ -80,18 +80,14 @@ private
     if FormHandler.instance.sales_in_crossover_period?
       I18n.t(
         "validations.sales.setup.saledate.must_be_within.previous_and_current_collection_year",
-        previous_start_year_short: previous_collection_start_date.strftime("%y"),
-        previous_end_year_short: previous_collection_end_date.strftime("%y"),
+        previous_end_year_long: previous_collection_end_date.strftime("#{previous_collection_end_date.day.ordinalize} %B %Y"),
         previous_start_year_long: previous_collection_start_date.strftime("#{previous_collection_start_date.day.ordinalize} %B %Y"),
-        current_end_year_short: current_collection_end_date.strftime("%y"),
         current_end_year_long: current_collection_end_date.strftime("#{current_collection_end_date.day.ordinalize} %B %Y"),
       )
     else
       I18n.t(
         "validations.sales.setup.saledate.must_be_within.current_collection_year",
-        current_start_year_short: current_collection_start_date.strftime("%y"),
         current_start_year_long: current_collection_start_date.strftime("#{current_collection_start_date.day.ordinalize} %B %Y"),
-        current_end_year_short: current_collection_end_date.strftime("%y"),
         current_end_year_long: current_collection_end_date.strftime("#{current_collection_end_date.day.ordinalize} %B %Y"),
       )
     end
diff --git a/app/models/validations/setup_validations.rb b/app/models/validations/setup_validations.rb
index 528126ab7..25b4ec76b 100644
--- a/app/models/validations/setup_validations.rb
+++ b/app/models/validations/setup_validations.rb
@@ -130,17 +130,13 @@ private
     if FormHandler.instance.lettings_in_crossover_period?
       I18n.t(
         "validations.setup.startdate.previous_and_current_collection_year",
-        previous_start_year_short: previous_collection_start_date.strftime("%y"),
-        previous_end_year_short: previous_collection_end_date.strftime("%y"),
+        previous_end_year_long: previous_collection_end_date.strftime("#{previous_collection_end_date.day.ordinalize} %B %Y"),
         previous_start_year_long: previous_collection_start_date.strftime("#{previous_collection_start_date.day.ordinalize} %B %Y"),
-        current_end_year_short: current_collection_end_date.strftime("%y"),
         current_end_year_long:,
       )
     else
       I18n.t(
         "validations.setup.startdate.current_collection_year",
-        current_start_year_short: current_collection_start_date.strftime("%y"),
-        current_end_year_short: current_collection_end_date.strftime("%y"),
         current_start_year_long: current_collection_start_date.strftime("#{current_collection_start_date.day.ordinalize} %B %Y"),
         current_end_year_long:,
       )
diff --git a/app/views/bulk_upload_lettings_logs/forms/prepare_your_file_2023.html.erb b/app/views/bulk_upload_lettings_logs/forms/prepare_your_file_2023.html.erb
index a07092278..f8549807b 100644
--- a/app/views/bulk_upload_lettings_logs/forms/prepare_your_file_2023.html.erb
+++ b/app/views/bulk_upload_lettings_logs/forms/prepare_your_file_2023.html.erb
@@ -31,7 +31,7 @@
         <li>If you are using the new template, keep the headers. If you are using the legacy template, you can either keep or remove the headers. If you remove the headers, you should also remove the blank column A.</li>
       </ul>
 
-      <%= govuk_inset_text(text: "You can upload both general needs and supported housing logs in the same file for 2023/24 data.") %>
+      <%= govuk_inset_text(text: "You can upload both general needs and supported housing logs in the same file for 2023 to 2024 data.") %>
 
       <h2 class="govuk-heading-s">Save your file</h2>
 
diff --git a/app/views/bulk_upload_lettings_logs/forms/prepare_your_file_2024.html.erb b/app/views/bulk_upload_lettings_logs/forms/prepare_your_file_2024.html.erb
index 7657396f1..0e91061c3 100644
--- a/app/views/bulk_upload_lettings_logs/forms/prepare_your_file_2024.html.erb
+++ b/app/views/bulk_upload_lettings_logs/forms/prepare_your_file_2024.html.erb
@@ -27,7 +27,7 @@
         <li>If you have reordered the headers, keep the headers in the file.</li>
       </ul>
 
-      <%= govuk_inset_text(text: "You can upload both general needs and supported housing logs in the same file for 2024/25 data.") %>
+      <%= govuk_inset_text(text: "You can upload both general needs and supported housing logs in the same file for 2024 to 2025 data.") %>
 
       <h2 class="govuk-heading-s">Save your file</h2>
 
diff --git a/app/views/bulk_upload_lettings_results/show.html.erb b/app/views/bulk_upload_lettings_results/show.html.erb
index fd49c8f3e..b1f9eb6f6 100644
--- a/app/views/bulk_upload_lettings_results/show.html.erb
+++ b/app/views/bulk_upload_lettings_results/show.html.erb
@@ -6,7 +6,7 @@
 
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds">
-    <span class="govuk-caption-l">Bulk upload for lettings (<%= @bulk_upload.year_combo %>)</span>
+    <span class="govuk-caption-l">Upload lettings logs in bulk (<%= @bulk_upload.year_combo %>)</span>
     <h1 class="govuk-heading-l">We found <%= pluralize(@bulk_upload.bulk_upload_errors.count, "error") %> in your file</h1>
 
     <div class="govuk-body">
diff --git a/app/views/bulk_upload_lettings_results/summary.html.erb b/app/views/bulk_upload_lettings_results/summary.html.erb
index 2e4fa91fc..2f565ed59 100644
--- a/app/views/bulk_upload_lettings_results/summary.html.erb
+++ b/app/views/bulk_upload_lettings_results/summary.html.erb
@@ -2,7 +2,7 @@
 
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds">
-    <span class="govuk-caption-l">Bulk upload for lettings (<%= @bulk_upload.year_combo %>)</span>
+    <span class="govuk-caption-l">Upload lettings logs in bulk (<%= @bulk_upload.year_combo %>)</span>
     <h1 class="govuk-heading-l">Fix <%= pluralize(@bulk_upload.bulk_upload_errors.count, "error") %> and upload file again</h1>
 
     <p class="govuk-body">
diff --git a/app/views/bulk_upload_lettings_resume/chosen.html.erb b/app/views/bulk_upload_lettings_resume/chosen.html.erb
index 47ed9bbfd..a50af7524 100644
--- a/app/views/bulk_upload_lettings_resume/chosen.html.erb
+++ b/app/views/bulk_upload_lettings_resume/chosen.html.erb
@@ -4,7 +4,7 @@
 
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds">
-    <span class="govuk-caption-l">Bulk upload for lettings (<%= @bulk_upload.year_combo %>)</span>
+    <span class="govuk-caption-l">Upload lettings logs in bulk (<%= @bulk_upload.year_combo %>)</span>
     <h1 class="govuk-heading-l">You need to fix logs from your bulk upload</h1>
 
     <p class="govuk-body">You have chosen to create logs from your recent bulk upload.  To view and complete these logs, return to the list of lettings logs.</p>
diff --git a/app/views/bulk_upload_lettings_resume/completed.html.erb b/app/views/bulk_upload_lettings_resume/completed.html.erb
index 0487d1921..59f58b710 100644
--- a/app/views/bulk_upload_lettings_resume/completed.html.erb
+++ b/app/views/bulk_upload_lettings_resume/completed.html.erb
@@ -4,7 +4,7 @@
 
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds">
-    <span class="govuk-caption-l">Bulk upload for lettings (<%= @bulk_upload.year_combo %>)</span>
+    <span class="govuk-caption-l">Upload lettings logs in bulk (<%= @bulk_upload.year_combo %>)</span>
     <h1 class="govuk-heading-l">These logs are complete</h1>
 
     <p class="govuk-body">You have created logs from your bulk upload, and the logs are complete. Return to lettings logs to view them.</p>
diff --git a/app/views/bulk_upload_lettings_resume/confirm.html.erb b/app/views/bulk_upload_lettings_resume/confirm.html.erb
index 368f16f60..bb15c7101 100644
--- a/app/views/bulk_upload_lettings_resume/confirm.html.erb
+++ b/app/views/bulk_upload_lettings_resume/confirm.html.erb
@@ -4,7 +4,7 @@
 
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds">
-    <span class="govuk-caption-l">Bulk upload for lettings (<%= @bulk_upload.year_combo %>)</span>
+    <span class="govuk-caption-l">Upload lettings logs in bulk (<%= @bulk_upload.year_combo %>)</span>
     <h1 class="govuk-heading-l">Are you sure you want to upload all logs from this bulk upload?</h1>
 
     <p class="govuk-body">
diff --git a/app/views/bulk_upload_lettings_resume/deletion_report.html.erb b/app/views/bulk_upload_lettings_resume/deletion_report.html.erb
index 881f9026c..a13979dfd 100644
--- a/app/views/bulk_upload_lettings_resume/deletion_report.html.erb
+++ b/app/views/bulk_upload_lettings_resume/deletion_report.html.erb
@@ -4,7 +4,7 @@
 
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds">
-    <span class="govuk-caption-l">Bulk upload for lettings (<%= @bulk_upload.year_combo %>)</span>
+    <span class="govuk-caption-l">Upload lettings logs in bulk (<%= @bulk_upload.year_combo %>)</span>
     <h1 class="govuk-heading-l"><%= answers_to_be_deleted_title_text(@bulk_upload) %></h1>
 
     <p>The following cells contain data this is incorrect.</p>
diff --git a/app/views/bulk_upload_lettings_resume/fix_choice.html.erb b/app/views/bulk_upload_lettings_resume/fix_choice.html.erb
index 87aff25ae..383cdbfa1 100644
--- a/app/views/bulk_upload_lettings_resume/fix_choice.html.erb
+++ b/app/views/bulk_upload_lettings_resume/fix_choice.html.erb
@@ -3,7 +3,7 @@
     <%= form_with model: @form, scope: :form, url: page_bulk_upload_lettings_resume_path(@bulk_upload, page: "fix-choice"), method: :patch do |f| %>
       <%= f.govuk_error_summary %>
 
-      <span class="govuk-caption-l">Bulk upload for lettings (<%= @bulk_upload.year_combo %>)</span>
+      <span class="govuk-caption-l">Upload lettings logs in bulk (<%= @bulk_upload.year_combo %>)</span>
       <h1 class="govuk-heading-l">How would you like to fix the errors?</h1>
 
       <div class="govuk-body-l">
diff --git a/app/views/bulk_upload_lettings_soft_validations_check/chosen.html.erb b/app/views/bulk_upload_lettings_soft_validations_check/chosen.html.erb
index 0487d1921..59f58b710 100644
--- a/app/views/bulk_upload_lettings_soft_validations_check/chosen.html.erb
+++ b/app/views/bulk_upload_lettings_soft_validations_check/chosen.html.erb
@@ -4,7 +4,7 @@
 
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds">
-    <span class="govuk-caption-l">Bulk upload for lettings (<%= @bulk_upload.year_combo %>)</span>
+    <span class="govuk-caption-l">Upload lettings logs in bulk (<%= @bulk_upload.year_combo %>)</span>
     <h1 class="govuk-heading-l">These logs are complete</h1>
 
     <p class="govuk-body">You have created logs from your bulk upload, and the logs are complete. Return to lettings logs to view them.</p>
diff --git a/app/views/bulk_upload_lettings_soft_validations_check/confirm.html.erb b/app/views/bulk_upload_lettings_soft_validations_check/confirm.html.erb
index fcb039eac..90f5a00b3 100644
--- a/app/views/bulk_upload_lettings_soft_validations_check/confirm.html.erb
+++ b/app/views/bulk_upload_lettings_soft_validations_check/confirm.html.erb
@@ -4,7 +4,7 @@
 
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds">
-    <span class="govuk-caption-l">Bulk upload for lettings (<%= @bulk_upload.year_combo %>)</span>
+    <span class="govuk-caption-l">Upload lettings logs in bulk (<%= @bulk_upload.year_combo %>)</span>
     <h1 class="govuk-heading-l">You have chosen to upload all logs from this bulk upload.</h1>
 
     <p class="govuk-body"><%= logs_and_soft_validations_warning(@bulk_upload) %></p>
diff --git a/app/views/bulk_upload_lettings_soft_validations_check/confirm_soft_errors.html.erb b/app/views/bulk_upload_lettings_soft_validations_check/confirm_soft_errors.html.erb
index 087557b3f..8a2a9d371 100644
--- a/app/views/bulk_upload_lettings_soft_validations_check/confirm_soft_errors.html.erb
+++ b/app/views/bulk_upload_lettings_soft_validations_check/confirm_soft_errors.html.erb
@@ -3,7 +3,7 @@
     <div class="govuk-grid-column-two-thirds">
         <%= f.govuk_error_summary %>
 
-        <span class="govuk-caption-l">Bulk upload for lettings (<%= @bulk_upload.year_combo %>)</span>
+        <span class="govuk-caption-l">Upload lettings logs in bulk (<%= @bulk_upload.year_combo %>)</span>
         <h1 class="govuk-heading-l">Check these <%= pluralize(@bulk_upload.bulk_upload_errors.count, "answer") %> </h1>
 
         <p class="govuk-body-l">Some data from your bulk upload might not be right. Check your file for any errors in the fields below.</p>
diff --git a/app/views/bulk_upload_sales_results/show.html.erb b/app/views/bulk_upload_sales_results/show.html.erb
index 6d0863617..24b09ce6a 100644
--- a/app/views/bulk_upload_sales_results/show.html.erb
+++ b/app/views/bulk_upload_sales_results/show.html.erb
@@ -6,7 +6,7 @@
 
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds">
-    <span class="govuk-caption-l">Bulk Upload for sales (<%= @bulk_upload.year_combo %>)</span>
+    <span class="govuk-caption-l">Upload sales logs in bulk (<%= @bulk_upload.year_combo %>)</span>
     <h1 class="govuk-heading-l">We found <%= pluralize(@bulk_upload.bulk_upload_errors.count, "error") %> in your file</h1>
 
     <div class="govuk-body">
diff --git a/app/views/bulk_upload_sales_results/summary.html.erb b/app/views/bulk_upload_sales_results/summary.html.erb
index 171cbf77f..2ae2a915b 100644
--- a/app/views/bulk_upload_sales_results/summary.html.erb
+++ b/app/views/bulk_upload_sales_results/summary.html.erb
@@ -2,7 +2,7 @@
 
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds">
-    <span class="govuk-caption-l">Bulk upload for sales (<%= @bulk_upload.year_combo %>)</span>
+    <span class="govuk-caption-l">Upload sales logs in bulk (<%= @bulk_upload.year_combo %>)</span>
     <h1 class="govuk-heading-l">Fix <%= pluralize(@bulk_upload.bulk_upload_errors.count, "error") %> and upload file again</h1>
 
     <p class="govuk-body">
diff --git a/app/views/bulk_upload_sales_resume/chosen.html.erb b/app/views/bulk_upload_sales_resume/chosen.html.erb
index 0d381e6a6..1f88a76b5 100644
--- a/app/views/bulk_upload_sales_resume/chosen.html.erb
+++ b/app/views/bulk_upload_sales_resume/chosen.html.erb
@@ -4,7 +4,7 @@
 
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds">
-    <span class="govuk-caption-l">Bulk upload for sales (<%= @bulk_upload.year_combo %>)</span>
+    <span class="govuk-caption-l">Upload sales logs in bulk (<%= @bulk_upload.year_combo %>)</span>
     <h1 class="govuk-heading-l">You need to fix logs from your bulk upload</h1>
 
     <p class="govuk-body">You have chosen to create logs from your recent bulk upload.  To view and complete these logs, return to the list of sales logs.</p>
diff --git a/app/views/bulk_upload_sales_resume/completed.html.erb b/app/views/bulk_upload_sales_resume/completed.html.erb
index 9fcc656ad..737f56385 100644
--- a/app/views/bulk_upload_sales_resume/completed.html.erb
+++ b/app/views/bulk_upload_sales_resume/completed.html.erb
@@ -4,7 +4,7 @@
 
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds">
-    <span class="govuk-caption-l">Bulk upload for sales (<%= @bulk_upload.year_combo %>)</span>
+    <span class="govuk-caption-l">Upload sales logs in bulk (<%= @bulk_upload.year_combo %>)</span>
     <h1 class="govuk-heading-l">These logs are complete</h1>
 
     <p class="govuk-body">You have created logs from your bulk upload, and the logs are complete. Return to sales logs to view them.</p>
diff --git a/app/views/bulk_upload_sales_resume/confirm.html.erb b/app/views/bulk_upload_sales_resume/confirm.html.erb
index 3d02e025a..b47619053 100644
--- a/app/views/bulk_upload_sales_resume/confirm.html.erb
+++ b/app/views/bulk_upload_sales_resume/confirm.html.erb
@@ -4,7 +4,7 @@
 
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds">
-    <span class="govuk-caption-l">Bulk upload for sales (<%= @bulk_upload.year_combo %>)</span>
+    <span class="govuk-caption-l">Upload sales logs in bulk (<%= @bulk_upload.year_combo %>)</span>
     <h1 class="govuk-heading-l">Are you sure you want to upload all logs from this bulk upload?</h1>
 
     <p class="govuk-body">
diff --git a/app/views/bulk_upload_sales_resume/deletion_report.html.erb b/app/views/bulk_upload_sales_resume/deletion_report.html.erb
index 299cff4f4..bcc044439 100644
--- a/app/views/bulk_upload_sales_resume/deletion_report.html.erb
+++ b/app/views/bulk_upload_sales_resume/deletion_report.html.erb
@@ -4,7 +4,7 @@
 
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds">
-    <span class="govuk-caption-l">Bulk upload for sales (<%= @bulk_upload.year_combo %>)</span>
+    <span class="govuk-caption-l">Upload sales logs in bulk (<%= @bulk_upload.year_combo %>)</span>
     <h1 class="govuk-heading-l"><%= answers_to_be_deleted_title_text(@bulk_upload) %></h1>
 
     <p>The following cells contain data this is incorrect.</p>
diff --git a/app/views/bulk_upload_sales_resume/fix_choice.html.erb b/app/views/bulk_upload_sales_resume/fix_choice.html.erb
index 5fcc1d5ea..946426d0c 100644
--- a/app/views/bulk_upload_sales_resume/fix_choice.html.erb
+++ b/app/views/bulk_upload_sales_resume/fix_choice.html.erb
@@ -3,7 +3,7 @@
     <%= form_with model: @form, scope: :form, url: page_bulk_upload_sales_resume_path(@bulk_upload, page: "fix-choice"), method: :patch do |f| %>
       <%= f.govuk_error_summary %>
 
-      <span class="govuk-caption-l">Bulk upload for sales (<%= @bulk_upload.year_combo %>)</span>
+      <span class="govuk-caption-l">Upload sales logs in bulk (<%= @bulk_upload.year_combo %>)</span>
       <h1 class="govuk-heading-l">How would you like to fix the errors?</h1>
 
       <div class="govuk-body-l">
diff --git a/app/views/bulk_upload_sales_soft_validations_check/chosen.html.erb b/app/views/bulk_upload_sales_soft_validations_check/chosen.html.erb
index 9fcc656ad..737f56385 100644
--- a/app/views/bulk_upload_sales_soft_validations_check/chosen.html.erb
+++ b/app/views/bulk_upload_sales_soft_validations_check/chosen.html.erb
@@ -4,7 +4,7 @@
 
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds">
-    <span class="govuk-caption-l">Bulk upload for sales (<%= @bulk_upload.year_combo %>)</span>
+    <span class="govuk-caption-l">Upload sales logs in bulk (<%= @bulk_upload.year_combo %>)</span>
     <h1 class="govuk-heading-l">These logs are complete</h1>
 
     <p class="govuk-body">You have created logs from your bulk upload, and the logs are complete. Return to sales logs to view them.</p>
diff --git a/app/views/bulk_upload_sales_soft_validations_check/confirm.html.erb b/app/views/bulk_upload_sales_soft_validations_check/confirm.html.erb
index ca9f7fd4f..2b4a6e981 100644
--- a/app/views/bulk_upload_sales_soft_validations_check/confirm.html.erb
+++ b/app/views/bulk_upload_sales_soft_validations_check/confirm.html.erb
@@ -4,7 +4,7 @@
 
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds">
-    <span class="govuk-caption-l">Bulk upload for sales (<%= @bulk_upload.year_combo %>)</span>
+    <span class="govuk-caption-l">Upload sales logs in bulk (<%= @bulk_upload.year_combo %>)</span>
     <h1 class="govuk-heading-l">You have chosen to upload all logs from this bulk upload.</h1>
 
     <p class="govuk-body"><%= logs_and_soft_validations_warning(@bulk_upload) %></p>
diff --git a/app/views/bulk_upload_sales_soft_validations_check/confirm_soft_errors.html.erb b/app/views/bulk_upload_sales_soft_validations_check/confirm_soft_errors.html.erb
index 4a2765ab4..0bf5553b3 100644
--- a/app/views/bulk_upload_sales_soft_validations_check/confirm_soft_errors.html.erb
+++ b/app/views/bulk_upload_sales_soft_validations_check/confirm_soft_errors.html.erb
@@ -3,7 +3,7 @@
     <div class="govuk-grid-column-two-thirds">
       <%= f.govuk_error_summary %>
 
-      <span class="govuk-caption-l">Bulk upload for sales (<%= @bulk_upload.year_combo %>)</span>
+      <span class="govuk-caption-l">Upload sales logs in bulk (<%= @bulk_upload.year_combo %>)</span>
       <h1 class="govuk-heading-l">Check these <%= pluralize(@bulk_upload.bulk_upload_errors.count, "answer") %> </h1>
 
       <p class="govuk-body-l">Some data from your bulk upload might not be right. Check your file for any errors in the fields below.</p>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 85be0e677..52decced7 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -287,9 +287,9 @@ en:
 
       startdate:
         current_collection_year:
-          "Enter a date within the %{current_start_year_short}/%{current_end_year_short} collection year, which is between %{current_start_year_long} and %{current_end_year_long}."
+          "Enter a date within the %{current_start_year_long} to %{current_end_year_long} collection year, which is between %{current_start_year_long} and %{current_end_year_long}."
         previous_and_current_collection_year:
-          "Enter a date within the %{previous_start_year_short}/%{previous_end_year_short} or %{previous_end_year_short}/%{current_end_year_short} collection years, which is between %{previous_start_year_long} and %{current_end_year_long}."
+          "Enter a date within the %{previous_start_year_long} to %{previous_end_year_long} or %{previous_end_year_long} to %{current_end_year_long} collection years, which is between %{previous_start_year_long} and %{current_end_year_long}."
         later_than_14_days_after: "The tenancy start date must not be later than 14 days from today’s date."
         before_scheme_end_date: "The tenancy start date must be before the end date for this supported housing scheme."
         after_void_date: "Enter a tenancy start date that is after the void date."
diff --git a/config/locales/validations/sales/setup.en.yml b/config/locales/validations/sales/setup.en.yml
index 2741464b0..7e0734a39 100644
--- a/config/locales/validations/sales/setup.en.yml
+++ b/config/locales/validations/sales/setup.en.yml
@@ -7,9 +7,9 @@ en:
             next_two_weeks: "Sale completion date must not be later than 14 days from today’s date."
           must_be_within:
             current_collection_year:
-              "Enter a date within the %{current_start_year_short}/%{current_end_year_short} collection year, which is between %{current_start_year_long} and %{current_end_year_long}."
+              "Enter a date within the %{current_start_year_long} to %{current_end_year_long} collection year, which is between %{current_start_year_long} and %{current_end_year_long}."
             previous_and_current_collection_year:
-              "Enter a date within the %{previous_start_year_short}/%{previous_end_year_short} or %{previous_end_year_short}/%{current_end_year_short} collection years, which is between %{previous_start_year_long} and %{current_end_year_long}."
+              "Enter a date within the %{previous_start_year_long} to %{previous_end_year_long} or %{previous_end_year_long} to %{current_end_year_long} collection years, which is between %{previous_start_year_long} and %{current_end_year_long}."
           invalid:
             merged_organisations:
               "Enter a date when the owning organisation was active. %{owning_organisation} became inactive on %{merge_date} and was replaced by %{absorbing_organisation}."
diff --git a/spec/requests/bulk_upload_lettings_results_controller_spec.rb b/spec/requests/bulk_upload_lettings_results_controller_spec.rb
index dc78c9d78..afbd84df9 100644
--- a/spec/requests/bulk_upload_lettings_results_controller_spec.rb
+++ b/spec/requests/bulk_upload_lettings_results_controller_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe BulkUploadLettingsResultsController, type: :request do
       get "/lettings-logs/bulk-upload-results/#{bulk_upload.id}/summary"
 
       expect(response).to be_successful
-      expect(response.body).to include("Bulk upload for lettings (#{bulk_upload.year_combo})")
+      expect(response.body).to include("Upload lettings logs in bulk (#{bulk_upload.year_combo})")
     end
 
     it "renders the bulk upload filename" do
@@ -90,7 +90,7 @@ RSpec.describe BulkUploadLettingsResultsController, type: :request do
       get "/lettings-logs/bulk-upload-results/#{bulk_upload.id}"
 
       expect(response).to be_successful
-      expect(response.body).to include("Bulk upload for lettings (#{bulk_upload.year_combo})")
+      expect(response.body).to include("Upload lettings logs in bulk (#{bulk_upload.year_combo})")
     end
 
     it "renders correct number of errors" do
diff --git a/spec/requests/bulk_upload_lettings_resume_controller_spec.rb b/spec/requests/bulk_upload_lettings_resume_controller_spec.rb
index f6ac9bb4a..8e3c0b0e0 100644
--- a/spec/requests/bulk_upload_lettings_resume_controller_spec.rb
+++ b/spec/requests/bulk_upload_lettings_resume_controller_spec.rb
@@ -60,7 +60,7 @@ RSpec.describe BulkUploadLettingsResumeController, type: :request do
 
       expect(response).to be_successful
 
-      expect(response.body).to include("Bulk upload for lettings")
+      expect(response.body).to include("Upload lettings logs in bulk")
       expect(response.body).to include(bulk_upload.year_combo)
       expect(response.body).to include("View the error report")
       expect(response.body).to include("How would you like to fix the errors?")
@@ -120,7 +120,7 @@ RSpec.describe BulkUploadLettingsResumeController, type: :request do
 
       expect(response).to be_successful
 
-      expect(response.body).to include("Bulk upload for lettings")
+      expect(response.body).to include("Upload lettings logs in bulk")
       expect(response.body).to include("Cancel")
     end
   end
@@ -218,7 +218,7 @@ RSpec.describe BulkUploadLettingsResumeController, type: :request do
 
       expect(response).to be_successful
 
-      expect(response.body).to include("Bulk upload for lettings")
+      expect(response.body).to include("Upload lettings logs in bulk")
       expect(response.body).to include(bulk_upload.year_combo)
       expect(response.body).to include("These 2 answers will be deleted if you upload the log")
       expect(response.body).to include(bulk_upload.filename)
@@ -260,7 +260,7 @@ RSpec.describe BulkUploadLettingsResumeController, type: :request do
 
         expect(response).to be_successful
 
-        expect(response.body).to include("Bulk upload for lettings")
+        expect(response.body).to include("Upload lettings logs in bulk")
         expect(response.body).to include(bulk_upload.year_combo)
         expect(response.body).to include("These 2 answers will be deleted if you upload the log")
         expect(response.body).to include(bulk_upload.filename)
diff --git a/spec/requests/bulk_upload_lettings_soft_validations_check_controller_spec.rb b/spec/requests/bulk_upload_lettings_soft_validations_check_controller_spec.rb
index e7fc9ed46..315235e0e 100644
--- a/spec/requests/bulk_upload_lettings_soft_validations_check_controller_spec.rb
+++ b/spec/requests/bulk_upload_lettings_soft_validations_check_controller_spec.rb
@@ -14,7 +14,7 @@ RSpec.describe BulkUploadLettingsSoftValidationsCheckController, type: :request
     it "shows the soft validation errors with confirmation question" do
       get "/lettings-logs/bulk-upload-soft-validations-check/#{bulk_upload.id}/confirm-soft-errors"
 
-      expect(response.body).to include("Bulk upload for lettings")
+      expect(response.body).to include("Upload lettings logs in bulk")
       expect(response.body).to include(bulk_upload.year_combo)
       expect(response.body).to include("Check these 2 answers")
       expect(response.body).to include(bulk_upload.filename)
diff --git a/spec/requests/bulk_upload_sales_results_controller_spec.rb b/spec/requests/bulk_upload_sales_results_controller_spec.rb
index 1bd171dec..b7bb7a10c 100644
--- a/spec/requests/bulk_upload_sales_results_controller_spec.rb
+++ b/spec/requests/bulk_upload_sales_results_controller_spec.rb
@@ -52,7 +52,7 @@ RSpec.describe BulkUploadSalesResultsController, type: :request do
       get "/sales-logs/bulk-upload-results/#{bulk_upload.id}"
 
       expect(response).to be_successful
-      expect(response.body).to include("Bulk Upload for sales (#{bulk_upload.year_combo})")
+      expect(response.body).to include("Upload sales logs in bulk (#{bulk_upload.year_combo})")
     end
 
     it "renders correct number of errors" do
diff --git a/spec/requests/bulk_upload_sales_resume_controller_spec.rb b/spec/requests/bulk_upload_sales_resume_controller_spec.rb
index 9c0efded8..c6622afcb 100644
--- a/spec/requests/bulk_upload_sales_resume_controller_spec.rb
+++ b/spec/requests/bulk_upload_sales_resume_controller_spec.rb
@@ -60,7 +60,7 @@ RSpec.describe BulkUploadSalesResumeController, type: :request do
 
       expect(response).to be_successful
 
-      expect(response.body).to include("Bulk upload for sales")
+      expect(response.body).to include("Upload sales logs in bulk")
       expect(response.body).to include(bulk_upload.year_combo)
       expect(response.body).to include("View the error report")
       expect(response.body).to include("How would you like to fix the errors?")
@@ -120,7 +120,7 @@ RSpec.describe BulkUploadSalesResumeController, type: :request do
 
       expect(response).to be_successful
 
-      expect(response.body).to include("Bulk upload for sales")
+      expect(response.body).to include("Upload sales logs in bulk")
       expect(response.body).to include("Cancel")
     end
   end
@@ -218,7 +218,7 @@ RSpec.describe BulkUploadSalesResumeController, type: :request do
 
       expect(response).to be_successful
 
-      expect(response.body).to include("Bulk upload for sales")
+      expect(response.body).to include("Upload sales logs in bulk")
       expect(response.body).to include(bulk_upload.year_combo)
       expect(response.body).to include("These 2 answers will be deleted if you upload the log")
       expect(response.body).to include(bulk_upload.filename)
@@ -260,7 +260,7 @@ RSpec.describe BulkUploadSalesResumeController, type: :request do
 
         expect(response).to be_successful
 
-        expect(response.body).to include("Bulk upload for sales")
+        expect(response.body).to include("Upload sales logs in bulk")
         expect(response.body).to include(bulk_upload.year_combo)
         expect(response.body).to include("These 2 answers will be deleted if you upload the log")
         expect(response.body).to include(bulk_upload.filename)
diff --git a/spec/requests/bulk_upload_sales_soft_validations_check_controller_spec.rb b/spec/requests/bulk_upload_sales_soft_validations_check_controller_spec.rb
index f22ca0aa2..90e44a4f7 100644
--- a/spec/requests/bulk_upload_sales_soft_validations_check_controller_spec.rb
+++ b/spec/requests/bulk_upload_sales_soft_validations_check_controller_spec.rb
@@ -14,7 +14,7 @@ RSpec.describe BulkUploadSalesSoftValidationsCheckController, type: :request do
     it "shows the soft validation errors with confirmation question" do
       get "/sales-logs/bulk-upload-soft-validations-check/#{bulk_upload.id}/confirm-soft-errors"
 
-      expect(response.body).to include("Bulk upload for sales")
+      expect(response.body).to include("Upload sales logs in bulk")
       expect(response.body).to include(bulk_upload.year_combo)
       expect(response.body).to include("Check these 2 answers")
       expect(response.body).to include(bulk_upload.filename)