diff --git a/app/models/form/sales/questions/equity.rb b/app/models/form/sales/questions/equity.rb index e39e77ebb..74f5e9970 100644 --- a/app/models/form/sales/questions/equity.rb +++ b/app/models/form/sales/questions/equity.rb @@ -2,7 +2,7 @@ class Form::Sales::Questions::Equity < ::Form::Question def initialize(id, hsh, page) super @id = "equity" - @copy_key = "sales.sale_information.equity.#{page.id}" + @copy_key = form.start_year_2025_or_later? ? "sales.sale_information.equity.#{page.id}" : "sales.sale_information.equity" @type = "numeric" @min = 0 @max = 100 diff --git a/app/models/form/sales/questions/value.rb b/app/models/form/sales/questions/value.rb index ad021e920..ce8d07e28 100644 --- a/app/models/form/sales/questions/value.rb +++ b/app/models/form/sales/questions/value.rb @@ -2,7 +2,7 @@ class Form::Sales::Questions::Value < ::Form::Question def initialize(id, hsh, page) super @id = "value" - @copy_key = "sales.sale_information.value.#{page.id}" + @copy_key = form.start_year_2025_or_later? ? "sales.sale_information.value.#{page.id}" : "sales.sale_information.value" @type = "numeric" @min = 0 @step = 1 diff --git a/config/locales/forms/2023/lettings/household_characteristics.en.yml b/config/locales/forms/2023/lettings/household_characteristics.en.yml index 1f175adbc..3de0745b1 100644 --- a/config/locales/forms/2023/lettings/household_characteristics.en.yml +++ b/config/locales/forms/2023/lettings/household_characteristics.en.yml @@ -19,23 +19,23 @@ en: page_header: "" age1_known: check_answer_label: "" - hint_text: "The ’lead’ or ’main’ tenant is the person in the household who does the most paid work. If several people do the same paid work, the lead tenant is whoever is the oldest." + hint_text: "The lead tenant is the person in the household who does the most paid work. If several people do the same paid work, the lead tenant is whoever is the oldest." question_text: "Do you know the lead tenant’s age?" age1: check_answer_label: "Lead tenant’s age" hint_text: "" question_text: "Age" - + sex1: page_header: "" check_answer_label: "Lead tenant’s gender identity" hint_text: "The lead tenant is the person in the household who does the most paid work. If several people do the same paid work, the lead tenant is whoever is the oldest." question_text: "Which of these best describes the lead tenant’s gender identity?" - + ethnic_group: page_header: "" check_answer_label: "Lead tenant’s ethnic group" - hint_text: "The lead tenant is the person in the household who does the most paid work. If several people do the same paid work, the lead tenant is whoever is the oldest." + hint_text: "The lead tenant is the person in the household who does the most paid work. If several people do the same paid work, the lead tenant is whoever is the oldest." question_text: "What is the lead tenant’s ethnic group?" ethnic: @@ -97,13 +97,13 @@ en: question_text: "Do you know person 2’s age?" age2: check_answer_label: "Person 2’s age" - hint_text: "" + hint_text: "" question_text: "Age" sex2: page_header: "" check_answer_label: "Person 2’s gender identity" - hint_text: "" + hint_text: "" question_text: "Which of these best describes person 2’s gender identity?" ecstat2: @@ -132,13 +132,13 @@ en: question_text: "Do you know person 3’s age?" age3: check_answer_label: "Person 3’s age" - hint_text: "" + hint_text: "" question_text: "Age" sex3: page_header: "" check_answer_label: "Person 3’s gender identity" - hint_text: "" + hint_text: "" question_text: "Which of these best describes person 3’s gender identity?" ecstat3: @@ -167,13 +167,13 @@ en: question_text: "Do you know person 4’s age?" age4: check_answer_label: "Person 4’s age" - hint_text: "" + hint_text: "" question_text: "Age" sex4: page_header: "" check_answer_label: "Person 4’s gender identity" - hint_text: "" + hint_text: "" question_text: "Which of these best describes person 4’s gender identity?" ecstat4: @@ -202,13 +202,13 @@ en: question_text: "Do you know person 5’s age?" age5: check_answer_label: "Person 5’s age" - hint_text: "" + hint_text: "" question_text: "Age" sex5: page_header: "" check_answer_label: "Person 5’s gender identity" - hint_text: "" + hint_text: "" question_text: "Which of these best describes person 5’s gender identity?" ecstat5: @@ -237,13 +237,13 @@ en: question_text: "Do you know person 6’s age?" age6: check_answer_label: "Person 6’s age" - hint_text: "" + hint_text: "" question_text: "Age" sex6: page_header: "" check_answer_label: "Person 6’s gender identity" - hint_text: "" + hint_text: "" question_text: "Which of these best describes person 6’s gender identity?" ecstat6: @@ -272,13 +272,13 @@ en: question_text: "Do you know person 7’s age?" age7: check_answer_label: "Person 7’s age" - hint_text: "" + hint_text: "" question_text: "Age" sex7: page_header: "" check_answer_label: "Person 7’s gender identity" - hint_text: "" + hint_text: "" question_text: "Which of these best describes person 7’s gender identity?" ecstat7: @@ -307,17 +307,17 @@ en: question_text: "Do you know person 8’s age?" age8: check_answer_label: "Person 8’s age" - hint_text: "" + hint_text: "" question_text: "Age" sex8: page_header: "" check_answer_label: "Person 8’s gender identity" - hint_text: "" + hint_text: "" question_text: "Which of these best describes person 8’s gender identity?" ecstat8: page_header: "" check_answer_label: "Person 8’s working situation" hint_text: "" - question_text: "Which of these best describes person 8’s working situation?" \ No newline at end of file + question_text: "Which of these best describes person 8’s working situation?" 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 bc19c7954..dc5ee5a53 100644 --- a/config/locales/forms/2023/lettings/income_and_benefits.en.yml +++ b/config/locales/forms/2023/lettings/income_and_benefits.en.yml @@ -103,6 +103,6 @@ en: hint_text: "You only need to give an approximate figure." question_text: "Can you estimate the outstanding amount?" tshortfall: - check_answer_label: "Estimated outstanding amountt" + check_answer_label: "Estimated outstanding amount" hint_text: "Also known as the ‘outstanding amount’." question_text: "Estimated outstanding amount" diff --git a/config/locales/forms/2023/sales/household_characteristics.en.yml b/config/locales/forms/2023/sales/household_characteristics.en.yml index a49a817dc..ed03bc698 100644 --- a/config/locales/forms/2023/sales/household_characteristics.en.yml +++ b/config/locales/forms/2023/sales/household_characteristics.en.yml @@ -37,7 +37,7 @@ en: check_answer_label: "Buyer 1’s age" hint_text: "" question_text: "Age" - + sex1: page_header: "" check_answer_label: "Buyer 1’s gender identity" @@ -49,7 +49,7 @@ en: check_answer_label: "Buyer 1’s ethnic group" hint_text: "Buyer 1 is the person in the household who does the most paid work. If it’s a joint purchase and the buyers do the same amount of paid work, buyer 1 is whoever is the oldest." question_text: "What is buyer 1’s ethnic group?" - + ethnic: ethnic_background_black: page_header: "" @@ -103,9 +103,9 @@ en: question_text: "What is buyer 2's relationship to buyer 1?" person: page_header: "" - check_answer_label: "Person 2’s relationship to Buyer 1" + check_answer_label: "Person 2’s relationship to buyer 1" hint_text: "" - question_text: "What is Person 2’s relationship to Buyer 1?" + question_text: "What is person 2’s relationship to buyer 1?" age2: buyer: @@ -139,14 +139,14 @@ en: page_header: "" check_answer_label: "Person 2’s gender identity" hint_text: "" - question_text: "Which of these best describes Person 2’s gender identity?" + question_text: "Which of these best describes person 2’s gender identity?" ethnic_group2: page_header: "" check_answer_label: "Buyer 2’s ethnic group" hint_text: "" question_text: "What is buyer 2’s ethnic group?" - + ethnicbuy2: ethnic_background_black: page_header: "" @@ -179,7 +179,7 @@ en: check_answer_label: "Buyer 2’s nationality" hint_text: "" question_text: "What is buyer 2’s nationality?" - + ecstat2: buyer: page_header: "" @@ -190,14 +190,14 @@ en: page_header: "" check_answer_label: "Person 2’s working situation" hint_text: "" - question_text: "Which of these best describes Person 2’s working situation?" + question_text: "Which of these best describes person 2’s working situation?" buy2livein: page_header: "" check_answer_label: "Will buyer 2 live in the property?" hint_text: "" question_text: "Will buyer 2 live in the property?" - + hholdcount: joint_purchase: page_header: "" @@ -224,9 +224,9 @@ en: relat3: page_header: "" - check_answer_label: "Person 3’s relationship to Buyer 1" + check_answer_label: "Person 3’s relationship to buyer 1" hint_text: "" - question_text: "What is Person 3’s relationship to Buyer 1?" + question_text: "What is person 3’s relationship to buyer 1?" age3: page_header: "" @@ -238,18 +238,18 @@ en: check_answer_label: "Person 3’s age" hint_text: "" question_text: "Age" - + sex3: page_header: "" check_answer_label: "Person 3’s gender identity" hint_text: "" - question_text: "Which of these best describes Person 3’s gender identity?" + question_text: "Which of these best describes person 3’s gender identity?" ecstat3: page_header: "" check_answer_label: "Person 3’s working situation" hint_text: "" - question_text: "Which of these best describes Person 3’s working situation?" + question_text: "Which of these best describes person 3’s working situation?" details_known_4: page_header: "" @@ -259,9 +259,9 @@ en: relat4: page_header: "" - check_answer_label: "Person 4’s relationship to Buyer 1" + check_answer_label: "Person 4’s relationship to buyer 1" hint_text: "" - question_text: "What is Person 4’s relationship to Buyer 1?" + question_text: "What is person 4’s relationship to buyer 1?" age4: page_header: "" @@ -273,18 +273,18 @@ en: check_answer_label: "Person 4’s age" hint_text: "" question_text: "Age" - + sex4: page_header: "" check_answer_label: "Person 4’s gender identity" hint_text: "" - question_text: "Which of these best describes Person 4’s gender identity?" + question_text: "Which of these best describes person 4’s gender identity?" ecstat4: page_header: "" check_answer_label: "Person 4’s working situation" hint_text: "" - question_text: "Which of these best describes Person 4’s working situation?" + question_text: "Which of these best describes person 4’s working situation?" details_known_5: page_header: "" @@ -294,9 +294,9 @@ en: relat5: page_header: "" - check_answer_label: "Person 5’s relationship to Buyer 1" + check_answer_label: "Person 5’s relationship to buyer 1" hint_text: "" - question_text: "What is Person 5’s relationship to Buyer 1?" + question_text: "What is person 5’s relationship to buyer 1?" age5: page_header: "" @@ -308,18 +308,18 @@ en: check_answer_label: "Person 5’s age" hint_text: "" question_text: "Age" - + sex5: page_header: "" check_answer_label: "Person 5’s gender identity" hint_text: "" - question_text: "Which of these best describes Person 5’s gender identity?" + question_text: "Which of these best describes person 5’s gender identity?" ecstat5: page_header: "" check_answer_label: "Person 5’s working situation" hint_text: "" - question_text: "Which of these best describes Person 5’s working situation?" + question_text: "Which of these best describes person 5’s working situation?" details_known_6: page_header: "" @@ -329,9 +329,9 @@ en: relat6: page_header: "" - check_answer_label: "Person 6’s relationship to Buyer 1" + check_answer_label: "Person 6’s relationship to buyer 1" hint_text: "" - question_text: "What is Person 6’s relationship to Buyer 1?" + question_text: "What is person 6’s relationship to buyer 1?" age6: page_header: "" @@ -343,15 +343,15 @@ en: check_answer_label: "Person 6’s age" hint_text: "" question_text: "Age" - + sex6: page_header: "" check_answer_label: "Person 6’s gender identity" hint_text: "" - question_text: "Which of these best describes Person 6’s gender identity?" + question_text: "Which of these best describes person 6’s gender identity?" ecstat6: page_header: "" check_answer_label: "Person 6’s working situation" hint_text: "" - question_text: "Which of these best describes Person 6’s working situation?" + question_text: "Which of these best describes person 6’s working situation?" diff --git a/config/locales/forms/2023/sales/income_benefits_and_savings.en.yml b/config/locales/forms/2023/sales/income_benefits_and_savings.en.yml index 49262d7a1..689c611cb 100644 --- a/config/locales/forms/2023/sales/income_benefits_and_savings.en.yml +++ b/config/locales/forms/2023/sales/income_benefits_and_savings.en.yml @@ -13,7 +13,7 @@ en: check_answer_label: "Buyer 1’s gross annual income" hint_text: "Provide the gross annual income (i.e. salary before tax) plus the annual amount of benefits, Universal Credit or pensions, and income from investments." question_text: "Buyer 1’s gross annual income" - + inc1mort: page_header: "" check_answer_label: "Buyer 1’s income used for mortgage application" @@ -33,7 +33,7 @@ en: inc2mort: page_header: "" - check_answer_label: "Buyer 2’s income used for mortgage application" + check_answer_label: "Buyer 2’s income used for mortgage application" hint_text: "" question_text: "Was buyer 2’s income used for a mortgage application?" @@ -48,14 +48,14 @@ en: check_answer_label: "Housing-related benefits buyer received before buying this property" hint_text: "" question_text: "Was the buyer receiving any of these housing-related benefits immediately before buying this property?" - + savings: joint_purchase: page_header: "" savingsnk: - check_answer_label: "Buyers’ total savings known?" + check_answer_label: "Buyers’ total savings known?" hint_text: "" - question_text: "Do you know how much the 'buyers' had in savings before they paid any deposit for the property?" + question_text: "Do you know how much the buyers had in savings before they paid any deposit for the property?" savings: check_answer_label: "Buyers’ total savings before any deposit paid" hint_text: "Include any savings, investments, ISAs, premium bonds, shares, or money held in a bank or building society account." @@ -87,4 +87,4 @@ en: page_header: "" check_answer_label: "Previous property shared ownership?" hint_text: "For any buyer" - question_text: "Was the previous property under shared ownership?" \ No newline at end of file + question_text: "Was the previous property under shared ownership?" diff --git a/config/locales/forms/2023/sales/sale_information.en.yml b/config/locales/forms/2023/sales/sale_information.en.yml index 318d7c7db..24f767026 100644 --- a/config/locales/forms/2023/sales/sale_information.en.yml +++ b/config/locales/forms/2023/sales/sale_information.en.yml @@ -28,7 +28,7 @@ en: staircasing: page_header: "" check_answer_label: "Staircasing transaction" - hint_text: "A staircasing transaction is when the household purchases more shares in their property, increasing the proportion they own and decreasing the proportion the housing association owns. Once the household purchases 100% of the shares, they own the property" + hint_text: "A staircasing transaction is when the household purchases more shares in their property, increasing the proportion they own and decreasing the proportion the housing association owns. Once the household purchases 100% of the shares, they own the property." question_text: "Is this a staircasing transaction?" about_staircasing: page_header: "About the staircasing transaction" @@ -69,7 +69,7 @@ en: check_answer_label: "Household rehoused under a local authority nominations agreement?" hint_text: "A local authority nominations agreement is a written agreement between a local authority and private registered provider (PRP) that some or all of its sales vacancies are offered to local authorities for rehousing" question_text: "Was the household rehoused under a 'local authority nominations agreement'?" - + soctenant: joint_purchase: page_header: "" @@ -81,11 +81,11 @@ en: check_answer_label: "Buyer was a registered provider, housing association or local authority tenant immediately before this sale?" hint_text: "" question_text: "Was the buyer a private registered provider, housing association or local authority tenant immediately before this sale?" - + frombeds: - page_header: "About the buyers’ previous property" + page_header: "" check_answer_label: "Number of bedrooms in previous property" - hint_text: "For bedsits enter 1" + hint_text: "A bedsit has 1 bedroom." question_text: "How many bedrooms did the property have?" fromprop: @@ -113,13 +113,13 @@ en: question_text: "What was the initial percentage equity stake purchased?" mortgageused: - page_header: "Mortgage Amount" + page_header: "" check_answer_label: "Mortgage used" hint_text: "" question_text: "Was a mortgage used for the purchase of this property?" mortgage: - page_header: "Mortgage Amount" + page_header: "" check_answer_label: "Mortgage amount" hint_text: "Enter the amount of mortgage agreed with the mortgage lender. Exclude any deposits or cash payments. Numeric in pounds. Rounded to the nearest pound." question_text: "What is the mortgage amount?" @@ -135,7 +135,7 @@ en: check_answer_label: "Other Mortgage Lender" hint_text: "" question_text: "What is the other mortgage lender?" - + mortlen: page_header: "" check_answer_label: "Length of mortgage" @@ -147,7 +147,7 @@ en: check_answer_label: "Any other borrowing?" hint_text: "" question_text: "Does this include any extra borrowing?" - + deposit: page_header: "About the deposit" check_answer_label: "Deposit amount" @@ -165,7 +165,7 @@ en: check_answer_label: "Monthly rent" hint_text: "Amount paid before any charges" question_text: "What is the basic monthly rent?" - + leaseholdcharges: page_header: "" has_mscharge: @@ -199,10 +199,10 @@ en: check_answer_label: "Percentage discount" hint_text: "For Right to Buy (RTB), Preserved Right to Buy (PRTB), and Voluntary Right to Buy (VRTB)

If discount capped, enter capped %

If the property is being sold to an existing tenant under the RTB, PRTB, or VRTB schemes, enter the % discount from the full market value that is being given." question_text: "What was the percentage discount?" - + grant: page_header: "About the price of the property" check_answer_label: "Amount of any loan, grant or subsidy" hint_text: "For all schemes except Right to Buy (RTB), Preserved Right to Buy (PRTB), Voluntary Right to Buy (VRTB) and Rent to Buy" question_text: "What was the amount of any loan, grant, discount or subsidy given?" - \ No newline at end of file + diff --git a/config/locales/forms/2024/lettings/household_characteristics.en.yml b/config/locales/forms/2024/lettings/household_characteristics.en.yml index 04a311f06..0537a82bd 100644 --- a/config/locales/forms/2024/lettings/household_characteristics.en.yml +++ b/config/locales/forms/2024/lettings/household_characteristics.en.yml @@ -13,19 +13,19 @@ en: page_header: "" age1_known: check_answer_label: "" - hint_text: "The ’lead’ or ’main’ tenant is the person in the household who does the most paid work. If several people do the same amount of paid work, the lead tenant is whoever is the oldest." + hint_text: "The lead tenant is the person in the household who does the most paid work. If several people do the same paid work, the lead tenant is whoever is the oldest." question_text: "Do you know the lead tenant’s age?" age1: check_answer_label: "Lead tenant’s age" hint_text: "" question_text: "Age" - + sex1: page_header: "" check_answer_label: "Lead tenant’s gender identity" hint_text: "This should be however they personally choose to identify from the options below. This may or may not be the same as their biological sex or the sex they were assigned at birth." question_text: "Which of these best describes the lead tenant’s gender identity?" - + ethnic_group: page_header: "" check_answer_label: "Lead tenant’s ethnic group" @@ -319,4 +319,4 @@ en: page_header: "" check_answer_label: "Person 8’s working situation" hint_text: "" - question_text: "Which of these best describes person 8’s working situation?" \ No newline at end of file + question_text: "Which of these best describes person 8’s working situation?" 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 bb3cc320e..8e364f611 100644 --- a/config/locales/forms/2024/lettings/income_and_benefits.en.yml +++ b/config/locales/forms/2024/lettings/income_and_benefits.en.yml @@ -103,6 +103,6 @@ en: hint_text: "You only need to give an approximate figure." question_text: "Can you estimate the outstanding amount?" tshortfall: - check_answer_label: "Estimated outstanding amountt" + check_answer_label: "Estimated outstanding amount" hint_text: "Also known as the ‘outstanding amount’." question_text: "Estimated outstanding amount" diff --git a/config/locales/forms/2024/sales/household_characteristics.en.yml b/config/locales/forms/2024/sales/household_characteristics.en.yml index 22f9427e8..5b06639fe 100644 --- a/config/locales/forms/2024/sales/household_characteristics.en.yml +++ b/config/locales/forms/2024/sales/household_characteristics.en.yml @@ -13,7 +13,7 @@ en: check_answer_label: "Buyer 1’s age" hint_text: "" question_text: "Age" - + sex1: page_header: "" check_answer_label: "Buyer 1’s gender identity" @@ -25,7 +25,7 @@ en: check_answer_label: "Buyer 1’s ethnic group" hint_text: "" question_text: "What is buyer 1’s ethnic group?" - + ethnic: ethnic_background_black: page_header: "" @@ -85,9 +85,9 @@ en: question_text: "What is buyer 2's relationship to buyer 1?" person: page_header: "" - check_answer_label: "Person 2’s relationship to Buyer 1" + check_answer_label: "Person 2’s relationship to buyer 1" hint_text: "" - question_text: "What is Person 2’s relationship to Buyer 1?" + question_text: "What is person 2’s relationship to buyer 1?" age2: buyer: @@ -121,14 +121,14 @@ en: page_header: "" check_answer_label: "Person 2’s gender identity" hint_text: "This should be however they personally choose to identify from the options below. This may or may not be the same as their biological sex or the sex they were assigned at birth." - question_text: "Which of these best describes Person 2’s gender identity?" + question_text: "Which of these best describes person 2’s gender identity?" ethnic_group2: page_header: "" check_answer_label: "Buyer 2’s ethnic group" hint_text: "" question_text: "What is buyer 2’s ethnic group?" - + ethnicbuy2: ethnic_background_black: page_header: "" @@ -167,7 +167,7 @@ en: check_answer_label: "Buyer 2’s nationality" hint_text: "" question_text: "Enter a nationality" - + ecstat2: buyer: page_header: "" @@ -178,14 +178,14 @@ en: page_header: "" check_answer_label: "Person 2’s working situation" hint_text: "" - question_text: "Which of these best describes Person 2’s working situation?" + question_text: "Which of these best describes person 2’s working situation?" buy2livein: page_header: "" check_answer_label: "Will buyer 2 live in the property?" hint_text: "" question_text: "Will buyer 2 live in the property?" - + hholdcount: joint_purchase: page_header: "" @@ -212,9 +212,9 @@ en: relat3: page_header: "" - check_answer_label: "Person 3’s relationship to Buyer 1" + check_answer_label: "Person 3’s relationship to buyer 1" hint_text: "" - question_text: "What is Person 3’s relationship to Buyer 1?" + question_text: "What is person 3’s relationship to buyer 1?" age3: page_header: "" @@ -226,18 +226,18 @@ en: check_answer_label: "Person 3’s age" hint_text: "" question_text: "Age" - + sex3: page_header: "" check_answer_label: "Person 3’s gender identity" hint_text: "This should be however they personally choose to identify from the options below. This may or may not be the same as their biological sex or the sex they were assigned at birth." - question_text: "Which of these best describes Person 3’s gender identity?" + question_text: "Which of these best describes person 3’s gender identity?" ecstat3: page_header: "" check_answer_label: "Person 3’s working situation" hint_text: "" - question_text: "Which of these best describes Person 3’s working situation?" + question_text: "Which of these best describes person 3’s working situation?" details_known_4: page_header: "" @@ -247,9 +247,9 @@ en: relat4: page_header: "" - check_answer_label: "Person 4’s relationship to Buyer 1" + check_answer_label: "Person 4’s relationship to buyer 1" hint_text: "" - question_text: "What is Person 4’s relationship to Buyer 1?" + question_text: "What is person 4’s relationship to buyer 1?" age4: page_header: "" @@ -261,18 +261,18 @@ en: check_answer_label: "Person 4’s age" hint_text: "" question_text: "Age" - + sex4: page_header: "" check_answer_label: "Person 4’s gender identity" hint_text: "This should be however they personally choose to identify from the options below. This may or may not be the same as their biological sex or the sex they were assigned at birth." - question_text: "Which of these best describes Person 4’s gender identity?" + question_text: "Which of these best describes person 4’s gender identity?" ecstat4: page_header: "" check_answer_label: "Person 4’s working situation" hint_text: "" - question_text: "Which of these best describes Person 4’s working situation?" + question_text: "Which of these best describes person 4’s working situation?" details_known_5: page_header: "" @@ -282,9 +282,9 @@ en: relat5: page_header: "" - check_answer_label: "Person 5’s relationship to Buyer 1" + check_answer_label: "Person 5’s relationship to buyer 1" hint_text: "" - question_text: "What is Person 5’s relationship to Buyer 1?" + question_text: "What is person 5’s relationship to buyer 1?" age5: page_header: "" @@ -296,18 +296,18 @@ en: check_answer_label: "Person 5’s age" hint_text: "" question_text: "Age" - + sex5: page_header: "" check_answer_label: "Person 5’s gender identity" hint_text: "This should be however they personally choose to identify from the options below. This may or may not be the same as their biological sex or the sex they were assigned at birth." - question_text: "Which of these best describes Person 5’s gender identity?" + question_text: "Which of these best describes person 5’s gender identity?" ecstat5: page_header: "" check_answer_label: "Person 5’s working situation" hint_text: "" - question_text: "Which of these best describes Person 5’s working situation?" + question_text: "Which of these best describes person 5’s working situation?" details_known_6: page_header: "" @@ -317,9 +317,9 @@ en: relat6: page_header: "" - check_answer_label: "Person 6’s relationship to Buyer 1" + check_answer_label: "Person 6’s relationship to buyer 1" hint_text: "" - question_text: "What is Person 6’s relationship to Buyer 1?" + question_text: "What is person 6’s relationship to buyer 1?" age6: page_header: "" @@ -331,15 +331,15 @@ en: check_answer_label: "Person 6’s age" hint_text: "" question_text: "Age" - + sex6: page_header: "" check_answer_label: "Person 6’s gender identity" hint_text: "This should be however they personally choose to identify from the options below. This may or may not be the same as their biological sex or the sex they were assigned at birth." - question_text: "Which of these best describes Person 6’s gender identity?" + question_text: "Which of these best describes person 6’s gender identity?" ecstat6: page_header: "" check_answer_label: "Person 6’s working situation" hint_text: "" - question_text: "Which of these best describes Person 6’s working situation?" + question_text: "Which of these best describes person 6’s working situation?" diff --git a/config/locales/forms/2024/sales/income_benefits_and_savings.en.yml b/config/locales/forms/2024/sales/income_benefits_and_savings.en.yml index 0654c9e1f..8d5ec0772 100644 --- a/config/locales/forms/2024/sales/income_benefits_and_savings.en.yml +++ b/config/locales/forms/2024/sales/income_benefits_and_savings.en.yml @@ -13,7 +13,7 @@ en: check_answer_label: "Buyer 1’s gross annual income" hint_text: "Provide the gross annual income (i.e. salary before tax) plus the annual amount of benefits, Universal Credit or pensions, and income from investments." question_text: "Buyer 1’s gross annual income" - + inc1mort: page_header: "" check_answer_label: "Buyer 1’s income used for mortgage application" @@ -48,14 +48,14 @@ en: check_answer_label: "Housing-related benefits buyer received before buying this property" hint_text: "" question_text: "Was the buyer receiving any of these housing-related benefits immediately before buying this property?" - + savings: joint_purchase: page_header: "" savingsnk: check_answer_label: "Buyers’ total savings known?" hint_text: "" - question_text: "Do you know how much the 'buyers' had in savings before they paid any deposit for the property?" + question_text: "Do you know how much the buyers had in savings before they paid any deposit for the property?" savings: check_answer_label: "Buyers’ total savings before any deposit paid" hint_text: "Include any savings, investments, ISAs, premium bonds, shares, or money held in a bank or building society account." @@ -87,4 +87,4 @@ en: page_header: "" check_answer_label: "Previous property shared ownership?" hint_text: "For any buyer" - question_text: "Was the previous property under shared ownership?" \ No newline at end of file + question_text: "Was the previous property under shared ownership?" diff --git a/config/locales/forms/2024/sales/sale_information.en.yml b/config/locales/forms/2024/sales/sale_information.en.yml index d0031416e..92acca9cd 100644 --- a/config/locales/forms/2024/sales/sale_information.en.yml +++ b/config/locales/forms/2024/sales/sale_information.en.yml @@ -28,7 +28,7 @@ en: staircasing: page_header: "" check_answer_label: "Staircasing transaction" - hint_text: "A staircasing transaction is when the household purchases more shares in their property, increasing the proportion they own and decreasing the proportion the housing association owns. Once the household purchases 100% of the shares, they own the property" + hint_text: "A staircasing transaction is when the household purchases more shares in their property, increasing the proportion they own and decreasing the proportion the housing association owns. Once the household purchases 100% of the shares, they own the property." question_text: "Is this a staircasing transaction?" about_staircasing: page_header: "About the staircasing transaction" @@ -73,7 +73,7 @@ en: check_answer_label: "Household rehoused under a local authority nominations agreement?" hint_text: "A local authority nominations agreement is a written agreement between a local authority and private registered provider (PRP) that some or all of its sales vacancies are offered to local authorities for rehousing" question_text: "Was the household rehoused under a 'local authority nominations agreement'?" - + soctenant: joint_purchase: page_header: "" @@ -85,11 +85,11 @@ en: check_answer_label: "Buyer was a registered provider, housing association or local authority tenant immediately before this sale?" hint_text: "" question_text: "Was the buyer a private registered provider, housing association or local authority tenant immediately before this sale?" - + frombeds: - page_header: "About the buyers’ previous property" + page_header: "" check_answer_label: "Number of bedrooms in previous property" - hint_text: "For bedsits enter 1" + hint_text: "A bedsit has 1 bedroom." question_text: "How many bedrooms did the property have?" fromprop: @@ -117,13 +117,13 @@ en: question_text: "What was the initial percentage equity stake purchased?" mortgageused: - page_header: "Mortgage Amount" + page_header: "" check_answer_label: "Mortgage used" hint_text: "" question_text: "Was a mortgage used for the purchase of this property?" mortgage: - page_header: "Mortgage Amount" + page_header: "" check_answer_label: "Mortgage amount" hint_text: "Enter the amount of mortgage agreed with the mortgage lender. Exclude any deposits or cash payments. Numeric in pounds. Rounded to the nearest pound." question_text: "What is the mortgage amount?" @@ -139,7 +139,7 @@ en: check_answer_label: "Other Mortgage Lender" hint_text: "" question_text: "What is the other mortgage lender?" - + mortlen: page_header: "" check_answer_label: "Length of mortgage" @@ -151,7 +151,7 @@ en: check_answer_label: "Any other borrowing?" hint_text: "" question_text: "Does this include any extra borrowing?" - + deposit: page_header: "About the deposit" check_answer_label: "Deposit amount" @@ -169,7 +169,7 @@ en: check_answer_label: "Monthly rent" hint_text: "Amount paid before any charges" question_text: "What is the basic monthly rent?" - + leaseholdcharges: page_header: "" has_mscharge: @@ -198,10 +198,10 @@ en: check_answer_label: "Percentage discount" hint_text: "For Right to Buy (RTB), Preserved Right to Buy (PRTB), and Voluntary Right to Buy (VRTB)

If discount capped, enter capped %

If the property is being sold to an existing tenant under the RTB, PRTB, or VRTB schemes, enter the % discount from the full market value that is being given." question_text: "What was the percentage discount?" - + grant: page_header: "About the price of the property" check_answer_label: "Amount of any loan, grant or subsidy" hint_text: "For all schemes except Right to Buy (RTB), Preserved Right to Buy (PRTB), Voluntary Right to Buy (VRTB) and Rent to Buy" question_text: "What was the amount of any loan, grant, discount or subsidy given?" - \ No newline at end of file + diff --git a/config/locales/forms/2025/lettings/household_characteristics.en.yml b/config/locales/forms/2025/lettings/household_characteristics.en.yml index 1aef9297a..b6d7ad7e9 100644 --- a/config/locales/forms/2025/lettings/household_characteristics.en.yml +++ b/config/locales/forms/2025/lettings/household_characteristics.en.yml @@ -13,7 +13,7 @@ en: page_header: "" age1_known: check_answer_label: "" - hint_text: "The ’lead’ or ’main’ tenant is the person in the household who does the most paid work. If several people do the same amount of paid work, the lead tenant is whoever is the oldest." + hint_text: "The lead tenant is the person in the household who does the most paid work. If several people do the same paid work, the lead tenant is whoever is the oldest." question_text: "Do you know the lead tenant’s age?" age1: check_answer_label: "Lead tenant’s age" diff --git a/config/locales/forms/2025/lettings/income_and_benefits.en.yml b/config/locales/forms/2025/lettings/income_and_benefits.en.yml index 55e193ff7..5b8ed26c0 100644 --- a/config/locales/forms/2025/lettings/income_and_benefits.en.yml +++ b/config/locales/forms/2025/lettings/income_and_benefits.en.yml @@ -103,6 +103,6 @@ en: hint_text: "You only need to give an approximate figure." question_text: "Can you estimate the outstanding amount?" tshortfall: - check_answer_label: "Estimated outstanding amountt" + check_answer_label: "Estimated outstanding amount" hint_text: "Also known as the ‘outstanding amount’." question_text: "Estimated outstanding amount" diff --git a/config/locales/forms/2025/sales/household_characteristics.en.yml b/config/locales/forms/2025/sales/household_characteristics.en.yml index 3f9f503be..a217c578c 100644 --- a/config/locales/forms/2025/sales/household_characteristics.en.yml +++ b/config/locales/forms/2025/sales/household_characteristics.en.yml @@ -121,7 +121,7 @@ en: page_header: "" check_answer_label: "Person 2’s gender identity" hint_text: "This should be however they personally choose to identify from the options below. This may or may not be the same as their biological sex or the sex they were assigned at birth." - question_text: "Which of these best describes Person 2’s gender identity?" + question_text: "Which of these best describes person 2’s gender identity?" ethnic_group2: page_header: "" @@ -178,7 +178,7 @@ en: page_header: "" check_answer_label: "Person 2’s working situation" hint_text: "" - question_text: "Which of these best describes Person 2’s working situation?" + question_text: "Which of these best describes person 2’s working situation?" buy2livein: page_header: "" @@ -231,13 +231,13 @@ en: page_header: "" check_answer_label: "Person 3’s gender identity" hint_text: "This should be however they personally choose to identify from the options below. This may or may not be the same as their biological sex or the sex they were assigned at birth." - question_text: "Which of these best describes Person 3’s gender identity?" + question_text: "Which of these best describes person 3’s gender identity?" ecstat3: page_header: "" check_answer_label: "Person 3’s working situation" hint_text: "" - question_text: "Which of these best describes Person 3’s working situation?" + question_text: "Which of these best describes person 3’s working situation?" details_known_4: page_header: "" @@ -266,13 +266,13 @@ en: page_header: "" check_answer_label: "Person 4’s gender identity" hint_text: "This should be however they personally choose to identify from the options below. This may or may not be the same as their biological sex or the sex they were assigned at birth." - question_text: "Which of these best describes Person 4’s gender identity?" + question_text: "Which of these best describes person 4’s gender identity?" ecstat4: page_header: "" check_answer_label: "Person 4’s working situation" hint_text: "" - question_text: "Which of these best describes Person 4’s working situation?" + question_text: "Which of these best describes person 4’s working situation?" details_known_5: page_header: "" @@ -301,13 +301,13 @@ en: page_header: "" check_answer_label: "Person 5’s gender identity" hint_text: "This should be however they personally choose to identify from the options below. This may or may not be the same as their biological sex or the sex they were assigned at birth." - question_text: "Which of these best describes Person 5’s gender identity?" + question_text: "Which of these best describes person 5’s gender identity?" ecstat5: page_header: "" check_answer_label: "Person 5’s working situation" hint_text: "" - question_text: "Which of these best describes Person 5’s working situation?" + question_text: "Which of these best describes person 5’s working situation?" details_known_6: page_header: "" @@ -336,10 +336,10 @@ en: page_header: "" check_answer_label: "Person 6’s gender identity" hint_text: "This should be however they personally choose to identify from the options below. This may or may not be the same as their biological sex or the sex they were assigned at birth." - question_text: "Which of these best describes Person 6’s gender identity?" + question_text: "Which of these best describes person 6’s gender identity?" ecstat6: page_header: "" check_answer_label: "Person 6’s working situation" hint_text: "" - question_text: "Which of these best describes Person 6’s working situation?" + question_text: "Which of these best describes person 6’s working situation?" diff --git a/config/locales/forms/2025/sales/income_benefits_and_savings.en.yml b/config/locales/forms/2025/sales/income_benefits_and_savings.en.yml index 20beb0b85..b38c203f7 100644 --- a/config/locales/forms/2025/sales/income_benefits_and_savings.en.yml +++ b/config/locales/forms/2025/sales/income_benefits_and_savings.en.yml @@ -55,7 +55,7 @@ en: savingsnk: check_answer_label: "Buyers’ total savings known?" hint_text: "" - question_text: "Do you know how much the 'buyers' had in savings before they paid any deposit for the property?" + question_text: "Do you know how much the buyers had in savings before they paid any deposit for the property?" savings: check_answer_label: "Buyers’ total savings before any deposit paid" hint_text: "Include any savings, investments, ISAs, premium bonds, shares, or money held in a bank or building society account." diff --git a/config/locales/forms/2025/sales/sale_information.en.yml b/config/locales/forms/2025/sales/sale_information.en.yml index 0535caca1..278c8a235 100644 --- a/config/locales/forms/2025/sales/sale_information.en.yml +++ b/config/locales/forms/2025/sales/sale_information.en.yml @@ -105,9 +105,9 @@ en: question_text: "Was the buyer a private registered provider, housing association or local authority tenant immediately before this sale?" frombeds: - page_header: "About the buyers’ previous property" + page_header: "" check_answer_label: "Number of bedrooms in previous property" - hint_text: "For bedsits enter 1" + hint_text: "A bedsit has 1 bedroom." question_text: "How many bedrooms did the property have?" fromprop: @@ -145,13 +145,13 @@ en: question_text: "What was the percentage shared purchased in the initial transaction?" mortgageused: - page_header: "Mortgage Amount" + page_header: "" check_answer_label: "Mortgage used?" hint_text: "" question_text: "Was a mortgage used for the purchase of this property?" mortgage: - page_header: "Mortgage Amount" + page_header: "" check_answer_label: "Mortgage amount" hint_text: "Enter the amount of mortgage agreed with the mortgage lender. Exclude any deposits or cash payments. Numeric in pounds. Rounded to the nearest pound." question_text: "What is the mortgage amount?" diff --git a/config/locales/forms/2025/sales/setup.en.yml b/config/locales/forms/2025/sales/setup.en.yml index 6f7c5da98..c4cc9a42c 100644 --- a/config/locales/forms/2025/sales/setup.en.yml +++ b/config/locales/forms/2025/sales/setup.en.yml @@ -42,7 +42,7 @@ en: staircasing: page_header: "" check_answer_label: "Staircasing transaction" - hint_text: "A staircasing transaction is when the household purchases more shares in their property, increasing the proportion they own and decreasing the proportion the housing association owns. Once the household purchases 100% of the shares, they own the property" + hint_text: "A staircasing transaction is when the household purchases more shares in their property, increasing the proportion they own and decreasing the proportion the housing association owns. Once the household purchases 100% of the shares, they own the property." question_text: "Is this a staircasing transaction?" type: diff --git a/spec/models/form/sales/pages/equity_spec.rb b/spec/models/form/sales/pages/equity_spec.rb index 83a5dfaa3..e27538263 100644 --- a/spec/models/form/sales/pages/equity_spec.rb +++ b/spec/models/form/sales/pages/equity_spec.rb @@ -7,6 +7,10 @@ RSpec.describe Form::Sales::Pages::Equity, type: :model do let(:page_definition) { nil } let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1))) } + before do + allow(page.subsection.form).to receive(:start_year_2025_or_later?).and_return(false) + end + it "has correct subsection" do expect(page.subsection).to eq(subsection) end diff --git a/spec/models/form/sales/pages/value_shared_ownership_spec.rb b/spec/models/form/sales/pages/value_shared_ownership_spec.rb index eb1b1099f..82e6c1055 100644 --- a/spec/models/form/sales/pages/value_shared_ownership_spec.rb +++ b/spec/models/form/sales/pages/value_shared_ownership_spec.rb @@ -7,6 +7,10 @@ RSpec.describe Form::Sales::Pages::ValueSharedOwnership, type: :model do let(:page_definition) { nil } let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1))) } + before do + allow(page.subsection.form).to receive(:start_year_2025_or_later?).and_return(false) + end + it "has correct subsection" do expect(page.subsection).to eq(subsection) end diff --git a/spec/models/form/sales/questions/equity_spec.rb b/spec/models/form/sales/questions/equity_spec.rb index 5083af9e8..3e6b9d85a 100644 --- a/spec/models/form/sales/questions/equity_spec.rb +++ b/spec/models/form/sales/questions/equity_spec.rb @@ -7,6 +7,10 @@ RSpec.describe Form::Sales::Questions::Equity, type: :model do let(:question_definition) { nil } let(:page) { instance_double(Form::Page, id: "initial_equity", subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) } + before do + allow(page.subsection.form).to receive(:start_year_2025_or_later?).and_return(false) + end + it "has correct page" do expect(question.page).to eq(page) end