From bf72f0772347f09fae10758bf4cd73e6a8e900d4 Mon Sep 17 00:00:00 2001
From: Manny Dinssa <44172848+Dinssa@users.noreply.github.com>
Date: Tue, 29 Oct 2024 16:15:18 +0000
Subject: [PATCH] Rename key to rent_and_charges

---
 app/models/form/lettings/pages/rent_4_weekly.rb               | 2 +-
 app/models/form/lettings/pages/rent_bi_weekly.rb              | 2 +-
 app/models/form/lettings/pages/rent_monthly.rb                | 2 +-
 app/models/form/lettings/pages/rent_weekly.rb                 | 2 +-
 app/models/form/lettings/questions/brent_4_weekly.rb          | 2 +-
 app/models/form/lettings/questions/brent_bi_weekly.rb         | 2 +-
 app/models/form/lettings/questions/brent_monthly.rb           | 2 +-
 app/models/form/lettings/questions/brent_weekly.rb            | 2 +-
 app/models/form/lettings/questions/pscharge_4_weekly.rb       | 2 +-
 app/models/form/lettings/questions/pscharge_bi_weekly.rb      | 2 +-
 app/models/form/lettings/questions/pscharge_monthly.rb        | 2 +-
 app/models/form/lettings/questions/pscharge_weekly.rb         | 2 +-
 app/models/form/lettings/questions/scharge_4_weekly.rb        | 2 +-
 app/models/form/lettings/questions/scharge_bi_weekly.rb       | 2 +-
 app/models/form/lettings/questions/scharge_monthly.rb         | 2 +-
 app/models/form/lettings/questions/scharge_weekly.rb          | 2 +-
 app/models/form/lettings/questions/supcharg_4_weekly.rb       | 2 +-
 app/models/form/lettings/questions/supcharg_bi_weekly.rb      | 2 +-
 app/models/form/lettings/questions/supcharg_monthly.rb        | 2 +-
 app/models/form/lettings/questions/supcharg_weekly.rb         | 2 +-
 app/models/form/lettings/questions/tcharge_4_weekly.rb        | 2 +-
 app/models/form/lettings/questions/tcharge_bi_weekly.rb       | 2 +-
 app/models/form/lettings/questions/tcharge_monthly.rb         | 2 +-
 app/models/form/lettings/questions/tcharge_weekly.rb          | 2 +-
 config/locales/forms/2023/lettings/income_and_benefits.en.yml | 2 +-
 config/locales/forms/2024/lettings/income_and_benefits.en.yml | 2 +-
 26 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/app/models/form/lettings/pages/rent_4_weekly.rb b/app/models/form/lettings/pages/rent_4_weekly.rb
index 78ceeacf2..aa6441f6e 100644
--- a/app/models/form/lettings/pages/rent_4_weekly.rb
+++ b/app/models/form/lettings/pages/rent_4_weekly.rb
@@ -2,7 +2,7 @@ class Form::Lettings::Pages::Rent4Weekly < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "rent_4_weekly"
-    @copy_key = "lettings.income_and_benefits.rent"
+    @copy_key = "lettings.income_and_benefits.rent_and_charges"
     @depends_on = [
       { "household_charge" => 0, "rent_and_charges_paid_every_4_weeks?" => true, "is_carehome?" => false },
       { "household_charge" => nil, "rent_and_charges_paid_every_4_weeks?" => true, "is_carehome?" => false },
diff --git a/app/models/form/lettings/pages/rent_bi_weekly.rb b/app/models/form/lettings/pages/rent_bi_weekly.rb
index 958e124ba..7eab8daf4 100644
--- a/app/models/form/lettings/pages/rent_bi_weekly.rb
+++ b/app/models/form/lettings/pages/rent_bi_weekly.rb
@@ -2,7 +2,7 @@ class Form::Lettings::Pages::RentBiWeekly < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "rent_bi_weekly"
-    @copy_key = "lettings.income_and_benefits.rent"
+    @copy_key = "lettings.income_and_benefits.rent_and_charges"
     @depends_on = [
       { "household_charge" => nil, "rent_and_charges_paid_every_2_weeks?" => true, "is_carehome?" => false },
       { "household_charge" => 0, "rent_and_charges_paid_every_2_weeks?" => true, "is_carehome?" => false },
diff --git a/app/models/form/lettings/pages/rent_monthly.rb b/app/models/form/lettings/pages/rent_monthly.rb
index b4fa7dfab..9a3cd6a7e 100644
--- a/app/models/form/lettings/pages/rent_monthly.rb
+++ b/app/models/form/lettings/pages/rent_monthly.rb
@@ -2,7 +2,7 @@ class Form::Lettings::Pages::RentMonthly < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "rent_monthly"
-    @copy_key = "lettings.income_and_benefits.rent"
+    @copy_key = "lettings.income_and_benefits.rent_and_charges"
     @depends_on = [
       { "household_charge" => nil, "rent_and_charges_paid_monthly?" => true, "is_carehome?" => false },
       { "household_charge" => 0, "rent_and_charges_paid_monthly?" => true, "is_carehome?" => false },
diff --git a/app/models/form/lettings/pages/rent_weekly.rb b/app/models/form/lettings/pages/rent_weekly.rb
index 9e7605422..86106cfe3 100644
--- a/app/models/form/lettings/pages/rent_weekly.rb
+++ b/app/models/form/lettings/pages/rent_weekly.rb
@@ -2,7 +2,7 @@ class Form::Lettings::Pages::RentWeekly < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "rent_weekly"
-    @copy_key = "lettings.income_and_benefits.rent"
+    @copy_key = "lettings.income_and_benefits.rent_and_charges"
     @depends_on = [
       { "rent_and_charges_paid_weekly?" => true, "household_charge" => 0, "is_carehome?" => false },
       { "rent_and_charges_paid_weekly?" => true, "household_charge" => nil, "is_carehome?" => false },
diff --git a/app/models/form/lettings/questions/brent_4_weekly.rb b/app/models/form/lettings/questions/brent_4_weekly.rb
index 451fafb1c..2dc18ba56 100644
--- a/app/models/form/lettings/questions/brent_4_weekly.rb
+++ b/app/models/form/lettings/questions/brent_4_weekly.rb
@@ -2,7 +2,7 @@ class Form::Lettings::Questions::Brent4Weekly < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "brent"
-    @copy_key = "lettings.income_and_benefits.rent.brent"
+    @copy_key = "lettings.income_and_benefits.rent_and_charges.brent"
     @type = "numeric"
     @width = 5
     @check_answers_card_number = 0
diff --git a/app/models/form/lettings/questions/brent_bi_weekly.rb b/app/models/form/lettings/questions/brent_bi_weekly.rb
index ee182d443..d8bcfa136 100644
--- a/app/models/form/lettings/questions/brent_bi_weekly.rb
+++ b/app/models/form/lettings/questions/brent_bi_weekly.rb
@@ -2,7 +2,7 @@ class Form::Lettings::Questions::BrentBiWeekly < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "brent"
-    @copy_key = "lettings.income_and_benefits.rent.brent"
+    @copy_key = "lettings.income_and_benefits.rent_and_charges.brent"
     @type = "numeric"
     @width = 5
     @check_answers_card_number = 0
diff --git a/app/models/form/lettings/questions/brent_monthly.rb b/app/models/form/lettings/questions/brent_monthly.rb
index fa07ce522..a96239d7a 100644
--- a/app/models/form/lettings/questions/brent_monthly.rb
+++ b/app/models/form/lettings/questions/brent_monthly.rb
@@ -2,7 +2,7 @@ class Form::Lettings::Questions::BrentMonthly < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "brent"
-    @copy_key = "lettings.income_and_benefits.rent.brent"
+    @copy_key = "lettings.income_and_benefits.rent_and_charges.brent"
     @type = "numeric"
     @width = 5
     @check_answers_card_number = 0
diff --git a/app/models/form/lettings/questions/brent_weekly.rb b/app/models/form/lettings/questions/brent_weekly.rb
index 5e94a76d6..155addfec 100644
--- a/app/models/form/lettings/questions/brent_weekly.rb
+++ b/app/models/form/lettings/questions/brent_weekly.rb
@@ -2,7 +2,7 @@ class Form::Lettings::Questions::BrentWeekly < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "brent"
-    @copy_key = "lettings.income_and_benefits.rent.brent"
+    @copy_key = "lettings.income_and_benefits.rent_and_charges.brent"
     @type = "numeric"
     @width = 5
     @check_answers_card_number = 0
diff --git a/app/models/form/lettings/questions/pscharge_4_weekly.rb b/app/models/form/lettings/questions/pscharge_4_weekly.rb
index 6a449ca4c..56d2e60b8 100644
--- a/app/models/form/lettings/questions/pscharge_4_weekly.rb
+++ b/app/models/form/lettings/questions/pscharge_4_weekly.rb
@@ -2,7 +2,7 @@ class Form::Lettings::Questions::Pscharge4Weekly < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "pscharge"
-    @copy_key = "lettings.income_and_benefits.rent.pscharge"
+    @copy_key = "lettings.income_and_benefits.rent_and_charges.pscharge"
     @type = "numeric"
     @width = 5
     @check_answers_card_number = 0
diff --git a/app/models/form/lettings/questions/pscharge_bi_weekly.rb b/app/models/form/lettings/questions/pscharge_bi_weekly.rb
index 68b315bb6..6022f6019 100644
--- a/app/models/form/lettings/questions/pscharge_bi_weekly.rb
+++ b/app/models/form/lettings/questions/pscharge_bi_weekly.rb
@@ -2,7 +2,7 @@ class Form::Lettings::Questions::PschargeBiWeekly < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "pscharge"
-    @copy_key = "lettings.income_and_benefits.rent.pscharge"
+    @copy_key = "lettings.income_and_benefits.rent_and_charges.pscharge"
     @type = "numeric"
     @width = 5
     @check_answers_card_number = 0
diff --git a/app/models/form/lettings/questions/pscharge_monthly.rb b/app/models/form/lettings/questions/pscharge_monthly.rb
index 9551b2cc1..225db53d3 100644
--- a/app/models/form/lettings/questions/pscharge_monthly.rb
+++ b/app/models/form/lettings/questions/pscharge_monthly.rb
@@ -2,7 +2,7 @@ class Form::Lettings::Questions::PschargeMonthly < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "pscharge"
-    @copy_key = "lettings.income_and_benefits.rent.pscharge"
+    @copy_key = "lettings.income_and_benefits.rent_and_charges.pscharge"
     @type = "numeric"
     @width = 5
     @check_answers_card_number = 0
diff --git a/app/models/form/lettings/questions/pscharge_weekly.rb b/app/models/form/lettings/questions/pscharge_weekly.rb
index af2ad0f84..2ff06301c 100644
--- a/app/models/form/lettings/questions/pscharge_weekly.rb
+++ b/app/models/form/lettings/questions/pscharge_weekly.rb
@@ -2,7 +2,7 @@ class Form::Lettings::Questions::PschargeWeekly < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "pscharge"
-    @copy_key = "lettings.income_and_benefits.rent.pscharge"
+    @copy_key = "lettings.income_and_benefits.rent_and_charges.pscharge"
     @type = "numeric"
     @width = 5
     @check_answers_card_number = 0
diff --git a/app/models/form/lettings/questions/scharge_4_weekly.rb b/app/models/form/lettings/questions/scharge_4_weekly.rb
index 66e81f020..e91dadab3 100644
--- a/app/models/form/lettings/questions/scharge_4_weekly.rb
+++ b/app/models/form/lettings/questions/scharge_4_weekly.rb
@@ -2,7 +2,7 @@ class Form::Lettings::Questions::Scharge4Weekly < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "scharge"
-    @copy_key = "lettings.income_and_benefits.rent.scharge"
+    @copy_key = "lettings.income_and_benefits.rent_and_charges.scharge"
     @type = "numeric"
     @width = 5
     @check_answers_card_number = 0
diff --git a/app/models/form/lettings/questions/scharge_bi_weekly.rb b/app/models/form/lettings/questions/scharge_bi_weekly.rb
index ee8d0358d..59138835d 100644
--- a/app/models/form/lettings/questions/scharge_bi_weekly.rb
+++ b/app/models/form/lettings/questions/scharge_bi_weekly.rb
@@ -2,7 +2,7 @@ class Form::Lettings::Questions::SchargeBiWeekly < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "scharge"
-    @copy_key = "lettings.income_and_benefits.rent.scharge"
+    @copy_key = "lettings.income_and_benefits.rent_and_charges.scharge"
     @type = "numeric"
     @width = 5
     @check_answers_card_number = 0
diff --git a/app/models/form/lettings/questions/scharge_monthly.rb b/app/models/form/lettings/questions/scharge_monthly.rb
index 5d204c760..33404a8ce 100644
--- a/app/models/form/lettings/questions/scharge_monthly.rb
+++ b/app/models/form/lettings/questions/scharge_monthly.rb
@@ -2,7 +2,7 @@ class Form::Lettings::Questions::SchargeMonthly < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "scharge"
-    @copy_key = "lettings.income_and_benefits.rent.scharge"
+    @copy_key = "lettings.income_and_benefits.rent_and_charges.scharge"
     @type = "numeric"
     @width = 5
     @check_answers_card_number = 0
diff --git a/app/models/form/lettings/questions/scharge_weekly.rb b/app/models/form/lettings/questions/scharge_weekly.rb
index 50d65c800..d8e16986e 100644
--- a/app/models/form/lettings/questions/scharge_weekly.rb
+++ b/app/models/form/lettings/questions/scharge_weekly.rb
@@ -2,7 +2,7 @@ class Form::Lettings::Questions::SchargeWeekly < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "scharge"
-    @copy_key = "lettings.income_and_benefits.rent.scharge"
+    @copy_key = "lettings.income_and_benefits.rent_and_charges.scharge"
     @type = "numeric"
     @width = 5
     @check_answers_card_number = 0
diff --git a/app/models/form/lettings/questions/supcharg_4_weekly.rb b/app/models/form/lettings/questions/supcharg_4_weekly.rb
index c9cd073b8..cd3b7beed 100644
--- a/app/models/form/lettings/questions/supcharg_4_weekly.rb
+++ b/app/models/form/lettings/questions/supcharg_4_weekly.rb
@@ -2,7 +2,7 @@ class Form::Lettings::Questions::Supcharg4Weekly < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "supcharg"
-    @copy_key = "lettings.income_and_benefits.rent.supcharg"
+    @copy_key = "lettings.income_and_benefits.rent_and_charges.supcharg"
     @type = "numeric"
     @width = 5
     @check_answers_card_number = 0
diff --git a/app/models/form/lettings/questions/supcharg_bi_weekly.rb b/app/models/form/lettings/questions/supcharg_bi_weekly.rb
index 49c8fa020..dba861ebe 100644
--- a/app/models/form/lettings/questions/supcharg_bi_weekly.rb
+++ b/app/models/form/lettings/questions/supcharg_bi_weekly.rb
@@ -2,7 +2,7 @@ class Form::Lettings::Questions::SupchargBiWeekly < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "supcharg"
-    @copy_key = "lettings.income_and_benefits.rent.supcharg"
+    @copy_key = "lettings.income_and_benefits.rent_and_charges.supcharg"
     @type = "numeric"
     @width = 5
     @check_answers_card_number = 0
diff --git a/app/models/form/lettings/questions/supcharg_monthly.rb b/app/models/form/lettings/questions/supcharg_monthly.rb
index 2a8df1548..3b5b3e41c 100644
--- a/app/models/form/lettings/questions/supcharg_monthly.rb
+++ b/app/models/form/lettings/questions/supcharg_monthly.rb
@@ -2,7 +2,7 @@ class Form::Lettings::Questions::SupchargMonthly < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "supcharg"
-    @copy_key = "lettings.income_and_benefits.rent.supcharg"
+    @copy_key = "lettings.income_and_benefits.rent_and_charges.supcharg"
     @type = "numeric"
     @width = 5
     @check_answers_card_number = 0
diff --git a/app/models/form/lettings/questions/supcharg_weekly.rb b/app/models/form/lettings/questions/supcharg_weekly.rb
index 1b7df315f..f48a8ccfe 100644
--- a/app/models/form/lettings/questions/supcharg_weekly.rb
+++ b/app/models/form/lettings/questions/supcharg_weekly.rb
@@ -2,7 +2,7 @@ class Form::Lettings::Questions::SupchargWeekly < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "supcharg"
-    @copy_key = "lettings.income_and_benefits.rent.supcharg"
+    @copy_key = "lettings.income_and_benefits.rent_and_charges.supcharg"
     @type = "numeric"
     @width = 5
     @check_answers_card_number = 0
diff --git a/app/models/form/lettings/questions/tcharge_4_weekly.rb b/app/models/form/lettings/questions/tcharge_4_weekly.rb
index 3c02e049a..6475adab0 100644
--- a/app/models/form/lettings/questions/tcharge_4_weekly.rb
+++ b/app/models/form/lettings/questions/tcharge_4_weekly.rb
@@ -2,7 +2,7 @@ class Form::Lettings::Questions::Tcharge4Weekly < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "tcharge"
-    @copy_key = "lettings.income_and_benefits.rent.tcharge"
+    @copy_key = "lettings.income_and_benefits.rent_and_charges.tcharge"
     @type = "numeric_output"
     @width = 5
     @check_answers_card_number = 0
diff --git a/app/models/form/lettings/questions/tcharge_bi_weekly.rb b/app/models/form/lettings/questions/tcharge_bi_weekly.rb
index 87365af09..446886d9d 100644
--- a/app/models/form/lettings/questions/tcharge_bi_weekly.rb
+++ b/app/models/form/lettings/questions/tcharge_bi_weekly.rb
@@ -2,7 +2,7 @@ class Form::Lettings::Questions::TchargeBiWeekly < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "tcharge"
-    @copy_key = "lettings.income_and_benefits.rent.tcharge"
+    @copy_key = "lettings.income_and_benefits.rent_and_charges.tcharge"
     @type = "numeric_output"
     @width = 5
     @check_answers_card_number = 0
diff --git a/app/models/form/lettings/questions/tcharge_monthly.rb b/app/models/form/lettings/questions/tcharge_monthly.rb
index fee6c3773..2c52f4c92 100644
--- a/app/models/form/lettings/questions/tcharge_monthly.rb
+++ b/app/models/form/lettings/questions/tcharge_monthly.rb
@@ -2,7 +2,7 @@ class Form::Lettings::Questions::TchargeMonthly < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "tcharge"
-    @copy_key = "lettings.income_and_benefits.rent.tcharge"
+    @copy_key = "lettings.income_and_benefits.rent_and_charges.tcharge"
     @type = "numeric_output"
     @width = 5
     @check_answers_card_number = 0
diff --git a/app/models/form/lettings/questions/tcharge_weekly.rb b/app/models/form/lettings/questions/tcharge_weekly.rb
index 3ee20947e..0c0ee5d8e 100644
--- a/app/models/form/lettings/questions/tcharge_weekly.rb
+++ b/app/models/form/lettings/questions/tcharge_weekly.rb
@@ -2,7 +2,7 @@ class Form::Lettings::Questions::TchargeWeekly < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "tcharge"
-    @copy_key = "lettings.income_and_benefits.rent.tcharge"
+    @copy_key = "lettings.income_and_benefits.rent_and_charges.tcharge"
     @type = "numeric_output"
     @width = 5
     @check_answers_card_number = 0
diff --git a/config/locales/forms/2023/lettings/income_and_benefits.en.yml b/config/locales/forms/2023/lettings/income_and_benefits.en.yml
index 5fb01f323..5db946648 100644
--- a/config/locales/forms/2023/lettings/income_and_benefits.en.yml
+++ b/config/locales/forms/2023/lettings/income_and_benefits.en.yml
@@ -67,7 +67,7 @@ en:
               hint_text: ""
               question_text: "How much does the household pay every month?"
 
-          rent:
+          rent_and_charges:
             page_header: "Household rent and charges"
             brent:
               check_answer_label: "Basic rent"
diff --git a/config/locales/forms/2024/lettings/income_and_benefits.en.yml b/config/locales/forms/2024/lettings/income_and_benefits.en.yml
index b23b7aff8..64f8a6c9c 100644
--- a/config/locales/forms/2024/lettings/income_and_benefits.en.yml
+++ b/config/locales/forms/2024/lettings/income_and_benefits.en.yml
@@ -67,7 +67,7 @@ en:
               hint_text: ""
               question_text: "How much does the household pay every month?"
 
-          rent:
+          rent_and_charges:
             page_header: "Household rent and charges"
             brent:
               check_answer_label: "Basic rent"