From f2acdc0bd0d39dfa21157d6843d2f4ec80c28e63 Mon Sep 17 00:00:00 2001
From: Kat <54268893+kosiakkatrina@users.noreply.github.com>
Date: Thu, 31 Oct 2024 14:56:49 +0000
Subject: [PATCH] Update wrong copy, remove duplicate keys

---
 app/models/form/lettings/questions/reason.rb       |  2 +-
 .../form/lettings/questions/reason_renewal.rb      |  2 +-
 .../forms/2023/lettings/household_situation.en.yml | 14 +-------------
 .../forms/2024/lettings/household_situation.en.yml | 14 +-------------
 4 files changed, 4 insertions(+), 28 deletions(-)

diff --git a/app/models/form/lettings/questions/reason.rb b/app/models/form/lettings/questions/reason.rb
index 1d75d90cf..4bc00ce43 100644
--- a/app/models/form/lettings/questions/reason.rb
+++ b/app/models/form/lettings/questions/reason.rb
@@ -2,7 +2,7 @@ class Form::Lettings::Questions::Reason < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "reason"
-    @copy_key = "lettings.household_situation.reason.renewal.#{page.id}.reason"
+    @copy_key = "lettings.household_situation.reason.#{page.id}.reason"
     @type = "radio"
     @check_answers_card_number = 0
     @conditional_for = {
diff --git a/app/models/form/lettings/questions/reason_renewal.rb b/app/models/form/lettings/questions/reason_renewal.rb
index 04a575189..9a9ee72de 100644
--- a/app/models/form/lettings/questions/reason_renewal.rb
+++ b/app/models/form/lettings/questions/reason_renewal.rb
@@ -3,7 +3,7 @@ class Form::Lettings::Questions::ReasonRenewal < ::Form::Question
     super
     @id = "reason"
     @type = "radio"
-    @copy_key = "lettings.household_situation.reason.renewal.#{page.id}.reason"
+    @copy_key = "lettings.household_situation.reason.#{page.id}.reason"
     @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]
     @conditional_for = {
diff --git a/config/locales/forms/2023/lettings/household_situation.en.yml b/config/locales/forms/2023/lettings/household_situation.en.yml
index 045b16acd..9e5e50918 100644
--- a/config/locales/forms/2023/lettings/household_situation.en.yml
+++ b/config/locales/forms/2023/lettings/household_situation.en.yml
@@ -15,12 +15,6 @@ en:
             hint_text: ""
             question_text: "How long has the household been on the local authority waiting list for the new letting?"
 
-          waityear:
-            page_header: ""
-            check_answer_label: "Length of time on local authority waiting list"
-            hint_text: ""
-            question_text: "How long has the household been on the local authority waiting list for the new letting?"
-
           reason:
             reason_for_leaving_last_settled_home_renewal:
               page_header: ""
@@ -75,7 +69,7 @@ en:
           previous_local_authority:
             page_header: ""
             previous_la_known:
-              check_answer_label: "Do you know the local authority of the household’s last settled accommodation?"
+              check_answer_label: ""
               hint_text: "This is also known as the household’s ‘last settled home’."
               question_text: "Do you know the local authority of the household’s last settled accommodation?"
             prevloc:
@@ -101,12 +95,6 @@ en:
             hint_text: "Select all that apply."
             question_text: "How was this letting allocated?"
 
-          letting_allocation:
-            page_header: ""
-            check_answer_label: "Allocation system"
-            hint_text: "Select all that apply."
-            question_text: "How was this letting allocated?"
-
           referral:
             supported_housing:
               prp:
diff --git a/config/locales/forms/2024/lettings/household_situation.en.yml b/config/locales/forms/2024/lettings/household_situation.en.yml
index 9f95578de..e1bf4c0ce 100644
--- a/config/locales/forms/2024/lettings/household_situation.en.yml
+++ b/config/locales/forms/2024/lettings/household_situation.en.yml
@@ -15,12 +15,6 @@ en:
             hint_text: ""
             question_text: "How long has the household been on the local authority waiting list for the area of the new letting?"
 
-          waityear:
-            page_header: ""
-            check_answer_label: "Length of time on local authority waiting list"
-            hint_text: ""
-            question_text: "How long has the household been on the local authority waiting list for the area of the new letting?"
-
           reason:
             reason_for_leaving_last_settled_home_renewal:
               page_header: ""
@@ -75,7 +69,7 @@ en:
           previous_local_authority:
             page_header: ""
             previous_la_known:
-              check_answer_label: "Do you know the local authority of the household’s last settled accommodation?"
+              check_answer_label: ""
               hint_text: "This is the tenant’s last long-standing home. It is where the tenant was living before any period in temporary accommodation, sleeping rough or otherwise homeless."
               question_text: "Do you know the local authority of the household’s last settled accommodation?"
             prevloc:
@@ -101,12 +95,6 @@ en:
             hint_text: "Select all that apply."
             question_text: "How was this letting allocated?"
 
-          letting_allocation:
-            page_header: ""
-            check_answer_label: "Allocation system"
-            hint_text: "Select all that apply."
-            question_text: "How was this letting allocated?"
-
           referral:
             supported_housing:
               prp: