From a421007141489a45538f66a30dceb5a0faae787f Mon Sep 17 00:00:00 2001 From: natdeanlewissoftwire Date: Wed, 1 Feb 2023 09:41:35 +0000 Subject: [PATCH] feat: updated copy requirements --- app/models/form/sales/questions/deposit_value_check.rb | 2 +- .../form/sales/questions/household_wheelchair_check.rb | 2 +- app/models/form/sales/questions/mortgage_value_check.rb | 2 +- app/models/form/sales/questions/savings_value_check.rb | 2 +- app/models/validations/sales/financial_validations.rb | 2 +- config/locales/en.yml | 8 ++++---- .../form/sales/questions/deposit_value_check_spec.rb | 2 +- .../sales/questions/household_wheelchair_check_spec.rb | 2 +- .../form/sales/questions/mortgage_value_check_spec.rb | 2 +- .../form/sales/questions/savings_value_check_spec.rb | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/app/models/form/sales/questions/deposit_value_check.rb b/app/models/form/sales/questions/deposit_value_check.rb index f3cd27e3a..a7b63330d 100644 --- a/app/models/form/sales/questions/deposit_value_check.rb +++ b/app/models/form/sales/questions/deposit_value_check.rb @@ -3,7 +3,7 @@ class Form::Sales::Questions::DepositValueCheck < ::Form::Question super @id = "deposit_value_check" @check_answer_label = "Deposit confirmation" - @header = "Are you sure that the deposit is this much higher than the buyer's savings?" + @header = "Are you sure the buyer's deposit is this much higher than their savings?" @type = "interruption_screen" @answer_options = { "0" => { "value" => "Yes" }, diff --git a/app/models/form/sales/questions/household_wheelchair_check.rb b/app/models/form/sales/questions/household_wheelchair_check.rb index 14a3e92f6..cdb33154a 100644 --- a/app/models/form/sales/questions/household_wheelchair_check.rb +++ b/app/models/form/sales/questions/household_wheelchair_check.rb @@ -3,7 +3,7 @@ class Form::Sales::Questions::HouseholdWheelchairCheck < ::Form::Question super @id = "wheel_value_check" @check_answer_label = "Does anyone in the household use a wheelchair?" - @header = "Is this right? Earlier, you said someone in the household uses a wheelchair" + @header = "Are you sure? Earlier, you said that that nobody in the household considers themselves to have a disability" @type = "interruption_screen" @answer_options = { "0" => { "value" => "Yes" }, diff --git a/app/models/form/sales/questions/mortgage_value_check.rb b/app/models/form/sales/questions/mortgage_value_check.rb index 39079d40e..79effd3d2 100644 --- a/app/models/form/sales/questions/mortgage_value_check.rb +++ b/app/models/form/sales/questions/mortgage_value_check.rb @@ -3,7 +3,7 @@ class Form::Sales::Questions::MortgageValueCheck < ::Form::Question super @id = "mortgage_value_check" @check_answer_label = "Mortgage confirmation" - @header = "Are you sure that the mortgage is more than 5 times the income used for the mortgage application?" + @header = "Are you sure the mortgage is more than 5 times the income used for the mortgage application?" @type = "interruption_screen" @answer_options = { "0" => { "value" => "Yes" }, diff --git a/app/models/form/sales/questions/savings_value_check.rb b/app/models/form/sales/questions/savings_value_check.rb index bcd16827a..7c4bcdabe 100644 --- a/app/models/form/sales/questions/savings_value_check.rb +++ b/app/models/form/sales/questions/savings_value_check.rb @@ -3,7 +3,7 @@ class Form::Sales::Questions::SavingsValueCheck < ::Form::Question super @id = "savings_value_check" @check_answer_label = "Savings confirmation" - @header = "Are you sure the savings are higher than £100,000?" + @header = "Are you sure savings are above £100,000?" @type = "interruption_screen" @answer_options = { "0" => { "value" => "Yes" }, diff --git a/app/models/validations/sales/financial_validations.rb b/app/models/validations/sales/financial_validations.rb index 30a69c88c..e16565d0a 100644 --- a/app/models/validations/sales/financial_validations.rb +++ b/app/models/validations/sales/financial_validations.rb @@ -10,7 +10,7 @@ module Validations::Sales::FinancialValidations record.errors.add :ownershipsch, I18n.t("validations.financial.income1.over_hard_max.inside_london") record.errors.add :la, I18n.t("validations.financial.income1.over_hard_max.inside_london") record.errors.add :postcode_full, I18n.t("validations.financial.income1.over_hard_max.inside_london") - elsif record.income1 > 80_000 + elsif !record.london_property? && record.income1 > 80_000 record.errors.add :income1, I18n.t("validations.financial.income1.over_hard_max.outside_london") record.errors.add :ecstat1, I18n.t("validations.financial.income1.over_hard_max.outside_london") record.errors.add :ownershipsch, I18n.t("validations.financial.income1.over_hard_max.outside_london") diff --git a/config/locales/en.yml b/config/locales/en.yml index fd2426d62..c92c9574c 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -214,8 +214,8 @@ en: earnings_missing: "Enter how much income the household has in total" income1: over_hard_max: - outside_london: "Income maximum under £80,000 for properties outside London local authorities" - inside_london: "Income maximum £90,000 for properties within London local authorities" + outside_london: "Income must not exceed £80,000 for properties outside London local authorities" + inside_london: "Income must not exceed £90,000 for properties within London local authorities" negative_currency: "Enter an amount above 0" rent: less_than_shortfall: "Enter an amount that is more than the shortfall in basic rent" @@ -372,7 +372,7 @@ en: no_choices: "You cannot answer this question as you told us nobody in the household has a physical or mental health condition (or other illness) expected to last 12 months or more" postcode: discounted_ownership: "Last settled accommodation and discounted ownership property postcodes must match" - + tenancy: length: fixed_term_not_required: "You must only answer the length of the tenancy if it's fixed-term" @@ -423,7 +423,7 @@ en: must_be_less_than_1_year_from_saledate: Contract exchange date must be less than 1 year before completion date previous_property_beds: - property_type_bedsit: "A bedsit cannot have more than 1 bedroom" + property_type_bedsit: "Number of bedrooms must be 1 if the property is a bedsit" discounted_ownership_value: "Mortgage, deposit, and grant total must equal £%{value_with_discount}" monthly_rent: higher_than_expected: "Basic monthly rent must be between £0 and £9,999" diff --git a/spec/models/form/sales/questions/deposit_value_check_spec.rb b/spec/models/form/sales/questions/deposit_value_check_spec.rb index 70baafbef..cd309b9be 100644 --- a/spec/models/form/sales/questions/deposit_value_check_spec.rb +++ b/spec/models/form/sales/questions/deposit_value_check_spec.rb @@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::DepositValueCheck, type: :model do end it "has the correct header" do - expect(question.header).to eq("Are you sure that the deposit is this much higher than the buyer's savings?") + expect(question.header).to eq("Are you sure the buyer's deposit is this much higher than their savings?") end it "has the correct check_answer_label" do diff --git a/spec/models/form/sales/questions/household_wheelchair_check_spec.rb b/spec/models/form/sales/questions/household_wheelchair_check_spec.rb index db4c4ba88..a58e502fb 100644 --- a/spec/models/form/sales/questions/household_wheelchair_check_spec.rb +++ b/spec/models/form/sales/questions/household_wheelchair_check_spec.rb @@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::HouseholdWheelchairCheck, type: :model do end it "has the correct header" do - expect(question.header).to eq("Is this right? Earlier, you said someone in the household uses a wheelchair") + expect(question.header).to eq("Are you sure? Earlier, you said that that nobody in the household considers themselves to have a disability") end it "has the correct check_answer_label" do diff --git a/spec/models/form/sales/questions/mortgage_value_check_spec.rb b/spec/models/form/sales/questions/mortgage_value_check_spec.rb index 7abc07e1f..91bfa0902 100644 --- a/spec/models/form/sales/questions/mortgage_value_check_spec.rb +++ b/spec/models/form/sales/questions/mortgage_value_check_spec.rb @@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::MortgageValueCheck, type: :model do end it "has the correct header" do - expect(question.header).to eq("Are you sure that the mortgage is more than 5 times the income used for the mortgage application?") + expect(question.header).to eq("Are you sure the mortgage is more than 5 times the income used for the mortgage application?") end it "has the correct check_answer_label" do diff --git a/spec/models/form/sales/questions/savings_value_check_spec.rb b/spec/models/form/sales/questions/savings_value_check_spec.rb index 3794147de..17136df65 100644 --- a/spec/models/form/sales/questions/savings_value_check_spec.rb +++ b/spec/models/form/sales/questions/savings_value_check_spec.rb @@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::SavingsValueCheck, type: :model do end it "has the correct header" do - expect(question.header).to eq("Are you sure the savings are higher than £100,000?") + expect(question.header).to eq("Are you sure savings are above £100,000?") end it "has the correct check_answer_label" do