Merge branch 'main' into CLDC-3683-extract-household-situation-copy

app/constants/global_constants.rb

@@ -1,5 +1,5 @@
 module GlobalConstants
-  HELPDESK_URL = "https://dluhcdigital.atlassian.net/servicedesk/customer/portal/6/group/11".freeze
+  HELPDESK_URL = "https://mhclgdigital.atlassian.net/servicedesk/customer/portal/6/group/11".freeze
 
   COUNTRIES_ANSWER_OPTIONS = {
     "" => "Select an option",

app/helpers/formatting_helper.rb

@@ -2,7 +2,8 @@ module FormattingHelper
   def format_ending(text)
     return text if text.blank?
 
-    modified_text  = lowercase_first_letter(text)
+    first_word = text.split.first
+    modified_text = first_word == first_word.upcase ? text : lowercase_first_letter(text)
     ensure_sentence_ending(modified_text)
   end
 

app/helpers/merge_requests_helper.rb

@@ -9,7 +9,7 @@ module MergeRequestsHelper
   def request_details(merge_request)
     [
       { label: "Requester", value: display_value_or_placeholder(merge_request.requester&.name) },
-      { label: "Helpdesk ticket", value: merge_request.helpdesk_ticket.present? ? link_to("#{merge_request.helpdesk_ticket} (opens in a new tab)", "https://dluhcdigital.atlassian.net/browse/#{merge_request.helpdesk_ticket}", target: "_blank", rel: "noopener noreferrer") : display_value_or_placeholder(nil), action: merge_request_action(merge_request, "helpdesk_ticket") },
+      { label: "Helpdesk ticket", value: merge_request.helpdesk_ticket.present? ? link_to("#{merge_request.helpdesk_ticket} (opens in a new tab)", "https://mhclgdigital.atlassian.net/browse/#{merge_request.helpdesk_ticket}", target: "_blank", rel: "noopener noreferrer") : display_value_or_placeholder(nil), action: merge_request_action(merge_request, "helpdesk_ticket") },
       { label: "Status", value: status_tag(merge_request.status) },
     ]
   end

app/models/form/lettings/pages/address.rb

@@ -2,7 +2,7 @@ class Form::Lettings::Pages::Address < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "address"
-    @header = "Q#{QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]} - What is the property's address?"
+    @copy_key = "lettings.property_information.address"
     @depends_on = [
       { "is_supported_housing?" => false, "uprn_known" => nil },
       { "is_supported_housing?" => false, "uprn_known" => 0 },

app/models/form/lettings/pages/address_fallback.rb

@@ -2,7 +2,7 @@ class Form::Lettings::Pages::AddressFallback < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "address"
-    @header = "Q12 - What is the property's address?"
+    @copy_key = "lettings.property_information.address"
     @depends_on = [
       { "is_supported_housing?" => false, "uprn_known" => nil, "uprn_selection" => "uprn_not_listed" },
       { "is_supported_housing?" => false, "uprn_known" => 0, "uprn_selection" => "uprn_not_listed" },

app/models/form/lettings/pages/address_matcher.rb

@@ -2,7 +2,7 @@ class Form::Lettings::Pages::AddressMatcher < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "address_matcher"
-    @header = "Find an address"
+    @copy_key = "lettings.property_information.address_matcher"
     @depends_on = [
       { "is_supported_housing?" => false, "uprn_known" => nil },
       { "is_supported_housing?" => false, "uprn_known" => 0 },

app/models/form/lettings/pages/lead_tenant_age.rb

@@ -2,6 +2,7 @@ class Form::Lettings::Pages::LeadTenantAge < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "lead_tenant_age"
+    @copy_key = "lettings.household_characteristics.age1"
     @depends_on = [{ "declaration" => 1 }]
   end
 

app/models/form/lettings/pages/lead_tenant_ethnic_background_arab.rb

@@ -2,6 +2,7 @@ class Form::Lettings::Pages::LeadTenantEthnicBackgroundArab < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "lead_tenant_ethnic_background_arab"
+    @copy_key = "lettings.household_characteristics.ethnic.ethnic_background_arab"
     @depends_on = [{ "ethnic_group" => 4 }]
   end
 

app/models/form/lettings/pages/lead_tenant_ethnic_background_asian.rb

@@ -2,6 +2,7 @@ class Form::Lettings::Pages::LeadTenantEthnicBackgroundAsian < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "lead_tenant_ethnic_background_asian"
+    @copy_key = "lettings.household_characteristics.ethnic.ethnic_background_asian"
     @depends_on = [{ "ethnic_group" => 2 }]
   end
 

app/models/form/lettings/pages/lead_tenant_ethnic_background_black.rb

@@ -2,6 +2,7 @@ class Form::Lettings::Pages::LeadTenantEthnicBackgroundBlack < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "lead_tenant_ethnic_background_black"
+    @copy_key = "lettings.household_characteristics.ethnic.ethnic_background_black"
     @depends_on = [{ "ethnic_group" => 3 }]
   end
 

app/models/form/lettings/pages/lead_tenant_ethnic_background_mixed.rb

@@ -2,6 +2,7 @@ class Form::Lettings::Pages::LeadTenantEthnicBackgroundMixed < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "lead_tenant_ethnic_background_mixed"
+    @copy_key = "lettings.household_characteristics.ethnic.ethnic_background_mixed"
     @depends_on = [{ "ethnic_group" => 1 }]
   end
 

app/models/form/lettings/pages/lead_tenant_ethnic_background_white.rb

@@ -2,6 +2,7 @@ class Form::Lettings::Pages::LeadTenantEthnicBackgroundWhite < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "lead_tenant_ethnic_background_white"
+    @copy_key = "lettings.household_characteristics.ethnic.ethnic_background_white"
     @depends_on = [{ "ethnic_group" => 0 }]
   end
 

app/models/form/lettings/pages/lead_tenant_nationality.rb

@@ -2,6 +2,7 @@ class Form::Lettings::Pages::LeadTenantNationality < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "lead_tenant_nationality"
+    @copy_key = "lettings.household_characteristics.#{form.start_year_after_2024? ? 'nationality_all' : 'national'}"
     @depends_on = [{ "declaration" => 1 }]
   end
 

app/models/form/lettings/pages/max_rent_value_check.rb

@@ -1,24 +0,0 @@
-class Form::Lettings::Pages::MaxRentValueCheck < ::Form::Page
-  def initialize(id, hsh, subsection, check_answers_card_number: nil)
-    super(id, hsh, subsection)
-    @depends_on = [{ "rent_in_soft_max_range?" => true }]
-    @title_text = {
-      "translation" => "soft_validations.rent.outside_range_title",
-      "arguments" => [{
-        "key" => "brent",
-        "label" => true,
-        "i18n_template" => "brent",
-      }],
-    }
-    @informative_text = I18n.t("soft_validations.rent.informative_text", higher_or_lower: "higher")
-    @check_answers_card_number = check_answers_card_number
-  end
-
-  def questions
-    @questions ||= [Form::Lettings::Questions::MaxRentValueCheck.new(nil, nil, self, check_answers_card_number: @check_answers_card_number)]
-  end
-
-  def interruption_screen_question_ids
-    %w[brent period startdate uprn postcode_full la beds rent_type needstype]
-  end
-end

app/models/form/lettings/pages/min_rent_value_check.rb

@@ -1,24 +0,0 @@
-class Form::Lettings::Pages::MinRentValueCheck < ::Form::Page
-  def initialize(id, hsh, subsection, check_answers_card_number: nil)
-    super(id, hsh, subsection)
-    @depends_on = [{ "rent_in_soft_min_range?" => true }]
-    @title_text = {
-      "translation" => "soft_validations.rent.outside_range_title",
-      "arguments" => [{
-        "key" => "brent",
-        "label" => true,
-        "i18n_template" => "brent",
-      }],
-    }
-    @informative_text = I18n.t("soft_validations.rent.informative_text", higher_or_lower: "lower")
-    @check_answers_card_number = check_answers_card_number
-  end
-
-  def questions
-    @questions ||= [Form::Lettings::Questions::MinRentValueCheck.new(nil, nil, self, check_answers_card_number: @check_answers_card_number)]
-  end
-
-  def interruption_screen_question_ids
-    %w[brent period startdate uprn postcode_full la beds rent_type needstype]
-  end
-end

app/models/form/lettings/pages/person_age.rb

@@ -1,13 +1,12 @@
 class Form::Lettings::Pages::PersonAge < ::Form::Page
-  def initialize(id, hsh, subsection, person_index:, person_type: "non_child")
+  def initialize(id, hsh, subsection, person_index:)
     super(id, hsh, subsection)
-    @id = "person_#{person_index}_age_#{person_type}"
+    @id = "person_#{person_index}_age"
+    @copy_key = "lettings.household_characteristics.age#{person_index}"
     @person_index = person_index
-    @person_type = person_type
     @depends_on = [
       {
         "details_known_#{person_index}" => 0,
-        "person_#{person_index}_child_relation?" => (person_type == "child"),
       },
     ]
   end
@@ -15,7 +14,7 @@ class Form::Lettings::Pages::PersonAge < ::Form::Page
   def questions
     @questions ||= [
       Form::Lettings::Questions::AgeKnown.new(nil, nil, self, person_index: @person_index),
-      Form::Lettings::Questions::Age.new(nil, nil, self, person_index: @person_index, person_type: @person_type),
+      Form::Lettings::Questions::Age.new(nil, nil, self, person_index: @person_index),
     ]
   end
 end

app/models/form/lettings/pages/person_known.rb

@@ -2,7 +2,6 @@ class Form::Lettings::Pages::PersonKnown < ::Form::Page
   def initialize(id, hsh, subsection, person_index:)
     super(id, hsh, subsection)
     @id = "person_#{person_index}_known"
-    @header = "You’ve given us the details for #{person_index - 1} person in the household"
     @depends_on = (person_index..8).map { |index| { "hhmemb" => index } }
     @person_index = person_index
   end

app/models/form/lettings/pages/property_major_repairs.rb

@@ -2,6 +2,7 @@ class Form::Lettings::Pages::PropertyMajorRepairs < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "property_major_repairs"
+    @copy_key = "lettings.property_information.property_major_repairs"
     @depends_on = [{ "is_renewal?" => false, "vacancy_reason_not_renewal_or_first_let?" => true }]
   end
 

app/models/form/lettings/pages/property_postcode.rb

@@ -1,14 +0,0 @@
-class Form::Lettings::Pages::PropertyPostcode < ::Form::Page
-  def initialize(id, hsh, subsection)
-    super
-    @id = "property_postcode"
-    @depends_on = [{ "is_general_needs?" => true }]
-  end
-
-  def questions
-    @questions ||= [
-      Form::Lettings::Questions::PostcodeKnown.new(nil, nil, self),
-      Form::Lettings::Questions::PostcodeFull.new(nil, nil, self),
-    ]
-  end
-end

app/models/form/lettings/pages/rent_value_check.rb

@@ -0,0 +1,35 @@
+class Form::Lettings::Pages::RentValueCheck < ::Form::Page
+  def initialize(id, hsh, subsection, check_answers_card_number: nil)
+    super(id, hsh, subsection)
+    @depends_on = [{ "rent_soft_validation_triggered?" => true }]
+    @title_text = {
+      "translation" => "soft_validations.rent.outside_range_title",
+      "arguments" => [
+        {
+          "key" => "brent",
+          "label" => true,
+          "i18n_template" => "brent",
+        },
+      ],
+    }
+    @informative_text = {
+      "translation" => "soft_validations.rent.informative_text",
+      "arguments" => [
+        {
+          "key" => "rent_soft_validation_higher_or_lower_text",
+          "label" => false,
+          "i18n_template" => "higher_or_lower",
+        },
+      ],
+    }
+    @check_answers_card_number = check_answers_card_number
+  end
+
+  def questions
+    @questions ||= [Form::Lettings::Questions::RentValueCheck.new(nil, nil, self, check_answers_card_number: @check_answers_card_number)]
+  end
+
+  def interruption_screen_question_ids
+    %w[brent period startdate uprn postcode_full la beds rent_type needstype]
+  end
+end

app/models/form/lettings/pages/starter_tenancy_type.rb

@@ -2,6 +2,7 @@ class Form::Lettings::Pages::StarterTenancyType < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "starter_tenancy_type"
+    @copy_key = "lettings.tenancy_information.tenancy.starter_tenancy_type"
     @depends_on = [{ "starter_tenancy?" => true }]
   end
 

app/models/form/lettings/pages/tenancy_length.rb

@@ -2,6 +2,7 @@ class Form::Lettings::Pages::TenancyLength < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "tenancy_length"
+    @copy_key = "lettings.tenancy_information.tenancylength.tenancy_length"
     @depends_on = [{ "tenancy_type_fixed_term?" => true, "needstype" => 2 }]
   end
 

app/models/form/lettings/pages/tenancy_length_affordable_rent.rb

@@ -2,6 +2,7 @@ class Form::Lettings::Pages::TenancyLengthAffordableRent < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "tenancy_length_affordable_rent"
+    @copy_key = "lettings.tenancy_information.tenancylength.tenancy_length_affordable_rent"
     @depends_on = [{ "tenancy_type_fixed_term?" => true, "affordable_or_social_rent?" => true, "needstype" => 1 }]
   end
 

app/models/form/lettings/pages/tenancy_length_intermediate_rent.rb

@@ -2,6 +2,7 @@ class Form::Lettings::Pages::TenancyLengthIntermediateRent < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "tenancy_length_intermediate_rent"
+    @copy_key = "lettings.tenancy_information.tenancylength.tenancy_length_intermediate_rent"
     @depends_on = [{ "tenancy_type_fixed_term?" => true, "affordable_or_social_rent?" => false, "needstype" => 1 }]
   end
 

app/models/form/lettings/pages/tenancy_length_periodic.rb

@@ -2,6 +2,7 @@ class Form::Lettings::Pages::TenancyLengthPeriodic < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "tenancy_length_periodic"
+    @copy_key = "lettings.tenancy_information.tenancylength.tenancy_length_periodic"
     @depends_on = [{ "tenancy_type_periodic?" => true }]
   end
 

app/models/form/lettings/pages/tenancy_type.rb

@@ -2,6 +2,7 @@ class Form::Lettings::Pages::TenancyType < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "tenancy_type"
+    @copy_key = "lettings.tenancy_information.tenancy.tenancy_type"
     @depends_on = [{ "starter_tenancy?" => false }]
   end
 

app/models/form/lettings/pages/uprn.rb

@@ -2,6 +2,7 @@ class Form::Lettings::Pages::Uprn < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "uprn"
+    @copy_key = "lettings.property_information.uprn"
     @depends_on = [{ "is_supported_housing?" => false }]
   end
 

app/models/form/lettings/pages/uprn_selection.rb

@@ -2,7 +2,6 @@ class Form::Lettings::Pages::UprnSelection < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "uprn_selection"
-    @header = "We found some addresses that might be this property"
     @depends_on = [
       { "is_supported_housing?" => false, "uprn_known" => nil, "address_options_present?" => true },
       { "is_supported_housing?" => false, "uprn_known" => 0, "address_options_present?" => true },

app/models/form/lettings/pages/void_date.rb

@@ -2,7 +2,6 @@ class Form::Lettings::Pages::VoidDate < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "void_date"
-    @header = "Void date"
     @depends_on = [{ "is_renewal?" => false }]
   end
 

app/models/form/lettings/questions/address_line1.rb

@@ -2,11 +2,10 @@ class Form::Lettings::Questions::AddressLine1 < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "address_line1"
-    @header = "Address line 1"
+    @copy_key = "lettings.property_information.address.address_line1"
     @error_label = "Address line 1"
     @type = "text"
     @plain_label = true
-    @check_answer_label = "Address lines 1 and 2"
     @disable_clearing_if_not_routed_or_dynamic_answer_options = true
     @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
     @hide_question_number_on_page = true

app/models/form/lettings/questions/address_line1_for_address_matcher.rb

@@ -2,11 +2,10 @@ class Form::Lettings::Questions::AddressLine1ForAddressMatcher < ::Form::Questio
   def initialize(id, hsh, page)
     super
     @id = "address_line1_input"
-    @header = "Address line 1"
+    @copy_key = "lettings.property_information.address_matcher.address_line1_input"
     @error_label = "Address line 1"
     @type = "text"
     @plain_label = true
-    @check_answer_label = "Find address"
     @disable_clearing_if_not_routed_or_dynamic_answer_options = true
     @hide_question_number_on_page = true
   end

app/models/form/lettings/questions/address_line2.rb

@@ -2,7 +2,7 @@ class Form::Lettings::Questions::AddressLine2 < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "address_line2"
-    @header = "Address line 2 (optional)"
+    @copy_key = "lettings.property_information.address.address_line2"
     @type = "text"
     @plain_label = true
     @disable_clearing_if_not_routed_or_dynamic_answer_options = true

app/models/form/lettings/questions/age.rb

@@ -1,9 +1,8 @@
 class Form::Lettings::Questions::Age < ::Form::Question
-  def initialize(id, hsh, page, person_index:, person_type:)
+  def initialize(id, hsh, page, person_index:)
     super(id, hsh, page)
     @id = "age#{person_index}"
-    @check_answer_label = "Person #{person_index}’s age"
-    @header = "Age"
+    @copy_key = "lettings.household_characteristics.age#{person_index}.age#{person_index}"
     @type = "numeric"
     @width = 2
     @inferred_check_answers_value = [{ "condition" => { "age#{person_index}_known" => 1 }, "value" => "Not known" }]
@@ -13,7 +12,6 @@ class Form::Lettings::Questions::Age < ::Form::Question
     @step = 1
     @person_index = person_index
     @question_number = question_number
-    @person_type = person_type
     @hint_text = hint_text
   end
 
@@ -31,8 +29,6 @@ class Form::Lettings::Questions::Age < ::Form::Question
   def hint_text
     if form.start_year_after_2024?
       "Answer 1 for children aged under 1 year old"
-    elsif @person_type == "child"
-      "For a child under 1, enter 1"
     end
   end
 end

app/models/form/lettings/questions/age1.rb

@@ -2,8 +2,7 @@ class Form::Lettings::Questions::Age1 < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "age1"
-    @check_answer_label = "Lead tenant’s age"
-    @header = "Age"
+    @copy_key = "lettings.household_characteristics.age1.age1"
     @type = "numeric"
     @width = 2
     @inferred_check_answers_value = [{ "condition" => { "age1_known" => 1 }, "value" => "Not known" }]

app/models/form/lettings/questions/age1_known.rb

@@ -2,8 +2,7 @@ class Form::Lettings::Questions::Age1Known < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "age1_known"
-    @check_answer_label = ""
-    @header = "Do you know the lead tenant’s age?"
+    @copy_key = "lettings.household_characteristics.age1.age1_known"
     @type = "radio"
     @check_answers_card_number = 1
     @answer_options = ANSWER_OPTIONS
@@ -14,13 +13,5 @@ class Form::Lettings::Questions::Age1Known < ::Form::Question
 
   ANSWER_OPTIONS = { "0" => { "value" => "Yes" }, "1" => { "value" => "No" } }.freeze
 
-  def hint_text
-    if form.start_year_after_2024?
-      "The ’lead’ or ’main’ tenant is the person in the household who does the most paid work. If several people do the same amount of paid work, the lead tenant is whoever is the oldest."
-    else
-      "The ’lead’ or ’main’ tenant is the person in the household who does the most paid work. If several people do the same paid work, the lead tenant is whoever is the oldest."
-    end
-  end
-
   QUESTION_NUMBER_FROM_YEAR = { 2023 => 32, 2024 => 31 }.freeze
 end

app/models/form/lettings/questions/age_known.rb

@@ -2,11 +2,9 @@ class Form::Lettings::Questions::AgeKnown < ::Form::Question
   def initialize(id, hsh, page, person_index:)
     super(id, hsh, page)
     @id = "age#{person_index}_known"
-    @check_answer_label = ""
-    @header = "Do you know person #{person_index}’s age?"
+    @copy_key = "lettings.household_characteristics.age#{person_index}.age#{person_index}_known"
     @type = "radio"
     @check_answers_card_number = person_index
-    @hint_text = ""
     @answer_options = ANSWER_OPTIONS
     @conditional_for = { "age#{person_index}" => [0] }
     @hidden_in_check_answers = {

app/models/form/lettings/questions/beds.rb

@@ -2,8 +2,6 @@ class Form::Lettings::Questions::Beds < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "beds"
-    @check_answer_label = "Number of bedrooms"
-    @header = "How many bedrooms does the property have?"
     @type = "numeric"
     @width = 2
     @check_answers_card_number = 0
@@ -17,9 +15,5 @@ class Form::Lettings::Questions::Beds < ::Form::Question
     log.is_bedsit?
   end
 
-  def hint_text
-    form.start_year_after_2024? ? "If shared accommodation, enter the number of bedrooms occupied by this household." : "If shared accommodation, enter the number of bedrooms occupied by this household. A bedsit has 1 bedroom."
-  end
-
   QUESTION_NUMBER_FROM_YEAR = { 2023 => 22 }.freeze
 end

app/models/form/lettings/questions/builtype.rb

@@ -2,11 +2,8 @@ class Form::Lettings::Questions::Builtype < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "builtype"
-    @check_answer_label = "Type of building"
-    @header = "What type of building is the property?"
     @type = "radio"
     @check_answers_card_number = 0
-    @hint_text = ""
     @answer_options = ANSWER_OPTIONS
     @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
   end

app/models/form/lettings/questions/county.rb

@@ -2,10 +2,9 @@ class Form::Lettings::Questions::County < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "county"
-    @header = "County (optional)"
+    @copy_key = "lettings.property_information.address.county"
     @type = "text"
     @plain_label = true
-    @check_answer_label = "County"
     @disable_clearing_if_not_routed_or_dynamic_answer_options = true
     @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
     @hide_question_number_on_page = true

app/models/form/lettings/questions/declaration.rb

@@ -2,11 +2,9 @@ class Form::Lettings::Questions::Declaration < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "declaration"
-    @check_answer_label = "Tenant has seen the privacy notice"
-    @header = "Declaration"
     @type = "checkbox"
     @check_answers_card_number = 0 unless form.start_year_after_2024?
-    @top_guidance_partial = form.start_year_after_2024? ? "privacy_notice_tenant_2024" : "privacy_notice_tenant"
+    @top_guidance_partial = "privacy_notice_tenant"
     @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
   end
 

app/models/form/lettings/questions/details_known.rb

@@ -2,11 +2,8 @@ class Form::Lettings::Questions::DetailsKnown < ::Form::Question
   def initialize(id, hsh, page, person_index:)
     super(id, hsh, page)
     @id = "details_known_#{person_index}"
-    @check_answer_label = "Details known for person #{person_index}"
-    @header = "Do you know details for person #{person_index}?"
     @type = "radio"
     @check_answers_card_number = person_index
-    @hint_text = "You must provide details for everyone in the household if you know them."
     @answer_options = ANSWER_OPTIONS
   end
 

app/models/form/lettings/questions/ethnic_arab.rb

@@ -2,11 +2,9 @@ class Form::Lettings::Questions::EthnicArab < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "ethnic"
-    @check_answer_label = "Lead tenant’s ethnic background"
-    @header = "Which of the following best describes the lead tenant’s Arab background?"
+    @copy_key = "lettings.household_characteristics.ethnic.ethnic_background_arab"
     @type = "radio"
     @check_answers_card_number = 1
-    @hint_text = form.start_year_after_2024? ? "" : "The lead tenant is the person in the household who does the most paid work. If several people do the same paid work, the lead tenant is whoever is the oldest."
     @answer_options = ANSWER_OPTIONS
     @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
   end

app/models/form/lettings/questions/ethnic_asian.rb

@@ -2,11 +2,9 @@ class Form::Lettings::Questions::EthnicAsian < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "ethnic"
-    @check_answer_label = "Lead tenant’s ethnic background"
-    @header = "Which of the following best describes the lead tenant’s Asian or Asian British background?"
+    @copy_key = "lettings.household_characteristics.ethnic.ethnic_background_asian"
     @type = "radio"
     @check_answers_card_number = 1
-    @hint_text = form.start_year_after_2024? ? "" : "The lead tenant is the person in the household who does the most paid work. If several people do the same paid work, the lead tenant is whoever is the oldest."
     @answer_options = ANSWER_OPTIONS
     @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
   end

app/models/form/lettings/questions/ethnic_black.rb

@@ -2,11 +2,9 @@ class Form::Lettings::Questions::EthnicBlack < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "ethnic"
-    @check_answer_label = "Lead tenant’s ethnic background"
-    @header = "Which of the following best describes the lead tenant’s Black, African, Caribbean or Black British background?"
+    @copy_key = "lettings.household_characteristics.ethnic.ethnic_background_black"
     @type = "radio"
     @check_answers_card_number = 1
-    @hint_text = form.start_year_after_2024? ? "" : "The lead tenant is the person in the household who does the most paid work. If several people do the same paid work, the lead tenant is whoever is the oldest."
     @answer_options = ANSWER_OPTIONS
     @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
   end

app/models/form/lettings/questions/ethnic_group.rb

@@ -2,11 +2,8 @@ class Form::Lettings::Questions::EthnicGroup < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "ethnic_group"
-    @check_answer_label = "Lead tenant’s ethnic group"
-    @header = "What is the lead tenant’s ethnic group?"
     @type = "radio"
     @check_answers_card_number = 1
-    @hint_text = form.start_year_after_2024? ? "" : "The lead tenant is the person in the household who does the most paid work. If several people do the same paid work, the lead tenant is whoever is the oldest."
     @answer_options = ANSWER_OPTIONS
     @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
   end

app/models/form/lettings/questions/ethnic_mixed.rb

@@ -2,11 +2,9 @@ class Form::Lettings::Questions::EthnicMixed < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "ethnic"
-    @check_answer_label = "Lead tenant’s ethnic background"
-    @header = "Which of the following best describes the lead tenant’s Mixed or Multiple ethnic groups background?"
+    @copy_key = "lettings.household_characteristics.ethnic.ethnic_background_mixed"
     @type = "radio"
     @check_answers_card_number = 1
-    @hint_text = form.start_year_after_2024? ? "" : "The lead tenant is the person in the household who does the most paid work. If several people do the same paid work, the lead tenant is whoever is the oldest."
     @answer_options = ANSWER_OPTIONS
     @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
   end

app/models/form/lettings/questions/ethnic_white.rb

@@ -2,11 +2,9 @@ class Form::Lettings::Questions::EthnicWhite < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "ethnic"
-    @check_answer_label = "Lead tenant’s ethnic background"
-    @header = "Which of the following best describes the lead tenant’s White background?"
+    @copy_key = "lettings.household_characteristics.ethnic.ethnic_background_white"
     @type = "radio"
     @check_answers_card_number = 1
-    @hint_text = form.start_year_after_2024? ? "" : "The lead tenant is the person in the household who does the most paid work. If several people do the same paid work, the lead tenant is whoever is the oldest."
     @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
   end
 

app/models/form/lettings/questions/first_time_property_let_as_social_housing.rb

@@ -2,11 +2,8 @@ class Form::Lettings::Questions::FirstTimePropertyLetAsSocialHousing < ::Form::Q
   def initialize(id, hsh, page)
     super
     @id = "first_time_property_let_as_social_housing"
-    @check_answer_label = "First time being let as social-housing?"
-    @header = "Is this the first time the property has been let as social housing?"
     @type = "radio"
     @check_answers_card_number = 0
-    @hint_text = ""
     @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
   end
 

app/models/form/lettings/questions/gender_identity1.rb

@@ -2,8 +2,6 @@ class Form::Lettings::Questions::GenderIdentity1 < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "sex1"
-    @check_answer_label = "Lead tenant’s gender identity"
-    @header = "Which of these best describes the lead tenant’s gender identity?"
     @type = "radio"
     @check_answers_card_number = 1
     @answer_options = ANSWER_OPTIONS
@@ -18,13 +16,5 @@ class Form::Lettings::Questions::GenderIdentity1 < ::Form::Question
     "R" => { "value" => "Tenant prefers not to say" },
   }.freeze
 
-  def hint_text
-    if form.start_year_after_2024?
-      "This should be however they personally choose to identify from the options below. This may or may not be the same as their biological sex or the sex they were assigned at birth."
-    else
-      "The lead tenant is the person in the household who does the most paid work. If several people do the same paid work, the lead tenant is whoever is the oldest."
-    end
-  end
-
   QUESTION_NUMBER_FROM_YEAR = { 2023 => 33, 2024 => 32 }.freeze
 end

app/models/form/lettings/questions/hhmemb.rb

@@ -2,14 +2,11 @@ class Form::Lettings::Questions::Hhmemb < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "hhmemb"
-    @check_answer_label = "Number of household members"
-    @header = "How many people live in the household for this letting?"
     @type = "numeric"
     @width = 2
     @check_answers_card_number = 0
     @max = 8
     @min = 1
-    @hint_text = "You can provide details for a maximum of 8 people."
     @step = 1
     @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
   end

app/models/form/lettings/questions/joint.rb

@@ -2,11 +2,8 @@ class Form::Lettings::Questions::Joint < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "joint"
-    @check_answer_label = "Is this a joint tenancy?"
-    @header = "Is this a joint tenancy?"
     @type = "radio"
     @check_answers_card_number = 0
-    @hint_text = form.start_year_after_2024? ? "This is where two or more people are named on the tenancy agreement" : ""
     @answer_options = ANSWER_OPTIONS
     @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
   end

app/models/form/lettings/questions/la.rb

@@ -2,8 +2,6 @@ class Form::Lettings::Questions::La < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "la"
-    @check_answer_label = "Local Authority"
-    @header = "What is the property’s local authority?"
     @type = "select"
     @check_answers_card_number = nil
     @hint_text = ""

app/models/form/lettings/questions/majorrepairs.rb

@@ -2,11 +2,9 @@ class Form::Lettings::Questions::Majorrepairs < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "majorrepairs"
-    @check_answer_label = "Major repairs carried out during void period"
-    @header = "Were any major repairs carried out during the void period?"
+    @copy_key = "lettings.property_information.property_major_repairs.majorrepairs"
     @type = "radio"
     @check_answers_card_number = 0
-    @hint_text = "Major repairs are works that could not be reasonably carried out with a tenant living at the property. For example, structural repairs."
     @answer_options = ANSWER_OPTIONS
     @conditional_for = { "mrcdate" => [1] }
     @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]

app/models/form/lettings/questions/max_rent_value_check.rb

@@ -1,15 +0,0 @@
-class Form::Lettings::Questions::MaxRentValueCheck < ::Form::Question
-  def initialize(id, hsh, page, check_answers_card_number:)
-    super(id, hsh, page)
-    @id = "rent_value_check"
-    @check_answer_label = "Total rent confirmation"
-    @header = "Are you sure this is correct?"
-    @type = "interruption_screen"
-    @hint_text = I18n.t("soft_validations.rent.hint_text", higher_or_lower: "higher")
-    @check_answers_card_number = check_answers_card_number
-    @answer_options = ANSWER_OPTIONS
-    @hidden_in_check_answers = { "depends_on" => [{ "rent_value_check" => 0 }, { "rent_value_check" => 1 }] }
-  end
-
-  ANSWER_OPTIONS = { "0" => { "value" => "Yes" }, "1" => { "value" => "No" } }.freeze
-end

app/models/form/lettings/questions/mrcdate.rb

@@ -2,8 +2,7 @@ class Form::Lettings::Questions::Mrcdate < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "mrcdate"
-    @check_answer_label = "Completion date of repairs"
-    @header = "When were the repairs completed?"
+    @copy_key = "lettings.property_information.property_major_repairs.mrcdate"
     @type = "date"
     @check_answers_card_number = 0
     @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]

app/models/form/lettings/questions/nationality.rb

@@ -2,11 +2,8 @@ class Form::Lettings::Questions::Nationality < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "national"
-    @check_answer_label = "Lead tenant’s nationality"
-    @header = "What is the nationality of the lead tenant?"
     @type = "radio"
     @check_answers_card_number = 1
-    @hint_text = "The lead tenant is the person in the household who does the most paid work. If several people do the same paid work, the lead tenant is whoever is the oldest."
     @answer_options = ANSWER_OPTIONS
     @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
   end

app/models/form/lettings/questions/nationality_all.rb

@@ -2,8 +2,7 @@ class Form::Lettings::Questions::NationalityAll < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "nationality_all"
-    @check_answer_label = "Lead tenant’s nationality"
-    @header = "Enter a nationality"
+    @copy_key = "lettings.household_characteristics.nationality_all.nationality_all"
     @type = "select"
     @check_answers_card_number = 1
     @answer_options = GlobalConstants::COUNTRIES_ANSWER_OPTIONS

app/models/form/lettings/questions/nationality_all_group.rb

@@ -2,11 +2,9 @@ class Form::Lettings::Questions::NationalityAllGroup < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "nationality_all_group"
-    @check_answer_label = "Lead tenant’s nationality"
-    @header = "What is the nationality of the lead tenant?"
+    @copy_key = "lettings.household_characteristics.nationality_all.nationality_all_group"
     @type = "radio"
     @check_answers_card_number = 1
-    @hint_text = "If the lead tenant is a dual national of the United Kingdom and another country, enter United Kingdom. If they are a dual national of two other countries, the tenant should decide which country to enter."
     @answer_options = ANSWER_OPTIONS
     @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
     @conditional_for = { "nationality_all" => [12] }

app/models/form/lettings/questions/offered.rb

@@ -2,8 +2,6 @@ class Form::Lettings::Questions::Offered < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "offered"
-    @check_answer_label = I18n.t("check_answer_labels.offered")
-    @header = I18n.t("questions.offered")
     @type = "numeric"
     @width = 2
     @check_answers_card_number = 0

app/models/form/lettings/questions/person_gender_identity.rb

@@ -2,8 +2,6 @@ class Form::Lettings::Questions::PersonGenderIdentity < ::Form::Question
   def initialize(id, hsh, page, person_index:)
     super(id, hsh, page)
     @id = "sex#{person_index}"
-    @check_answer_label = "Person #{person_index}’s gender identity"
-    @header = "Which of these best describes person #{person_index}’s gender identity?"
     @type = "radio"
     @check_answers_card_number = person_index
     @answer_options = ANSWER_OPTIONS
@@ -19,14 +17,6 @@ class Form::Lettings::Questions::PersonGenderIdentity < ::Form::Question
     "R" => { "value" => "Person prefers not to say" },
   }.freeze
 
-  def hint_text
-    if form.start_year_after_2024?
-      "This should be however they personally choose to identify from the options below. This may or may not be the same as their biological sex or the sex they were assigned at birth."
-    else
-      ""
-    end
-  end
-
   def question_number
     base_question_number = case form.start_date.year
                            when 2023

app/models/form/lettings/questions/person_relationship.rb

@@ -2,11 +2,8 @@ class Form::Lettings::Questions::PersonRelationship < ::Form::Question
   def initialize(id, hsh, page, person_index:)
     super(id, hsh, page)
     @id = "relat#{person_index}"
-    @check_answer_label = "Person #{person_index}’s relationship to the lead tenant"
-    @header = "What is person #{person_index}’s relationship to the lead tenant?"
     @type = "radio"
     @check_answers_card_number = person_index
-    @hint_text = ""
     @answer_options = answer_options
     @person_index = person_index
     @question_number = question_number

app/models/form/lettings/questions/person_working_situation.rb

@@ -2,11 +2,8 @@ class Form::Lettings::Questions::PersonWorkingSituation < ::Form::Question
   def initialize(id, hsh, page, person_index:)
     super(id, hsh, page)
     @id = "ecstat#{person_index}"
-    @check_answer_label = "Person #{person_index}’s working situation"
-    @header = "Which of these best describes person #{person_index}’s working situation?"
     @type = "radio"
     @check_answers_card_number = person_index
-    @hint_text = ""
     @person_index = person_index
     @question_number = question_number
     @answer_options = answer_options

app/models/form/lettings/questions/postcode_for_address_matcher.rb

@@ -2,7 +2,7 @@ class Form::Lettings::Questions::PostcodeForAddressMatcher < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "postcode_full_input"
-    @header = "Postcode"
+    @copy_key = "lettings.property_information.address_matcher.postcode_full_input"
     @type = "text"
     @width = 5
     @plain_label = true

app/models/form/lettings/questions/postcode_for_full_address.rb

@@ -2,7 +2,7 @@ class Form::Lettings::Questions::PostcodeForFullAddress < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "postcode_full"
-    @header = "Postcode"
+    @copy_key = "lettings.property_information.address.postcode_full"
     @type = "text"
     @width = 5
     @inferred_check_answers_value = [{
@@ -17,7 +17,6 @@ class Form::Lettings::Questions::PostcodeForFullAddress < ::Form::Question
       },
     }
     @plain_label = true
-    @check_answer_label = "Postcode"
     @disable_clearing_if_not_routed_or_dynamic_answer_options = true
     @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
     @hide_question_number_on_page = true

app/models/form/lettings/questions/postcode_full.rb

@@ -1,15 +0,0 @@
-class Form::Lettings::Questions::PostcodeFull < ::Form::Question
-  def initialize(id, hsh, page)
-    super
-    @id = "postcode_full"
-    @check_answer_label = "Postcode"
-    @header = "What is the property’s postcode?"
-    @type = "text"
-    @width = 5
-    @inferred_check_answers_value = [{ "condition" => { "postcode_known" => 0 }, "value" => "Not known" }]
-    @check_answers_card_number = 0
-    @hint_text = ""
-    @inferred_answers = { "la" => { "is_la_inferred" => true } }
-    @disable_clearing_if_not_routed_or_dynamic_answer_options = true
-  end
-end

app/models/form/lettings/questions/postcode_known.rb

@@ -1,17 +0,0 @@
-class Form::Lettings::Questions::PostcodeKnown < ::Form::Question
-  def initialize(id, hsh, page)
-    super
-    @id = "postcode_known"
-    @check_answer_label = "Do you know the property postcode?"
-    @header = "Do you know the property’s postcode?"
-    @type = "radio"
-    @check_answers_card_number = 0
-    @hint_text = ""
-    @answer_options = ANSWER_OPTIONS
-    @disable_clearing_if_not_routed_or_dynamic_answer_options = true
-    @conditional_for = { "postcode_full" => [1] }
-    @hidden_in_check_answers = { "depends_on" => [{ "postcode_known" => 0 }, { "postcode_known" => 1 }] }
-  end
-
-  ANSWER_OPTIONS = { "1" => { "value" => "Yes" }, "0" => { "value" => "No" } }.freeze
-end

app/models/form/lettings/questions/previous_let_type.rb

@@ -2,11 +2,8 @@ class Form::Lettings::Questions::PreviousLetType < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "unitletas"
-    @check_answer_label = "Most recent let type"
-    @header = "What type was the property most recently let as?"
     @type = "radio"
     @check_answers_card_number = 0
-    @hint_text = form.start_year_after_2024? ? "This is the rent type of the previous tenancy in this property." : ""
     @answer_options = form.start_year_after_2024? ? ANSWER_OPTIONS_AFTER_2024 : ANSWER_OPTIONS
     @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
   end

app/models/form/lettings/questions/rent_type.rb

@@ -4,7 +4,7 @@ class Form::Lettings::Questions::RentType < ::Form::Question
     @id = "rent_type"
     @copy_key = "lettings.setup.rent_type.rent_type"
     @type = "radio"
-    @top_guidance_partial = form.start_year_after_2024? ? "rent_type_definitions_2024" : "rent_type_definitions"
+    @top_guidance_partial = "rent_type_definitions"
     @answer_options = form.start_year_after_2024? ? ANSWER_OPTIONS_2024 : ANSWER_OPTIONS
     @conditional_for = { "irproduct_other" => [5] }
     @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max] if form.start_date.present?

app/models/form/lettings/questions/rent_value_check.rb

@@ -1,11 +1,11 @@
-class Form::Lettings::Questions::MinRentValueCheck < ::Form::Question
+class Form::Lettings::Questions::RentValueCheck < ::Form::Question
   def initialize(id, hsh, page, check_answers_card_number:)
     super(id, hsh, page)
     @id = "rent_value_check"
     @check_answer_label = "Total rent confirmation"
     @header = "Are you sure this is correct?"
     @type = "interruption_screen"
-    @hint_text = I18n.t("soft_validations.rent.hint_text", higher_or_lower: "lower")
+    @hint_text = I18n.t("soft_validations.rent.hint_text")
     @check_answers_card_number = check_answers_card_number
     @answer_options = ANSWER_OPTIONS
     @hidden_in_check_answers = { "depends_on" => [{ "rent_value_check" => 0 }, { "rent_value_check" => 1 }] }

app/models/form/lettings/questions/rsnvac.rb

@@ -2,11 +2,8 @@ class Form::Lettings::Questions::Rsnvac < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "rsnvac"
-    @check_answer_label = "Vacancy reason"
-    @header = "What is the reason for the property being vacant?"
     @type = "radio"
     @check_answers_card_number = 0
-    @hint_text = ""
     @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
   end
 

app/models/form/lettings/questions/rsnvac_first_let.rb

@@ -2,11 +2,8 @@ class Form::Lettings::Questions::RsnvacFirstLet < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "rsnvac"
-    @check_answer_label = "Vacancy reason"
-    @header = "What is the reason for the property being vacant?"
     @type = "radio"
     @check_answers_card_number = 0
-    @hint_text = ""
     @answer_options = ANSWER_OPTIONS
     @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
   end

app/models/form/lettings/questions/sheltered.rb

@@ -2,11 +2,8 @@ class Form::Lettings::Questions::Sheltered < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "sheltered"
-    @check_answer_label = "Is this letting in sheltered accommodation?"
-    @header = "Is this letting in sheltered accommodation?"
     @type = "radio"
     @check_answers_card_number = 0
-    @hint_text = "Sheltered housing and special retirement housing are for tenants with low-level care and support needs. This typically provides some limited support to enable independent living, such as alarm-based assistance or a scheme manager.</br></br>Extra care housing is for tenants with medium to high care and support needs, often with 24 hour access to support staff provided by an agency registered with the Care Quality Commission."
     @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
   end
 

app/models/form/lettings/questions/starter_tenancy_type.rb

@@ -2,11 +2,9 @@ class Form::Lettings::Questions::StarterTenancyType < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "tenancy"
-    @check_answer_label = form.start_year_after_2024? ? "Type of main tenancy after the starter or introductory period has ended" : "Type of main tenancy after the starter period has ended"
-    @header = form.start_year_after_2024? ? "What is the type of tenancy after the starter or introductory period has ended?" : "What is the type of tenancy after the starter period has ended?"
+    @copy_key = "lettings.tenancy_information.tenancy.#{page.id}.tenancy"
     @type = "radio"
     @check_answers_card_number = 0
-    @hint_text = form.start_year_after_2024? ? "" : "This is also known as an ‘introductory period’."
     @conditional_for = { "tenancyother" => [3] }
     @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
   end

app/models/form/lettings/questions/startertenancy.rb

@@ -2,8 +2,6 @@ class Form::Lettings::Questions::Startertenancy < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "startertenancy"
-    @check_answer_label = "Is this a starter or introductory tenancy?"
-    @header = "Is this a starter tenancy?"
     @type = "radio"
     @check_answers_card_number = 0
     @answer_options = ANSWER_OPTIONS
@@ -12,14 +10,5 @@ class Form::Lettings::Questions::Startertenancy < ::Form::Question
 
   ANSWER_OPTIONS = { "1" => { "value" => "Yes" }, "2" => { "value" => "No" } }.freeze
 
-  def hint_text
-    if form.start_year_after_2024?
-      "If the tenancy has an ‘introductory period’ answer ‘yes’.<br><br>
-       You should submit a CORE log at the beginning of the starter tenancy or introductory period, with the best information you have at the time. You do not need to submit a log when a tenant later rolls onto the main tenancy."
-    else
-      "This is also known as an ‘introductory period’."
-    end
-  end
-
   QUESTION_NUMBER_FROM_YEAR = { 2023 => 26 }.freeze
 end

app/models/form/lettings/questions/tenancy_length.rb

@@ -2,14 +2,12 @@ class Form::Lettings::Questions::TenancyLength < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "tenancylength"
-    @check_answer_label = "Length of fixed-term tenancy"
-    @header = "What is the length of the fixed-term tenancy to the nearest year?"
+    @copy_key = "lettings.tenancy_information.tenancylength.#{page.id}"
     @type = "numeric"
     @width = 2
     @check_answers_card_number = 0
     @max = 150
     @min = 0
-    @hint_text = "Do not include the starter or introductory period."
     @step = 1
     @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
   end

app/models/form/lettings/questions/tenancy_length_affordable_rent.rb

@@ -2,8 +2,7 @@ class Form::Lettings::Questions::TenancyLengthAffordableRent < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "tenancylength"
-    @check_answer_label = "Length of fixed-term tenancy"
-    @header = "What is the length of the fixed-term tenancy to the nearest year?"
+    @copy_key = "lettings.tenancy_information.tenancylength.#{page.id}"
     @type = "numeric"
     @width = 2
     @check_answers_card_number = 0
@@ -13,13 +12,5 @@ class Form::Lettings::Questions::TenancyLengthAffordableRent < ::Form::Question
     @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
   end
 
-  def hint_text
-    if form.start_year_after_2024?
-      "Do not include the starter or introductory period.</br>The minimum period is 2 years for social or affordable rent general needs logs. You do not need to submit CORE logs for these types of tenancies if they are shorter than 2 years."
-    else
-      "Do not include the starter or introductory period.</br>The minimum period is 2 years for social or affordable rent general needs logs and you do not need a log for shorter tenancies."
-    end
-  end
-
   QUESTION_NUMBER_FROM_YEAR = { 2023 => 28 }.freeze
 end

app/models/form/lettings/questions/tenancy_length_intermediate_rent.rb

@@ -2,8 +2,7 @@ class Form::Lettings::Questions::TenancyLengthIntermediateRent < ::Form::Questio
   def initialize(id, hsh, page)
     super
     @id = "tenancylength"
-    @check_answer_label = "Length of fixed-term tenancy"
-    @header = "What is the length of the fixed-term tenancy to the nearest year?"
+    @copy_key = "lettings.tenancy_information.tenancylength.#{page.id}"
     @type = "numeric"
     @width = 2
     @check_answers_card_number = 0
@@ -13,13 +12,5 @@ class Form::Lettings::Questions::TenancyLengthIntermediateRent < ::Form::Questio
     @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
   end
 
-  def hint_text
-    if form.start_year_after_2024?
-      "Do not include the starter or introductory period.</br>The minimum period is 1 year for intermediate rent general needs logs. You do not need to submit CORE logs for these types of tenancies if they are shorter than 1 year."
-    else
-      "Do not include the starter or introductory period.</br>The minimum period is 1 year for intermediate rent general needs logs and you do not need a log for shorter tenancies."
-    end
-  end
-
   QUESTION_NUMBER_FROM_YEAR = { 2023 => 28 }.freeze
 end

app/models/form/lettings/questions/tenancy_length_periodic.rb

@@ -2,8 +2,7 @@ class Form::Lettings::Questions::TenancyLengthPeriodic < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "tenancylength"
-    @check_answer_label = "Length of periodic tenancy"
-    @header = "What is the length of the periodic tenancy to the nearest year?"
+    @copy_key = "lettings.tenancy_information.tenancylength.#{page.id}"
     @type = "numeric"
     @width = 2
     @check_answers_card_number = 0
@@ -11,7 +10,6 @@ class Form::Lettings::Questions::TenancyLengthPeriodic < ::Form::Question
     @min = 0
     @step = 1
     @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
-    @hint_text = "As this is a periodic tenancy, this question is optional. If you do not have the information available click save and continue"
   end
 
   QUESTION_NUMBER_FROM_YEAR = { 2023 => 28 }.freeze

app/models/form/lettings/questions/tenancy_other.rb

@@ -2,11 +2,9 @@ class Form::Lettings::Questions::TenancyOther < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "tenancyother"
-    @check_answer_label = ""
-    @header = "Please state the tenancy type"
+    @copy_key = "lettings.tenancy_information.tenancy.#{page.id}.tenancyother"
     @type = "text"
     @check_answers_card_number = 0
-    @hint_text = ""
     @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
   end
 

app/models/form/lettings/questions/tenancy_type.rb

@@ -2,11 +2,9 @@ class Form::Lettings::Questions::TenancyType < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "tenancy"
-    @check_answer_label = "Type of main tenancy"
-    @header = "What is the type of tenancy?"
+    @copy_key = "lettings.tenancy_information.tenancy.#{page.id}.tenancy"
     @type = "radio"
     @check_answers_card_number = 0
-    @hint_text = ""
     @conditional_for = { "tenancyother" => [3] }
     @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
   end

app/models/form/lettings/questions/town_or_city.rb

@@ -2,10 +2,9 @@ class Form::Lettings::Questions::TownOrCity < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "town_or_city"
-    @header = "Town or city"
+    @copy_key = "lettings.property_information.address.town_or_city"
     @type = "text"
     @plain_label = true
-    @check_answer_label = "Town or city"
     @disable_clearing_if_not_routed_or_dynamic_answer_options = true
     @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
     @hide_question_number_on_page = true

app/models/form/lettings/questions/unittype_gn.rb

@@ -2,11 +2,8 @@ class Form::Lettings::Questions::UnittypeGn < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "unittype_gn"
-    @check_answer_label = "Type of unit"
-    @header = "What type of unit is the property?"
     @type = "radio"
     @check_answers_card_number = 0
-    @hint_text = ""
     @answer_options = ANSWER_OPTIONS
     @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
   end

app/models/form/lettings/questions/uprn.rb

@@ -2,8 +2,7 @@ class Form::Lettings::Questions::Uprn < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "uprn"
-    @check_answer_label = "UPRN"
-    @header = "What is the property's UPRN?"
+    @copy_key = "lettings.property_information.uprn.uprn"
     @type = "text"
     @width = 10
     @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]

app/models/form/lettings/questions/uprn_known.rb

@@ -2,13 +2,9 @@ class Form::Lettings::Questions::UprnKnown < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "uprn_known"
-    @check_answer_label = "UPRN known?"
-    @header = "Do you know the property's UPRN?"
+    @copy_key = "lettings.property_information.uprn.uprn_known"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
-    @hint_text = "The Unique Property Reference Number (UPRN) is a unique number system created by Ordnance Survey and used by housing providers and various industries across the UK. An example UPRN is 10010457355.<br><br>
-      The UPRN may not be the same as the property reference assigned by your organisation.<br><br>
-      If you don’t know the UPRN you can enter the address of the property instead on the next screen."
     @conditional_for = { "uprn" => [1] }
     @inferred_check_answers_value = [
       {

app/models/form/lettings/questions/uprn_selection.rb

@@ -2,9 +2,7 @@ class Form::Lettings::Questions::UprnSelection < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "uprn_selection"
-    @header = "Select the correct address"
     @type = "radio"
-    @check_answer_label = "Select the correct address"
     @disable_clearing_if_not_routed_or_dynamic_answer_options = true
   end
 

app/models/form/lettings/questions/voiddate.rb

@@ -2,8 +2,6 @@ class Form::Lettings::Questions::Voiddate < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "voiddate"
-    @check_answer_label = "Void date"
-    @header = "What is the void date?"
     @type = "date"
     @check_answers_card_number = 0
     @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]

app/models/form/lettings/questions/wheelchair.rb

@@ -2,11 +2,8 @@ class Form::Lettings::Questions::Wheelchair < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "wchair"
-    @check_answer_label = "Property built or adapted to wheelchair-user standards"
-    @header = "Is the property built or adapted to wheelchair-user standards?"
     @type = "radio"
     @check_answers_card_number = 0
-    @hint_text = form.start_year_after_2024? ? "This is whether someone who uses a wheelchair is able to make full use of all of the property’s rooms and facilities, including use of both inside and outside space, and entering and exiting the property." : ""
     @answer_options = ANSWER_OPTIONS
     @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
   end

app/models/form/lettings/questions/working_situation1.rb

@@ -2,11 +2,8 @@ class Form::Lettings::Questions::WorkingSituation1 < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "ecstat1"
-    @check_answer_label = "Lead tenant’s working situation"
-    @header = "Which of these best describes the lead tenant’s working situation?"
     @type = "radio"
     @check_answers_card_number = 1
-    @hint_text = form.start_year_after_2024? ? "" : "The lead tenant is the person in the household who does the most paid work. If several people do the same paid work, the lead tenant is whoever is the oldest."
     @answer_options = ANSWER_OPTIONS
     @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
   end

app/models/form/lettings/subsections/household_characteristics.rb

@@ -35,7 +35,6 @@ class Form::Lettings::Subsections::HouseholdCharacteristics < ::Form::Subsection
       Form::Lettings::Pages::PersonRelationshipToLead.new(nil, nil, self, person_index: 2),
       (Form::Lettings::Pages::PartnerUnder16ValueCheck.new("relationship_2_partner_under_16_value_check", nil, self, person_index: 2) if form.start_year_after_2024?),
       (Form::Lettings::Pages::MultiplePartnersValueCheck.new("relationship_2_multiple_partners_value_check", nil, self, person_index: 2) if form.start_year_after_2024?),
-      Form::Lettings::Pages::PersonAge.new(nil, nil, self, person_index: 2, person_type: "child"),
       Form::Lettings::Pages::PersonAge.new(nil, nil, self, person_index: 2),
       Form::Lettings::Pages::NoFemalesPregnantHouseholdPersonAgeValueCheck.new(nil, nil, self,
                                                                                person_index: 2),
@@ -56,7 +55,6 @@ class Form::Lettings::Subsections::HouseholdCharacteristics < ::Form::Subsection
       Form::Lettings::Pages::PersonRelationshipToLead.new(nil, nil, self, person_index: 3),
       (Form::Lettings::Pages::PartnerUnder16ValueCheck.new("relationship_3_partner_under_16_value_check", nil, self, person_index: 3) if form.start_year_after_2024?),
       (Form::Lettings::Pages::MultiplePartnersValueCheck.new("relationship_3_multiple_partners_value_check", nil, self, person_index: 3) if form.start_year_after_2024?),
-      Form::Lettings::Pages::PersonAge.new(nil, nil, self, person_index: 3, person_type: "child"),
       Form::Lettings::Pages::PersonAge.new(nil, nil, self, person_index: 3),
       Form::Lettings::Pages::NoFemalesPregnantHouseholdPersonAgeValueCheck.new(nil, nil, self,
                                                                                person_index: 3),
@@ -77,7 +75,6 @@ class Form::Lettings::Subsections::HouseholdCharacteristics < ::Form::Subsection
       Form::Lettings::Pages::PersonRelationshipToLead.new(nil, nil, self, person_index: 4),
       (Form::Lettings::Pages::PartnerUnder16ValueCheck.new("relationship_4_partner_under_16_value_check", nil, self, person_index: 4) if form.start_year_after_2024?),
       (Form::Lettings::Pages::MultiplePartnersValueCheck.new("relationship_4_multiple_partners_value_check", nil, self, person_index: 4) if form.start_year_after_2024?),
-      Form::Lettings::Pages::PersonAge.new(nil, nil, self, person_index: 4, person_type: "child"),
       Form::Lettings::Pages::PersonAge.new(nil, nil, self, person_index: 4),
       Form::Lettings::Pages::NoFemalesPregnantHouseholdPersonAgeValueCheck.new(nil, nil, self,
                                                                                person_index: 4),
@@ -98,7 +95,6 @@ class Form::Lettings::Subsections::HouseholdCharacteristics < ::Form::Subsection
       Form::Lettings::Pages::PersonRelationshipToLead.new(nil, nil, self, person_index: 5),
       (Form::Lettings::Pages::PartnerUnder16ValueCheck.new("relationship_5_partner_under_16_value_check", nil, self, person_index: 5) if form.start_year_after_2024?),
       (Form::Lettings::Pages::MultiplePartnersValueCheck.new("relationship_5_multiple_partners_value_check", nil, self, person_index: 5) if form.start_year_after_2024?),
-      Form::Lettings::Pages::PersonAge.new(nil, nil, self, person_index: 5, person_type: "child"),
       Form::Lettings::Pages::PersonAge.new(nil, nil, self, person_index: 5),
       Form::Lettings::Pages::NoFemalesPregnantHouseholdPersonAgeValueCheck.new(nil, nil, self,
                                                                                person_index: 5),
@@ -119,7 +115,6 @@ class Form::Lettings::Subsections::HouseholdCharacteristics < ::Form::Subsection
       Form::Lettings::Pages::PersonRelationshipToLead.new(nil, nil, self, person_index: 6),
       (Form::Lettings::Pages::PartnerUnder16ValueCheck.new("relationship_6_partner_under_16_value_check", nil, self, person_index: 6) if form.start_year_after_2024?),
       (Form::Lettings::Pages::MultiplePartnersValueCheck.new("relationship_6_multiple_partners_value_check", nil, self, person_index: 6) if form.start_year_after_2024?),
-      Form::Lettings::Pages::PersonAge.new(nil, nil, self, person_index: 6, person_type: "child"),
       Form::Lettings::Pages::PersonAge.new(nil, nil, self, person_index: 6),
       Form::Lettings::Pages::NoFemalesPregnantHouseholdPersonAgeValueCheck.new(nil, nil, self,
                                                                                person_index: 6),
@@ -140,7 +135,6 @@ class Form::Lettings::Subsections::HouseholdCharacteristics < ::Form::Subsection
       Form::Lettings::Pages::PersonRelationshipToLead.new(nil, nil, self, person_index: 7),
       (Form::Lettings::Pages::PartnerUnder16ValueCheck.new("relationship_7_partner_under_16_value_check", nil, self, person_index: 7) if form.start_year_after_2024?),
       (Form::Lettings::Pages::MultiplePartnersValueCheck.new("relationship_7_multiple_partners_value_check", nil, self, person_index: 7) if form.start_year_after_2024?),
-      Form::Lettings::Pages::PersonAge.new(nil, nil, self, person_index: 7, person_type: "child"),
       Form::Lettings::Pages::PersonAge.new(nil, nil, self, person_index: 7),
       Form::Lettings::Pages::NoFemalesPregnantHouseholdPersonAgeValueCheck.new(nil, nil, self,
                                                                                person_index: 7),
@@ -161,7 +155,6 @@ class Form::Lettings::Subsections::HouseholdCharacteristics < ::Form::Subsection
       Form::Lettings::Pages::PersonRelationshipToLead.new(nil, nil, self, person_index: 8),
       (Form::Lettings::Pages::PartnerUnder16ValueCheck.new("relationship_8_partner_under_16_value_check", nil, self, person_index: 8) if form.start_year_after_2024?),
       (Form::Lettings::Pages::MultiplePartnersValueCheck.new("relationship_8_multiple_partners_value_check", nil, self, person_index: 8) if form.start_year_after_2024?),
-      Form::Lettings::Pages::PersonAge.new(nil, nil, self, person_index: 8, person_type: "child"),
       Form::Lettings::Pages::PersonAge.new(nil, nil, self, person_index: 8),
       Form::Lettings::Pages::NoFemalesPregnantHouseholdPersonAgeValueCheck.new(nil, nil, self,
                                                                                person_index: 8),

app/models/form/lettings/subsections/income_and_benefits.rb

@@ -24,8 +24,7 @@ class Form::Lettings::Subsections::IncomeAndBenefits < ::Form::Subsection
       Form::Lettings::Pages::RentBiWeekly.new(nil, nil, self),
       Form::Lettings::Pages::Rent4Weekly.new(nil, nil, self),
       Form::Lettings::Pages::RentMonthly.new(nil, nil, self),
-      Form::Lettings::Pages::MinRentValueCheck.new("brent_min_rent_value_check", nil, self, check_answers_card_number: 0),
-      Form::Lettings::Pages::MaxRentValueCheck.new("brent_max_rent_value_check", nil, self, check_answers_card_number: 0),
+      Form::Lettings::Pages::RentValueCheck.new("brent_rent_value_check", nil, self, check_answers_card_number: 0),
       Form::Lettings::Pages::SchargeValueCheck.new(nil, nil, self),
       Form::Lettings::Pages::PschargeValueCheck.new(nil, nil, self),
       Form::Lettings::Pages::SupchargValueCheck.new(nil, nil, self),

app/models/form/lettings/subsections/property_information.rb

@@ -10,8 +10,7 @@ class Form::Lettings::Subsections::PropertyInformation < ::Form::Subsection
     @pages ||= [
       uprn_questions,
       Form::Lettings::Pages::PropertyLocalAuthority.new(nil, nil, self),
-      Form::Lettings::Pages::MinRentValueCheck.new("local_authority_min_rent_value_check", nil, self, check_answers_card_number: nil),
-      Form::Lettings::Pages::MaxRentValueCheck.new("local_authority_max_rent_value_check", nil, self, check_answers_card_number: nil),
+      Form::Lettings::Pages::RentValueCheck.new("local_authority_rent_value_check", nil, self, check_answers_card_number: nil),
       Form::Lettings::Pages::FirstTimePropertyLetAsSocialHousing.new(nil, nil, self),
       Form::Lettings::Pages::PropertyLetType.new(nil, nil, self),
       Form::Lettings::Pages::PropertyVacancyReasonNotFirstLet.new(nil, nil, self),
@@ -21,8 +20,7 @@ class Form::Lettings::Subsections::PropertyInformation < ::Form::Subsection
       Form::Lettings::Pages::PropertyBuildingType.new(nil, nil, self),
       Form::Lettings::Pages::PropertyWheelchairAccessible.new(nil, nil, self),
       Form::Lettings::Pages::PropertyNumberOfBedrooms.new(nil, nil, self),
-      Form::Lettings::Pages::MinRentValueCheck.new("beds_min_rent_value_check", nil, self, check_answers_card_number: 0),
-      Form::Lettings::Pages::MaxRentValueCheck.new("beds_max_rent_value_check", nil, self, check_answers_card_number: 0),
+      Form::Lettings::Pages::RentValueCheck.new("beds_rent_value_check", nil, self, check_answers_card_number: 0),
       Form::Lettings::Pages::VoidDate.new(nil, nil, self),
       Form::Lettings::Pages::VoidDateValueCheck.new(nil, nil, self),
       Form::Lettings::Pages::PropertyMajorRepairs.new(nil, nil, self),
@@ -36,20 +34,16 @@ class Form::Lettings::Subsections::PropertyInformation < ::Form::Subsection
         Form::Lettings::Pages::Uprn.new(nil, nil, self),
         Form::Lettings::Pages::UprnConfirmation.new(nil, nil, self),
         Form::Lettings::Pages::AddressMatcher.new(nil, nil, self),
-        Form::Lettings::Pages::NoAddressFound.new(nil, nil, self),
+        Form::Lettings::Pages::NoAddressFound.new(nil, nil, self), # soft validation
         Form::Lettings::Pages::UprnSelection.new(nil, nil, self),
         Form::Lettings::Pages::AddressFallback.new(nil, nil, self),
       ]
-    elsif form.start_date.year == 2023
+    else
       [
         Form::Lettings::Pages::Uprn.new(nil, nil, self),
         Form::Lettings::Pages::UprnConfirmation.new(nil, nil, self),
         Form::Lettings::Pages::Address.new(nil, nil, self),
       ]
-    else
-      [
-        Form::Lettings::Pages::PropertyPostcode.new(nil, nil, self),
-      ]
     end
   end
 

app/models/form/sales/pages/about_price_value_check.rb

@@ -6,8 +6,9 @@ class Form::Sales::Pages::AboutPriceValueCheck < ::Form::Page
         "purchase_price_out_of_soft_range?" => true,
       },
     ]
+    @copy_key = "sales.soft_validations.value_value_check"
     @title_text = {
-      "translation" => "soft_validations.purchase_price.title_text",
+      "translation" => "forms.#{form.start_date.year}.#{@copy_key}.title_text",
       "arguments" => [
         {
           "key" => "value",
@@ -17,7 +18,7 @@ class Form::Sales::Pages::AboutPriceValueCheck < ::Form::Page
       ],
     }
     @informative_text = {
-      "translation" => "soft_validations.purchase_price.hint_text",
+      "translation" => "forms.#{form.start_date.year}.#{@copy_key}.informative_text",
       "arguments" => [
         {
           "key" => "field_formatted_as_currency",

app/models/form/sales/pages/address.rb

@@ -2,7 +2,7 @@ class Form::Sales::Pages::Address < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "address"
-    @header = "Q#{QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]} - What is the property's address?"
+    @copy_key = "sales.property_information.address"
     @depends_on = [
       { "uprn_known" => nil },
       { "uprn_known" => 0 },

app/models/form/sales/pages/address_fallback.rb

@@ -2,7 +2,7 @@ class Form::Sales::Pages::AddressFallback < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "address"
-    @header = "Q12 - What is the property's address?"
+    @copy_key = "sales.property_information.address"
     @depends_on = [
       { "uprn_known" => nil, "uprn_selection" => "uprn_not_listed" },
       { "uprn_known" => 0, "uprn_selection" => "uprn_not_listed" },

app/models/form/sales/pages/address_matcher.rb

@@ -2,7 +2,7 @@ class Form::Sales::Pages::AddressMatcher < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "address_matcher"
-    @header = "Find an address"
+    @copy_key = "sales.property_information.address_matcher"
     @depends_on = [
       { "uprn_known" => nil },
       { "uprn_known" => 0 },

app/models/form/sales/pages/last_accommodation.rb

@@ -2,6 +2,7 @@ class Form::Sales::Pages::LastAccommodation < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "last_accommodation"
+    @copy_key = "sales.household_situation.last_accommodation"
   end
 
   def questions

app/models/form/sales/pages/last_accommodation_la.rb

@@ -2,6 +2,7 @@ class Form::Sales::Pages::LastAccommodationLa < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "last_accommodation_la"
+    @copy_key = "sales.household_situation.last_accommodation_la"
     @depends_on = [{
       "is_previous_la_inferred" => false,
     }]

app/models/form/sales/pages/monthly_charges_value_check.rb

@@ -6,8 +6,9 @@ class Form::Sales::Pages::MonthlyChargesValueCheck < ::Form::Page
         "monthly_charges_over_soft_max?" => true,
       },
     ]
+    @copy_key = "sales.soft_validations.monthly_charges_value_check"
     @title_text = {
-      "translation" => "soft_validations.monthly_charges_over_soft_max.title_text",
+      "translation" => "forms.#{form.start_date.year}.#{@copy_key}.title_text",
       "arguments" => [
         {
           "key" => "field_formatted_as_currency",
@@ -17,7 +18,7 @@ class Form::Sales::Pages::MonthlyChargesValueCheck < ::Form::Page
       ],
     }
     @informative_text = {
-      "translation" => "soft_validations.monthly_charges_over_soft_max.hint_text",
+      "translation" => "forms.#{form.start_date.year}.#{@copy_key}.informative_text",
       "arguments" => [],
     }
   end

app/models/form/sales/pages/no_address_found.rb

@@ -3,12 +3,13 @@ class Form::Sales::Pages::NoAddressFound < ::Form::Page
     super
     @id = "no_address_found"
     @type = "interruption_screen"
+    @copy_key = "sales.soft_validations.address_search_value_check"
     @title_text = {
-      "translation" => "soft_validations.no_address_found.title_text",
+      "translation" => "forms.#{form.start_date.year}.#{@copy_key}.title_text",
       "arguments" => [],
     }
     @informative_text = {
-      "translation" => "soft_validations.no_address_found.informative_text",
+      "translation" => "forms.#{form.start_date.year}.#{@copy_key}.informative_text",
       "arguments" => [],
     }
     @depends_on = [

app/models/form/sales/pages/percentage_discount_value_check.rb

@@ -1,15 +1,16 @@
 class Form::Sales::Pages::PercentageDiscountValueCheck < ::Form::Page
   def initialize(id, hsh, subsection)
     super
+    @depends_on = [{ "percentage_discount_invalid?" => true }]
+    @copy_key = "sales.soft_validations.percentage_discount_value_check"
     @title_text = {
-      "translation" => "soft_validations.percentage_discount_value.title_text",
+      "translation" => "forms.#{form.start_date.year}.#{@copy_key}.title_text",
       "arguments" => [{ "key" => "discount", "label" => true, "i18n_template" => "discount" }],
     }
     @informative_text = {
-      "translation" => "soft_validations.percentage_discount_value.hint_text",
+      "translation" => "forms.#{form.start_date.year}.#{@copy_key}.informative_text",
       "arguments" => [],
     }
-    @depends_on = [{ "percentage_discount_invalid?" => true }]
   end
 
   def questions