Correct 24/25 bulk upload error messages on lettings and sales

app/models/form/question.rb

@@ -208,7 +208,8 @@ class Form::Question
   end
 
   def unanswered_error_message
-    I18n.t("validations.not_answered", question: error_display_label.downcase)
+    question_text = error_display_label.presence || "this question"
+    I18n.t("validations.not_answered", question: question_text.downcase)
   end
 
   def suffix_label(log)

app/services/bulk_upload/lettings/year2024/row_parser.rb

@@ -44,7 +44,7 @@ class BulkUpload::Lettings::Year2024::RowParser
     field_39: "If 'Other', what is the type of tenancy?",
     field_40: "What is the length of the fixed-term tenancy to the nearest year?",
     field_41: "Is this letting sheltered accommodation?",
-    field_15: "Has tenant seen the DLUHC privacy notice?",
+    field_15: "Has tenant seen the MHCLG privacy notice?",
     field_42: "What is the lead tenant's age?",
     field_43: "Which of these best describes the lead tenant's gender identity?",
     field_44: "Which of these best describes the lead tenant's ethnic background?",
@@ -807,15 +807,13 @@ private
       if setup_question?(question)
         fields.each do |field|
           if errors.select { |e| fields.include?(e.attribute) }.none?
-            question_text = question.error_display_label.presence || "this question"
+            errors.add(field, question.unanswered_error_message, category: :setup) if field.present?
-            errors.add(field, I18n.t("validations.not_answered", question: question_text.downcase), category: :setup) if field.present?
           end
         end
       else
         fields.each do |field|
           unless errors.any? { |e| fields.include?(e.attribute) }
-            question_text = question.error_display_label.presence || "this question"
+            errors.add(field, question.unanswered_error_message)
-            errors.add(field, I18n.t("validations.not_answered", question: question_text.downcase))
           end
         end
       end

config/locales/en.yml

@@ -589,13 +589,13 @@ en:
 
     declaration:
       missing:
-        pre_2024: "You must show the MHCLG privacy notice to the tenant before you can submit this log."
+        pre_2024: "You must show the MHCLG privacy notice to the tenant before you can submit this log"
-        post_2024: "You must show or give access to the MHCLG privacy notice to the tenant before you can submit this log."
+        post_2024: "You must show or give access to the MHCLG privacy notice to the tenant before you can submit this log"
 
     privacynotice:
       missing:
-        pre_2024: "You must show the MHCLG privacy notice to the %{buyer_or_buyers} before you can submit this log."
+        pre_2024: "You must show the MHCLG privacy notice to the %{buyer_or_buyers} before you can submit this log"
-        post_2024: "You must show or give access to the MHCLG privacy notice to the %{buyer_or_buyers} before you can submit this log."
+        post_2024: "You must show or give access to the MHCLG privacy notice to the %{buyer_or_buyers} before you can submit this log"
 
     scheme:
       toggle_date:

spec/services/bulk_upload/lettings/year2023/row_parser_spec.rb

@@ -686,7 +686,7 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do
 
           it "cannot be nulled" do
             parser.valid?
-            expect(parser.errors[:field_45]).to eq(["You must show the MHCLG privacy notice to the tenant before you can submit this log."])
+            expect(parser.errors[:field_45]).to eq(["You must show the MHCLG privacy notice to the tenant before you can submit this log"])
           end
         end
       end

spec/services/bulk_upload/lettings/year2024/row_parser_spec.rb

@@ -747,7 +747,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
 
           it "cannot be nulled" do
             parser.valid?
-            expect(parser.errors[:field_15]).to eq(["You must answer tenant has seen the privacy notice"])
+            expect(parser.errors[:field_15]).to eq(["You must show or give access to the MHCLG privacy notice to the tenant before you can submit this log"])
           end
         end