Refactor chcharge

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

@@ -2,7 +2,7 @@ class Form::Lettings::Questions::Chcharge4Weekly < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "chcharge"
-    @copy_key = "lettings.income_and_benefits.care_home.chcharge.four_weekly"
+    @copy_key = "lettings.income_and_benefits.care_home.chcharge_4_weekly"
     @type = "numeric"
     @width = 5
     @check_answers_card_number = 0

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

@@ -2,7 +2,7 @@ class Form::Lettings::Questions::ChchargeBiWeekly < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "chcharge"
-    @copy_key = "lettings.income_and_benefits.care_home.chcharge.bi_weekly"
+    @copy_key = "lettings.income_and_benefits.care_home.chcharge_bi_weekly"
     @type = "numeric"
     @width = 5
     @check_answers_card_number = 0

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

@@ -2,7 +2,7 @@ class Form::Lettings::Questions::ChchargeMonthly < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "chcharge"
-    @copy_key = "lettings.income_and_benefits.care_home.chcharge.monthly"
+    @copy_key = "lettings.income_and_benefits.care_home.chcharge_monthly"
     @type = "numeric"
     @width = 5
     @check_answers_card_number = 0

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

@@ -2,7 +2,7 @@ class Form::Lettings::Questions::ChchargeWeekly < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "chcharge"
-    @copy_key = "lettings.income_and_benefits.care_home.chcharge.weekly"
+    @copy_key = "lettings.income_and_benefits.care_home.chcharge_weekly"
     @type = "numeric"
     @width = 5
     @check_answers_card_number = 0

config/locales/forms/2023/lettings/income_and_benefits.en.yml

@@ -50,23 +50,22 @@ en:
               check_answer_label: "Care home accommodation"
               hint_text: ""
               question_text: "Is this accommodation a care home?"
-            chcharge:
-              weekly:
-                check_answer_label: "Care home charges"
-                hint_text: ""
-                question_text: "How much does the household pay every week?"
-              bi_weekly:
-                check_answer_label: "Care home charges"
-                hint_text: ""
-                question_text: "How much does the household pay every 2 weeks?"
-              four_weekly:
-                check_answer_label: "Care home charges"
-                hint_text: ""
-                question_text: "How much does the household pay every 4 weeks?"
-              monthly:
-                check_answer_label: "Care home charges"
-                hint_text: ""
-                question_text: "How much does the household pay every month?"
+            chcharge_weekly:
+              check_answer_label: "Care home charges"
+              hint_text: ""
+              question_text: "How much does the household pay every week?"
+            chcharge_bi_weekly:
+              check_answer_label: "Care home charges"
+              hint_text: ""
+              question_text: "How much does the household pay every 2 weeks?"
+            chcharge_4_weekly:
+              check_answer_label: "Care home charges"
+              hint_text: ""
+              question_text: "How much does the household pay every 4 weeks?"
+            chcharge_monthly:
+              check_answer_label: "Care home charges"
+              hint_text: ""
+              question_text: "How much does the household pay every month?"
 
             rent_weekly:
               page_header: "Household rent and charges"

config/locales/forms/2024/lettings/income_and_benefits.en.yml

@@ -50,23 +50,22 @@ en:
               check_answer_label: "Care home accommodation"
               hint_text: ""
               question_text: "Is this accommodation a care home?"
-            chcharge:
-              weekly:
-                check_answer_label: "Care home charges"
-                hint_text: ""
-                question_text: "How much does the household pay every week?"
-              bi_weekly:
-                check_answer_label: "Care home charges"
-                hint_text: ""
-                question_text: "How much does the household pay every 2 weeks?"
-              four_weekly:
-                check_answer_label: "Care home charges"
-                hint_text: ""
-                question_text: "How much does the household pay every 4 weeks?"
-              monthly:
-                check_answer_label: "Care home charges"
-                hint_text: ""
-                question_text: "How much does the household pay every month?"
+            chcharge_weekly:
+              check_answer_label: "Care home charges"
+              hint_text: ""
+              question_text: "How much does the household pay every week?"
+            chcharge_bi_weekly:
+              check_answer_label: "Care home charges"
+              hint_text: ""
+              question_text: "How much does the household pay every 2 weeks?"
+            chcharge_4_weekly:
+              check_answer_label: "Care home charges"
+              hint_text: ""
+              question_text: "How much does the household pay every 4 weeks?"
+            chcharge_monthly:
+              check_answer_label: "Care home charges"
+              hint_text: ""
+              question_text: "How much does the household pay every month?"
 
             rent_weekly:
               page_header: "Household rent and charges"