From ceb3702cd248021fc28c8f013ea82e2f98f7f5dc Mon Sep 17 00:00:00 2001 From: Nat Dean-Lewis Date: Fri, 20 Feb 2026 15:08:20 +0000 Subject: [PATCH] CLDC-4178: add gender same as sex question for sales copy --- .../subsections/household_characteristics.rb | 7 ++ .../sales/household_characteristics.en.yml | 84 +++++++++++++++++++ 2 files changed, 91 insertions(+) diff --git a/app/models/form/sales/subsections/household_characteristics.rb b/app/models/form/sales/subsections/household_characteristics.rb index 47466a492..c93ab4d5f 100644 --- a/app/models/form/sales/subsections/household_characteristics.rb +++ b/app/models/form/sales/subsections/household_characteristics.rb @@ -25,6 +25,7 @@ class Form::Sales::Subsections::HouseholdCharacteristics < ::Form::Subsection Form::Sales::Pages::OldPersonsSharedOwnershipValueCheck.new("age_1_old_persons_shared_ownership_joint_purchase_value_check", nil, self, joint_purchase: true), Form::Sales::Pages::OldPersonsSharedOwnershipValueCheck.new("age_1_old_persons_shared_ownership_value_check", nil, self, joint_purchase: false), (Form::Sales::Pages::SexRegisteredAtBirth1.new(nil, nil, self) if form.start_year_2026_or_later?), + (Form::Sales::Pages::Buyer1GenderSameAsSex.new(nil, nil, self) if form.start_year_2026_or_later?), Form::Sales::Pages::GenderIdentity1.new(nil, nil, self), Form::Sales::Pages::Buyer1EthnicGroup.new(nil, nil, self), Form::Sales::Pages::Buyer1EthnicBackgroundBlack.new(nil, nil, self), @@ -48,6 +49,7 @@ class Form::Sales::Subsections::HouseholdCharacteristics < ::Form::Subsection (Form::Sales::Pages::NotRetiredValueCheck.new("age_2_buyer_not_retired_value_check", nil, self, person_index: 2) if form.start_year_2024_or_later?), (Form::Sales::Pages::PersonStudentNotChildValueCheck.new("buyer_2_age_student_not_child_value_check", nil, self, person_index: 2) unless form.start_year_2025_or_later?), (Form::Sales::Pages::SexRegisteredAtBirth2.new(nil, nil, self) if form.start_year_2026_or_later?), + (Form::Sales::Pages::Buyer2GenderSameAsSex.new(nil, nil, self) if form.start_year_2026_or_later?), Form::Sales::Pages::GenderIdentity2.new(nil, nil, self), buyer_2_ethnicity_nationality_pages, Form::Sales::Pages::Buyer2WorkingSituation.new(nil, nil, self), @@ -70,6 +72,7 @@ class Form::Sales::Subsections::HouseholdCharacteristics < ::Form::Subsection (Form::Sales::Pages::PersonStudentNotChildValueCheck.new("age_2_student_not_child_value_check", nil, self, person_index: 2) unless form.start_year_2025_or_later?), (Form::Sales::Pages::PartnerUnder16ValueCheck.new("age_2_partner_under_16_value_check", nil, self, person_index: 2) if form.start_year_2024_or_later?), (Form::Sales::Pages::PersonSexRegisteredAtBirth.new("person_2_sex_registered_at_birth", nil, self, person_index: 2) if form.start_year_2026_or_later?), + (Form::Sales::Pages::PersonGenderSameAsSex.new("person_2_gender_same_as_sex", nil, self, person_index: 2) if form.start_year_2026_or_later?), Form::Sales::Pages::PersonGenderIdentity.new("person_2_gender_identity", nil, self, person_index: 2), Form::Sales::Pages::PersonWorkingSituation.new("person_2_working_situation", nil, self, person_index: 2), Form::Sales::Pages::RetirementValueCheck.new("working_situation_2_retirement_value_check", nil, self, person_index: 2), @@ -86,6 +89,7 @@ class Form::Sales::Subsections::HouseholdCharacteristics < ::Form::Subsection (Form::Sales::Pages::PersonStudentNotChildValueCheck.new("age_3_student_not_child_value_check", nil, self, person_index: 3) unless form.start_year_2025_or_later?), (Form::Sales::Pages::PartnerUnder16ValueCheck.new("age_3_partner_under_16_value_check", nil, self, person_index: 3) if form.start_year_2024_or_later?), (Form::Sales::Pages::PersonSexRegisteredAtBirth.new("person_3_sex_registered_at_birth", nil, self, person_index: 3) if form.start_year_2026_or_later?), + (Form::Sales::Pages::PersonGenderSameAsSex.new("person_3_gender_same_as_sex", nil, self, person_index: 3) if form.start_year_2026_or_later?), Form::Sales::Pages::PersonGenderIdentity.new("person_3_gender_identity", nil, self, person_index: 3), Form::Sales::Pages::PersonWorkingSituation.new("person_3_working_situation", nil, self, person_index: 3), Form::Sales::Pages::RetirementValueCheck.new("working_situation_3_retirement_value_check", nil, self, person_index: 3), @@ -102,6 +106,7 @@ class Form::Sales::Subsections::HouseholdCharacteristics < ::Form::Subsection (Form::Sales::Pages::PersonStudentNotChildValueCheck.new("age_4_student_not_child_value_check", nil, self, person_index: 4) unless form.start_year_2025_or_later?), (Form::Sales::Pages::PartnerUnder16ValueCheck.new("age_4_partner_under_16_value_check", nil, self, person_index: 4) if form.start_year_2024_or_later?), (Form::Sales::Pages::PersonSexRegisteredAtBirth.new("person_4_sex_registered_at_birth", nil, self, person_index: 4) if form.start_year_2026_or_later?), + (Form::Sales::Pages::PersonGenderSameAsSex.new("person_4_gender_same_as_sex", nil, self, person_index: 4) if form.start_year_2026_or_later?), Form::Sales::Pages::PersonGenderIdentity.new("person_4_gender_identity", nil, self, person_index: 4), Form::Sales::Pages::PersonWorkingSituation.new("person_4_working_situation", nil, self, person_index: 4), Form::Sales::Pages::RetirementValueCheck.new("working_situation_4_retirement_value_check", nil, self, person_index: 4), @@ -118,6 +123,7 @@ class Form::Sales::Subsections::HouseholdCharacteristics < ::Form::Subsection (Form::Sales::Pages::PersonStudentNotChildValueCheck.new("age_5_student_not_child_value_check", nil, self, person_index: 5) unless form.start_year_2025_or_later?), (Form::Sales::Pages::PartnerUnder16ValueCheck.new("age_5_partner_under_16_value_check", nil, self, person_index: 5) if form.start_year_2024_or_later?), (Form::Sales::Pages::PersonSexRegisteredAtBirth.new("person_5_sex_registered_at_birth", nil, self, person_index: 5) if form.start_year_2026_or_later?), + (Form::Sales::Pages::PersonGenderSameAsSex.new("person_5_gender_same_as_sex", nil, self, person_index: 5) if form.start_year_2026_or_later?), Form::Sales::Pages::PersonGenderIdentity.new("person_5_gender_identity", nil, self, person_index: 5), Form::Sales::Pages::PersonWorkingSituation.new("person_5_working_situation", nil, self, person_index: 5), Form::Sales::Pages::RetirementValueCheck.new("working_situation_5_retirement_value_check", nil, self, person_index: 5), @@ -134,6 +140,7 @@ class Form::Sales::Subsections::HouseholdCharacteristics < ::Form::Subsection (Form::Sales::Pages::PersonStudentNotChildValueCheck.new("age_6_student_not_child_value_check", nil, self, person_index: 6) unless form.start_year_2025_or_later?), (Form::Sales::Pages::PartnerUnder16ValueCheck.new("age_6_partner_under_16_value_check", nil, self, person_index: 6) if form.start_year_2024_or_later?), (Form::Sales::Pages::PersonSexRegisteredAtBirth.new("person_6_sex_registered_at_birth", nil, self, person_index: 6) if form.start_year_2026_or_later?), + (Form::Sales::Pages::PersonGenderSameAsSex.new("person_6_gender_same_as_sex", nil, self, person_index: 6) if form.start_year_2026_or_later?), Form::Sales::Pages::PersonGenderIdentity.new("person_6_gender_identity", nil, self, person_index: 6), Form::Sales::Pages::PersonWorkingSituation.new("person_6_working_situation", nil, self, person_index: 6), Form::Sales::Pages::RetirementValueCheck.new("working_situation_6_retirement_value_check", nil, self, person_index: 6), diff --git a/config/locales/forms/2026/sales/household_characteristics.en.yml b/config/locales/forms/2026/sales/household_characteristics.en.yml index 4bdb07670..498827dd7 100644 --- a/config/locales/forms/2026/sales/household_characteristics.en.yml +++ b/config/locales/forms/2026/sales/household_characteristics.en.yml @@ -23,6 +23,20 @@ en: hint_text: "This is the sex that was registered at birth. The next question will ask about the buyer's gender identity." question_text: "What was buyer 1's sex at birth?" + gender_same_as_sex1: + page_header: "" + check_answer_label: "Buyer 1's gender identity same as registered at birth" + check_answer_prompt: "" + hint_text: "" + question_text: "Is the gender buyer 1 identifies with the same as their sex registered at birth?" + + gender_description1: + page_header: "" + check_answer_label: "Gender identity description" + check_answer_prompt: "" + hint_text: "" + question_text: "Enter gender identity" + sex1: page_header: "" check_answer_label: "Buyer 1’s gender identity" @@ -151,6 +165,20 @@ en: hint_text: "This is the sex that was registered at birth. The next question will ask about the person's gender identity." 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?" + + gender_description2: + page_header: "" + check_answer_label: "Gender identity description" + check_answer_prompt: "" + hint_text: "" + question_text: "Enter gender identity" + sex2: buyer: page_header: "" @@ -294,6 +322,20 @@ en: hint_text: "This is the sex that was registered at birth. The next question will ask about the person's gender identity." question_text: "What was person 3's sex at birth?" + gender_same_as_sex3: + page_header: "" + check_answer_label: "Person 3's gender identity same as registered at birth" + check_answer_prompt: "" + hint_text: "" + question_text: "Is the gender person 3 identifies with the same as their sex registered at birth?" + + gender_description3: + page_header: "" + check_answer_label: "Gender identity description" + check_answer_prompt: "" + hint_text: "" + question_text: "Enter gender identity" + sex3: page_header: "" check_answer_label: "Person 3’s gender identity" @@ -342,6 +384,20 @@ en: hint_text: "This is the sex that was registered at birth. The next question will ask about the person's gender identity." question_text: "What was person 4's sex at birth?" + gender_same_as_sex4: + page_header: "" + check_answer_label: "Person 4's gender identity same as registered at birth" + check_answer_prompt: "" + hint_text: "" + question_text: "Is the gender person 4 identifies with the same as their sex registered at birth?" + + gender_description4: + page_header: "" + check_answer_label: "Gender identity description" + check_answer_prompt: "" + hint_text: "" + question_text: "Enter gender identity" + sex4: page_header: "" check_answer_label: "Person 4’s gender identity" @@ -390,6 +446,20 @@ en: hint_text: "This is the sex that was registered at birth. The next question will ask about the person's gender identity." question_text: "What was person 5's sex at birth?" + gender_same_as_sex5: + page_header: "" + check_answer_label: "Person 5's gender identity same as registered at birth" + check_answer_prompt: "" + hint_text: "" + question_text: "Is the gender person 5 identifies with the same as their sex registered at birth?" + + gender_description5: + page_header: "" + check_answer_label: "Gender identity description" + check_answer_prompt: "" + hint_text: "" + question_text: "Enter gender identity" + sex5: page_header: "" check_answer_label: "Person 5’s gender identity" @@ -438,6 +508,20 @@ en: hint_text: "This is the sex that was registered at birth. The next question will ask about the person's gender identity." question_text: "What was person 6's sex at birth?" + gender_same_as_sex6: + page_header: "" + check_answer_label: "Person 6's gender identity same as registered at birth" + check_answer_prompt: "" + hint_text: "" + question_text: "Is the gender person 6 identifies with the same as their sex registered at birth?" + + gender_description6: + page_header: "" + check_answer_label: "Gender identity description" + check_answer_prompt: "" + hint_text: "" + question_text: "Enter gender identity" + sex6: page_header: "" check_answer_label: "Person 6’s gender identity"