CLDC-4328: Update wrong field numbers error (#3319)

* CLDC-4328: Update wrong field numbers error

* fixup! CLDC-4328: Update wrong field numbers error

* CLDC-4328: Use a specific error message per year/log type

* fixup! CLDC-4328: Use a specific error message per year/log type

Gemfile.lock

@@ -159,7 +159,7 @@ GEM
     crack (1.0.0)
       bigdecimal
       rexml
-    crass (1.0.6)
+    crass (1.0.7)
     cronex (0.15.0)
       tzinfo
       unicode (>= 0.4.4.5)
@@ -291,7 +291,7 @@ GEM
     method_source (1.1.0)
     mini_mime (1.1.5)
     minitest (5.27.0)
-    msgpack (1.7.2)
+    msgpack (1.8.3)
     multipart-post (2.4.1)
     nested_form (0.3.2)
     net-http (0.9.1)

config/locales/devise.en.yml

@@ -10,8 +10,8 @@ en:
       already_authenticated: "You are already signed in."
       inactive: "Your account has not been activated yet."
       invalid: "Incorrect %{authentication_keys} or password."
-      locked: "Your account has been locked."
+      locked: "Your account has been locked. Please wait one hour to try again."
-      last_attempt: "You have one more attempt before your account is locked."
+      last_attempt: "You have one more attempt before your account is locked for one hour. You may prefer to click \"Forgot password\" to reset your password."
       not_found_in_database: "Incorrect %{authentication_keys} or password."
       timeout: "Your session expired. Sign in again to continue."
       unauthenticated: "You need to sign in or sign up before continuing."

config/locales/validations/lettings/2025/bulk_upload.en.yml

@@ -12,7 +12,7 @@ en:
           wrong_template:
             wrong_template: "Incorrect start dates, please ensure you have used the correct template."
             no_headers: "Your file does not contain the required header rows. Add or check the header rows and upload your file again. [Read more about using the template headers](%{guidance_link})."
-            wrong_field_numbers_count: "Incorrect number of fields, please ensure you have used the correct template."
+            wrong_field_numbers_count: "Incorrect number of fields, please ensure you have used the template for lettings 2025."
             over_max_column_count: "Too many columns, please ensure you have used the correct template."
           owning_organisation:
             not_found: "The owning organisation code is incorrect."

config/locales/validations/lettings/2026/bulk_upload.en.yml

@@ -12,7 +12,7 @@ en:
           wrong_template:
             wrong_template: "Incorrect start dates, please ensure you have used the correct template."
             no_headers: "Your file does not contain the required header rows. Add or check the header rows and upload your file again. [Read more about using the template headers](%{guidance_link})."
-            wrong_field_numbers_count: "Incorrect number of fields, please ensure you have used the correct template."
+            wrong_field_numbers_count: "Incorrect number of fields, please ensure you have used the template for lettings 2026."
             over_max_column_count: "Too many columns, please ensure you have used the correct template."
           owning_organisation:
             not_found: "The owning organisation code is incorrect."

config/locales/validations/sales/2025/bulk_upload.en.yml

@@ -11,7 +11,7 @@ en:
           wrong_template:
             over_max_column_count: "Too many columns, please ensure you have used the correct template."
             no_headers: "Your file does not contain the required header rows. Add or check the header rows and upload your file again. [Read more about using the template headers](%{guidance_link})."
-            wrong_field_numbers_count: "Incorrect number of fields, please ensure you have used the correct template."
+            wrong_field_numbers_count: "Incorrect number of fields, please ensure you have used the template for sales 2025."
             wrong_template: "Incorrect sale dates, please ensure you have used the correct template."
           numeric:
             within_range: "%{field} must be between %{min} and %{max}."

config/locales/validations/sales/2026/bulk_upload.en.yml

@@ -11,7 +11,7 @@ en:
           wrong_template:
             over_max_column_count: "Too many columns, please ensure you have used the correct template."
             no_headers: "Your file does not contain the required header rows. Add or check the header rows and upload your file again. [Read more about using the template headers](%{guidance_link})."
-            wrong_field_numbers_count: "Incorrect number of fields, please ensure you have used the correct template."
+            wrong_field_numbers_count: "Incorrect number of fields, please ensure you have used the template for sales 2026."
             wrong_template: "Incorrect sale dates, please ensure you have used the correct template."
           numeric:
             within_range: "%{field} must be between %{min} and %{max}."

spec/services/bulk_upload/lettings/validator_spec.rb

@@ -55,7 +55,7 @@ RSpec.describe BulkUpload::Lettings::Validator do
 
         it "is not valid" do
           expect(validator).not_to be_valid
-          expect(validator.errors["base"]).to eql(["Incorrect number of fields, please ensure you have used the correct template."])
+          expect(validator.errors["base"]).to eql(["Incorrect number of fields, please ensure you have used the template for lettings #{year}."])
         end
       end
 
@@ -72,7 +72,7 @@ RSpec.describe BulkUpload::Lettings::Validator do
 
         it "is not valid" do
           expect(validator).not_to be_valid
-          expect(validator.errors["base"]).to eql(["Incorrect number of fields, please ensure you have used the correct template."])
+          expect(validator.errors["base"]).to eql(["Incorrect number of fields, please ensure you have used the template for lettings #{year}."])
         end
       end
     end