CLDC-4178: refactoring for consistency with lettings

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

@@ -14,8 +14,8 @@ class Form::Sales::Pages::Buyer1GenderSameAsSex < ::Form::Page
 
   def questions
     @questions ||= [
-      Form::Sales::Questions::PersonGenderSameAsSex.new(nil, nil, self, person_index: 1, buyer: true),
-      Form::Sales::Questions::PersonGenderDescription.new(nil, nil, self, person_index: 1),
+      Form::Sales::Questions::GenderSameAsSex.new(nil, nil, self, person_index: 1, buyer: true),
+      Form::Sales::Questions::GenderDescription.new(nil, nil, self, person_index: 1),
     ]
   end
 end

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

@@ -16,8 +16,8 @@ class Form::Sales::Pages::Buyer2GenderSameAsSex < ::Form::Page
 
   def questions
     @questions ||= [
-      Form::Sales::Questions::PersonGenderSameAsSex.new(nil, nil, self, person_index: 2, buyer: true),
-      Form::Sales::Questions::PersonGenderDescription.new(nil, nil, self, person_index: 2),
+      Form::Sales::Questions::GenderSameAsSex.new(nil, nil, self, person_index: 2, buyer: true),
+      Form::Sales::Questions::GenderDescription.new(nil, nil, self, person_index: 2),
     ]
   end
 end

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

@@ -9,8 +9,8 @@ class Form::Sales::Pages::PersonGenderSameAsSex < ::Form::Page
 
   def questions
     @questions ||= [
-      Form::Sales::Questions::PersonGenderSameAsSex.new(nil, nil, self, person_index: @person_index),
-      Form::Sales::Questions::PersonGenderDescription.new(nil, nil, self, person_index: @person_index),
+      Form::Sales::Questions::GenderSameAsSex.new(nil, nil, self, person_index: @person_index),
+      Form::Sales::Questions::GenderDescription.new(nil, nil, self, person_index: @person_index),
     ]
   end
 end

app/models/form/sales/questions/gender_description.rb

@@ -1,4 +1,4 @@
-class Form::Sales::Questions::PersonGenderDescription < ::Form::Question
+class Form::Sales::Questions::GenderDescription < ::Form::Question
   def initialize(id, hsh, page, person_index:)
     super(id, hsh, page)
     @id = "gender_description#{person_index}"

app/models/form/sales/questions/gender_same_as_sex.rb

@@ -1,4 +1,4 @@
-class Form::Sales::Questions::PersonGenderSameAsSex < ::Form::Question
+class Form::Sales::Questions::GenderSameAsSex < ::Form::Question
   def initialize(id, hsh, page, person_index:, buyer: false)
     super(id, hsh, page)
     @id = "gender_same_as_sex#{person_index}"

config/locales/forms/2026/sales/household_characteristics.en.yml

@@ -159,11 +159,18 @@ en:
               question_text: "What was person 2's sex at birth?"
 
           gender_same_as_sex2:
-            page_header: ""
-            check_answer_label: "Buyer/Person 2's gender identity same as registered at birth"
-            check_answer_prompt: ""
-            hint_text: ""
-            question_text: "Is the gender buyer/person 2 identifies with the same as their sex registered at birth?"
+            buyer:
+              page_header: ""
+              check_answer_label: "Buyer 2's gender identity same as registered at birth"
+              check_answer_prompt: ""
+              hint_text: ""
+              question_text: "Is the gender buyer 2 identifies with the same as their sex registered at birth?"
+            person:
+              page_header: ""
+              check_answer_label: "Person 2's gender identity same as registered at birth"
+              check_answer_prompt: ""
+              hint_text: ""
+              question_text: "Is the gender person 2 identifies with the same as their sex registered at birth?"
 
           gender_description2:
             page_header: ""

spec/models/form/sales/questions/gender_description_spec.rb

@@ -1,6 +1,6 @@
 require "rails_helper"
 
-RSpec.describe Form::Sales::Questions::PersonGenderDescription, type: :model do
+RSpec.describe Form::Sales::Questions::GenderDescription, type: :model do
   include CollectionTimeHelper
 
   subject(:question) { described_class.new(question_id, question_definition, page, person_index:) }

spec/models/form/sales/questions/gender_same_as_sex_spec.rb

@@ -1,6 +1,6 @@
 require "rails_helper"
 
-RSpec.describe Form::Sales::Questions::PersonGenderSameAsSex, type: :model do
+RSpec.describe Form::Sales::Questions::GenderSameAsSex, type: :model do
   include CollectionTimeHelper
 
   subject(:question) { described_class.new(question_id, question_definition, page, person_index:) }