CLDC-3661 Update year format (#2713)

* Update year combo format * lint * Update tests and validations * update model tests * Update bu list year format * Update test
communitiesuk · Oct 28, 2024 · 469211c · 469211c
1 parent be52a7b
commit 469211c
Show file tree

Hide file tree

Showing 59 changed files with 116 additions and 117 deletions.
diff --git a/app/components/bulk_upload_summary_component.html.erb b/app/components/bulk_upload_summary_component.html.erb
@@ -4,7 +4,7 @@
       <header class="app-log-summary__header">
         <h2 class="govuk-heading-m govuk-!-font-weight-regular govuk-!-margin-bottom-0 text-normal-break ">
           <span class="govuk-!-margin-right-1"><%= bulk_upload.filename %></span>
-          <span class="app-metadata app-log-summary__details" style="white-space: nowrap;"><%= bulk_upload.year %>/<%= bulk_upload.year + 1 %></span>
+          <span class="app-metadata app-log-summary__details" style="white-space: nowrap;"><%= bulk_upload.year %> to <%= bulk_upload.year + 1 %></span>
         </h2>
       </header>
       <div class="govuk-!-margin-bottom-2">

diff --git a/app/helpers/filters_helper.rb b/app/helpers/filters_helper.rb
@@ -287,7 +287,7 @@ def filters_count(filters)
   end
 
   def year_combo(year)
-    "#{year}/#{year - 2000 + 1}"
+    "#{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
@@ -6,7 +6,7 @@ def review_log_info_text(log)
       "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
@@ -55,7 +55,7 @@ def review_log_text(log)
     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
@@ -59,7 +59,7 @@ def status
   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
@@ -21,7 +21,7 @@ def back_path
       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
@@ -28,7 +28,7 @@ def next_path
       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
@@ -41,7 +41,7 @@ def specification_path
       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
@@ -25,7 +25,7 @@ def back_path
       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
@@ -16,7 +16,7 @@ def view_path
 
       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
@@ -21,7 +21,7 @@ def back_path
       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
@@ -40,7 +40,7 @@ def specification_path
       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
@@ -24,7 +24,7 @@ def back_path
       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
@@ -16,7 +16,7 @@ def view_path
 
       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
@@ -80,18 +80,18 @@ def saledate_validation_error_message
     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_start_year_short: previous_collection_start_date.strftime("%Y"),
+        previous_end_year_short: previous_collection_end_date.strftime("%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_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_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_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
@@ -130,17 +130,17 @@ def startdate_validation_error_message
     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_start_year_short: previous_collection_start_date.strftime("%Y"),
+        previous_end_year_short: previous_collection_end_date.strftime("%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_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_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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -290,9 +290,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_short} to %{current_end_year_short} 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_short} to %{previous_end_year_short} or %{previous_end_year_short} to %{current_end_year_short} 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
@@ -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_short} to %{current_end_year_short} 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_short} to %{previous_end_year_short} or %{previous_end_year_short} to %{current_end_year_short} 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}."
-Original file line number
+Diff line change
@@ Expand Up / @@ -55,7 +55,7 @@ def review_log_text(log) @@
         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
@@ Expand Down @@