From 95157d9c821240176b2281f16c49abb26090a353 Mon Sep 17 00:00:00 2001 From: Manny Dinssa <44172848+Dinssa@users.noreply.github.com> Date: Mon, 7 Apr 2025 09:30:01 +0100 Subject: [PATCH] CLDC 4001: Change apostrophes that look like quotes (#3044) * Update text copy to use curly apostrophes for consistency * Update BU text copy to use curly apostrophes for consistency * Update BU text copy to use curly apostrophes for consistency * Update text copy to use 'Other' for consistency in instead of 'other' * Update text copy for 'Reasonable preference reason' fields to improve clarity * Update tests --- .../lettings/year2023/row_parser.rb | 114 +++++++++--------- .../lettings/year2024/row_parser.rb | 114 +++++++++--------- .../lettings/year2025/row_parser.rb | 100 +++++++-------- .../bulk_upload/sales/year2023/row_parser.rb | 50 ++++---- .../bulk_upload/sales/year2024/row_parser.rb | 44 +++---- .../bulk_upload/sales/year2025/row_parser.rb | 38 +++--- config/locales/en.yml | 2 +- .../forms/2023/lettings/guidance.en.yml | 6 +- .../lettings/household_characteristics.en.yml | 32 ++--- .../2023/lettings/household_situation.en.yml | 4 +- .../2023/lettings/property_information.en.yml | 8 +- .../locales/forms/2023/lettings/setup.en.yml | 2 +- .../2023/lettings/soft_validations.en.yml | 2 +- .../2023/lettings/tenancy_information.en.yml | 4 +- .../sales/household_characteristics.en.yml | 50 ++++---- .../2023/sales/household_situation.en.yml | 2 +- .../sales/income_benefits_and_savings.en.yml | 8 +- .../sales/other_household_information.en.yml | 2 +- .../2023/sales/property_information.en.yml | 6 +- .../forms/2023/sales/sale_information.en.yml | 2 +- .../forms/2023/sales/soft_validations.en.yml | 10 +- .../forms/2024/lettings/guidance.en.yml | 2 +- .../lettings/household_characteristics.en.yml | 32 ++--- .../2024/lettings/household_situation.en.yml | 4 +- .../2024/lettings/property_information.en.yml | 10 +- .../locales/forms/2024/lettings/setup.en.yml | 2 +- .../2024/lettings/soft_validations.en.yml | 2 +- .../2024/lettings/tenancy_information.en.yml | 4 +- .../sales/household_characteristics.en.yml | 50 ++++---- .../2024/sales/household_situation.en.yml | 2 +- .../sales/income_benefits_and_savings.en.yml | 8 +- .../sales/other_household_information.en.yml | 2 +- .../2024/sales/property_information.en.yml | 8 +- .../forms/2024/sales/sale_information.en.yml | 2 +- .../forms/2024/sales/soft_validations.en.yml | 10 +- .../forms/2025/lettings/guidance.en.yml | 2 +- .../lettings/household_characteristics.en.yml | 32 ++--- .../2025/lettings/household_situation.en.yml | 4 +- .../2025/lettings/property_information.en.yml | 6 +- .../locales/forms/2025/lettings/setup.en.yml | 2 +- .../2025/lettings/soft_validations.en.yml | 2 +- .../2025/lettings/tenancy_information.en.yml | 4 +- .../sales/household_characteristics.en.yml | 46 +++---- .../2025/sales/household_situation.en.yml | 2 +- .../sales/income_benefits_and_savings.en.yml | 8 +- .../sales/other_household_information.en.yml | 2 +- .../2025/sales/property_information.en.yml | 4 +- config/locales/forms/2025/sales/setup.en.yml | 2 +- .../forms/2025/sales/soft_validations.en.yml | 10 +- .../lettings/2024/bulk_upload.en.yml | 2 +- .../validations/lettings/household.en.yml | 4 +- .../validations/lettings/tenancy.en.yml | 6 +- .../validations/sales/2024/bulk_upload.en.yml | 8 +- .../validations/sales/2025/bulk_upload.en.yml | 8 +- .../validations/sales/financial.en.yml | 4 +- .../validations/sales/household.en.yml | 8 +- .../files/2022_23_sales_bulk_upload.csv | 8 +- .../files/blank_bulk_upload_sales.csv | 8 +- .../duplicate_logs_controller_spec.rb | 14 +-- spec/requests/form_controller_spec.rb | 2 +- .../lettings/year2024/row_parser_spec.rb | 4 +- .../lettings/year2025/row_parser_spec.rb | 4 +- 62 files changed, 472 insertions(+), 472 deletions(-) diff --git a/app/services/bulk_upload/lettings/year2023/row_parser.rb b/app/services/bulk_upload/lettings/year2023/row_parser.rb index 3424e0608..70aa4951e 100644 --- a/app/services/bulk_upload/lettings/year2023/row_parser.rb +++ b/app/services/bulk_upload/lettings/year2023/row_parser.rb @@ -27,9 +27,9 @@ class BulkUpload::Lettings::Year2023::RowParser field_20: "Address line 2", field_21: "Town or city", field_22: "County", - field_23: "Part 1 of the property's postcode", - field_24: "Part 2 of the property's postcode", - field_25: "What is the property's local authority?", + field_23: "Part 1 of the property’s postcode", + field_24: "Part 2 of the property’s postcode", + field_25: "What is the property’s local authority?", field_26: "What type was the property most recently let as?", field_27: "What is the reason for the property being vacant?", field_28: "How many times was the property offered between becoming vacant and this letting?", @@ -50,39 +50,39 @@ class BulkUpload::Lettings::Year2023::RowParser field_43: "What is the length of the fixed-term tenancy to the nearest year?", field_44: "Is this letting sheltered accommodation?", field_45: "Has tenant seen the MHCLG privacy notice?", - field_46: "What is the lead tenant's age?", - field_47: "Which of these best describes the lead tenant's gender identity?", - field_48: "Which of these best describes the lead tenant's ethnic background?", - field_49: "What is the lead tenant's nationality?", - field_50: "Which of these best describes the lead tenant's working situation?", - field_51: "What is person 2's relationship to the lead tenant?", - field_52: "What is person 2's age?", - field_53: "Which of these best describes person 2's gender identity?", - field_54: "Which of these best describes person 2's working situation?", - field_55: "What is person 3's relationship to the lead tenant?", - field_56: "What is person 3's age?", - field_57: "Which of these best describes person 3's gender identity?", - field_58: "Which of these best describes person 3's working situation?", - field_59: "What is person 4's relationship to the lead tenant?", - field_60: "What is person 4's age?", - field_61: "Which of these best describes person 4's gender identity?", - field_62: "Which of these best describes person 4's working situation?", - field_63: "What is person 5's relationship to the lead tenant?", - field_64: "What is person 5's age?", - field_65: "Which of these best describes person 5's gender identity?", - field_66: "Which of these best describes person 5's working situation?", - field_67: "What is person 6's relationship to the lead tenant?", - field_68: "What is person 6's age?", - field_69: "Which of these best describes person 6's gender identity?", - field_70: "Which of these best describes person 6's working situation?", - field_71: "What is person 7's relationship to the lead tenant?", - field_72: "What is person 7's age?", - field_73: "Which of these best describes person 7's gender identity?", - field_74: "Which of these best describes person 7's working situation?", - field_75: "What is person 8's relationship to the lead tenant?", - field_76: "What is person 8's age?", - field_77: "Which of these best describes person 8's gender identity?", - field_78: "Which of these best describes person 8's working situation?", + field_46: "What is the lead tenant’s age?", + field_47: "Which of these best describes the lead tenant’s gender identity?", + field_48: "Which of these best describes the lead tenant’s ethnic background?", + field_49: "What is the lead tenant’s nationality?", + field_50: "Which of these best describes the lead tenant’s working situation?", + field_51: "What is person 2’s relationship to the lead tenant?", + field_52: "What is person 2’s age?", + field_53: "Which of these best describes person 2’s gender identity?", + field_54: "Which of these best describes person 2’s working situation?", + field_55: "What is person 3’s relationship to the lead tenant?", + field_56: "What is person 3’s age?", + field_57: "Which of these best describes person 3’s gender identity?", + field_58: "Which of these best describes person 3’s working situation?", + field_59: "What is person 4’s relationship to the lead tenant?", + field_60: "What is person 4’s age?", + field_61: "Which of these best describes person 4’s gender identity?", + field_62: "Which of these best describes person 4’s working situation?", + field_63: "What is person 5’s relationship to the lead tenant?", + field_64: "What is person 5’s age?", + field_65: "Which of these best describes person 5’s gender identity?", + field_66: "Which of these best describes person 5’s working situation?", + field_67: "What is person 6’s relationship to the lead tenant?", + field_68: "What is person 6’s age?", + field_69: "Which of these best describes person 6’s gender identity?", + field_70: "Which of these best describes person 6’s working situation?", + field_71: "What is person 7’s relationship to the lead tenant?", + field_72: "What is person 7’s age?", + field_73: "Which of these best describes person 7’s gender identity?", + field_74: "Which of these best describes person 7’s working situation?", + field_75: "What is person 8’s relationship to the lead tenant?", + field_76: "What is person 8’s age?", + field_77: "Which of these best describes person 8’s gender identity?", + field_78: "Which of these best describes person 8’s working situation?", field_79: "Does anybody in the household have links to the UK armed forces?", field_80: "Is this person still serving in the UK armed forces?", field_81: "Was this person seriously injured or ill as a result of serving in the UK armed forces?", @@ -94,41 +94,41 @@ class BulkUpload::Lettings::Year2023::RowParser field_87: "Does anybody in the household have any disabled access needs?", field_88: "Does anybody in the household have any disabled access needs?", field_89: "Does anybody in the household have a physical or mental health condition (or other illness) expected to last 12 months or more?", - field_90: "Does this person's condition affect their dexterity?", - field_91: "Does this person's condition affect their learning or understanding or concentrating?", - field_92: "Does this person's condition affect their hearing?", - field_93: "Does this person's condition affect their memory?", - field_94: "Does this person's condition affect their mental health?", - field_95: "Does this person's condition affect their mobility?", - field_96: "Does this person's condition affect them socially or behaviourally?", - field_97: "Does this person's condition affect their stamina or breathing or fatigue?", - field_98: "Does this person's condition affect their vision?", - field_99: "Does this person's condition affect them in another way?", + field_90: "Does this person’s condition affect their dexterity?", + field_91: "Does this person’s condition affect their learning or understanding or concentrating?", + field_92: "Does this person’s condition affect their hearing?", + field_93: "Does this person’s condition affect their memory?", + field_94: "Does this person’s condition affect their mental health?", + field_95: "Does this person’s condition affect their mobility?", + field_96: "Does this person’s condition affect them socially or behaviourally?", + field_97: "Does this person’s condition affect their stamina or breathing or fatigue?", + field_98: "Does this person’s condition affect their vision?", + field_99: "Does this person’s condition affect them in another way?", field_100: "How long has the household continuously lived in the local authority area of the new letting?", field_101: "How long has the household been on the local authority waiting list for the new letting?", field_102: "What is the tenant’s main reason for the household leaving their last settled home?", field_103: "If 'Other', what was the main reason for leaving their last settled home?", field_104: "Where was the household immediately before this letting?", field_105: "Did the household experience homelessness immediately before this letting?", - field_106: "Do you know the postcode of the household's last settled home?", - field_107: "What is the postcode of the household's last settled home?", - field_108: "What is the postcode of the household's last settled home?", - field_109: "What is the local authority of the household's last settled home?", + field_106: "Do you know the postcode of the household’s last settled home?", + field_107: "What is the postcode of the household’s last settled home?", + field_108: "What is the postcode of the household’s last settled home?", + field_109: "What is the local authority of the household’s last settled home?", field_110: "Was the household given 'reasonable preference' by the local authority?", - field_111: "Reasonable preference reason They were homeless or about to lose their home (within 56 days)", - field_112: "Reasonable preference reason They were living in insanitary, overcrowded or unsatisfactory housing", - field_113: "Reasonable preference reason They needed to move on medical and welfare reasons (including disability)", - field_114: "Reasonable preference reason They needed to move to avoid hardship to themselves or others", - field_115: "Reasonable preference reason Don't know", + field_111: "Reasonable preference reason - They were homeless or about to lose their home (within 56 days)", + field_112: "Reasonable preference reason - They were living in insanitary, overcrowded or unsatisfactory housing", + field_113: "Reasonable preference reason - They needed to move on medical and welfare reasons (including disability)", + field_114: "Reasonable preference reason - They needed to move to avoid hardship to themselves or others", + field_115: "Reasonable preference reason - Don’t know", field_116: "Was the letting made under the Choice-Based Lettings (CBL)?", field_117: "Was the letting made under the Common Allocation Policy (CAP)?", field_118: "Was the letting made under the Common Housing Register (CHR)?", field_119: "What was the source of referral for this letting?", - field_120: "Do you know the household's combined total income after tax?", + field_120: "Do you know the household’s combined total income after tax?", field_121: "How often does the household receive income?", field_122: "How much income does the household have in total?", field_123: "Is the tenant likely to be receiving any of these housing-related benefits?", - field_124: "How much of the household's income is from Universal Credit, state pensions or benefits?", + field_124: "How much of the household’s income is from Universal Credit, state pensions or benefits?", field_125: "Does the household pay rent or other charges for the accommodation?", field_126: "How often does the household pay rent and other charges?", field_127: "If this is a care home, how much does the household pay every [time period]?", diff --git a/app/services/bulk_upload/lettings/year2024/row_parser.rb b/app/services/bulk_upload/lettings/year2024/row_parser.rb index b27e078d0..5f253bdf9 100644 --- a/app/services/bulk_upload/lettings/year2024/row_parser.rb +++ b/app/services/bulk_upload/lettings/year2024/row_parser.rb @@ -24,9 +24,9 @@ class BulkUpload::Lettings::Year2024::RowParser field_18: "Address line 2", field_19: "Town or city", field_20: "County", - field_21: "Part 1 of the property's postcode", - field_22: "Part 2 of the property's postcode", - field_23: "What is the property's local authority?", + field_21: "Part 1 of the property’s postcode", + field_22: "Part 2 of the property’s postcode", + field_23: "What is the property’s local authority?", field_25: "What type was the property most recently let as?", field_24: "What is the reason for the property being vacant?", field_26: "What type of unit is the property?", @@ -46,39 +46,39 @@ class BulkUpload::Lettings::Year2024::RowParser field_40: "What is the length of the fixed-term tenancy to the nearest year?", field_41: "Is this letting sheltered accommodation?", field_15: "Has tenant seen the MHCLG privacy notice?", - field_42: "What is the lead tenant's age?", - field_43: "Which of these best describes the lead tenant's gender identity?", - field_44: "Which of these best describes the lead tenant's ethnic background?", - field_45: "What is the lead tenant's nationality?", - field_46: "Which of these best describes the lead tenant's working situation?", - field_47: "What is person 2's relationship to the lead tenant?", - field_48: "What is person 2's age?", - field_49: "Which of these best describes person 2's gender identity?", - field_50: "Which of these best describes person 2's working situation?", - field_51: "What is person 3's relationship to the lead tenant?", - field_52: "What is person 3's age?", - field_53: "Which of these best describes person 3's gender identity?", - field_54: "Which of these best describes person 3's working situation?", - field_55: "What is person 4's relationship to the lead tenant?", - field_56: "What is person 4's age?", - field_57: "Which of these best describes person 4's gender identity?", - field_58: "Which of these best describes person 4's working situation?", - field_59: "What is person 5's relationship to the lead tenant?", - field_60: "What is person 5's age?", - field_61: "Which of these best describes person 5's gender identity?", - field_62: "Which of these best describes person 5's working situation?", - field_63: "What is person 6's relationship to the lead tenant?", - field_64: "What is person 6's age?", - field_65: "Which of these best describes person 6's gender identity?", - field_66: "Which of these best describes person 6's working situation?", - field_67: "What is person 7's relationship to the lead tenant?", - field_68: "What is person 7's age?", - field_69: "Which of these best describes person 7's gender identity?", - field_70: "Which of these best describes person 7's working situation?", - field_71: "What is person 8's relationship to the lead tenant?", - field_72: "What is person 8's age?", - field_73: "Which of these best describes person 8's gender identity?", - field_74: "Which of these best describes person 8's working situation?", + field_42: "What is the lead tenant’s age?", + field_43: "Which of these best describes the lead tenant’s gender identity?", + field_44: "Which of these best describes the lead tenant’s ethnic background?", + field_45: "What is the lead tenant’s nationality?", + field_46: "Which of these best describes the lead tenant’s working situation?", + field_47: "What is person 2’s relationship to the lead tenant?", + field_48: "What is person 2’s age?", + field_49: "Which of these best describes person 2’s gender identity?", + field_50: "Which of these best describes person 2’s working situation?", + field_51: "What is person 3’s relationship to the lead tenant?", + field_52: "What is person 3’s age?", + field_53: "Which of these best describes person 3’s gender identity?", + field_54: "Which of these best describes person 3’s working situation?", + field_55: "What is person 4’s relationship to the lead tenant?", + field_56: "What is person 4’s age?", + field_57: "Which of these best describes person 4’s gender identity?", + field_58: "Which of these best describes person 4’s working situation?", + field_59: "What is person 5’s relationship to the lead tenant?", + field_60: "What is person 5’s age?", + field_61: "Which of these best describes person 5’s gender identity?", + field_62: "Which of these best describes person 5’s working situation?", + field_63: "What is person 6’s relationship to the lead tenant?", + field_64: "What is person 6’s age?", + field_65: "Which of these best describes person 6’s gender identity?", + field_66: "Which of these best describes person 6’s working situation?", + field_67: "What is person 7’s relationship to the lead tenant?", + field_68: "What is person 7’s age?", + field_69: "Which of these best describes person 7’s gender identity?", + field_70: "Which of these best describes person 7’s working situation?", + field_71: "What is person 8’s relationship to the lead tenant?", + field_72: "What is person 8’s age?", + field_73: "Which of these best describes person 8’s gender identity?", + field_74: "Which of these best describes person 8’s working situation?", field_75: "Does anybody in the household have links to the UK armed forces?", field_76: "Is this person still serving in the UK armed forces?", field_77: "Was this person seriously injured or ill as a result of serving in the UK armed forces?", @@ -90,42 +90,42 @@ class BulkUpload::Lettings::Year2024::RowParser field_83: "Does anybody in the household have any disabled access needs?", field_84: "Does anybody in the household have any disabled access needs?", field_85: "Does anybody in the household have a physical or mental health condition (or other illness) expected to last 12 months or more?", - field_86: "Does this person's condition affect their dexterity?", - field_87: "Does this person's condition affect their learning or understanding or concentrating?", - field_88: "Does this person's condition affect their hearing?", - field_89: "Does this person's condition affect their memory?", - field_90: "Does this person's condition affect their mental health?", - field_91: "Does this person's condition affect their mobility?", - field_92: "Does this person's condition affect them socially or behaviourally?", - field_93: "Does this person's condition affect their stamina or breathing or fatigue?", - field_94: "Does this person's condition affect their vision?", - field_95: "Does this person's condition affect them in another way?", + field_86: "Does this person’s condition affect their dexterity?", + field_87: "Does this person’s condition affect their learning or understanding or concentrating?", + field_88: "Does this person’s condition affect their hearing?", + field_89: "Does this person’s condition affect their memory?", + field_90: "Does this person’s condition affect their mental health?", + field_91: "Does this person’s condition affect their mobility?", + field_92: "Does this person’s condition affect them socially or behaviourally?", + field_93: "Does this person’s condition affect their stamina or breathing or fatigue?", + field_94: "Does this person’s condition affect their vision?", + field_95: "Does this person’s condition affect them in another way?", field_96: "How long has the household continuously lived in the local authority area of the new letting?", field_97: "How long has the household been on the local authority waiting list for the new letting?", field_98: "What is the tenant’s main reason for the household leaving their last settled home?", field_99: "If 'Other', what was the main reason for leaving their last settled home?", field_100: "Where was the household immediately before this letting?", field_101: "Did the household experience homelessness immediately before this letting?", - field_102: "Do you know the postcode of the household's last settled home?", - field_103: "What is the postcode of the household's last settled home?", - field_104: "What is the postcode of the household's last settled home?", - field_105: "What is the local authority of the household's last settled home?", + field_102: "Do you know the postcode of the household’s last settled home?", + field_103: "What is the postcode of the household’s last settled home?", + field_104: "What is the postcode of the household’s last settled home?", + field_105: "What is the local authority of the household’s last settled home?", field_106: "Was the household given 'reasonable preference' by the local authority?", - field_107: "Reasonable preference reason They were homeless or about to lose their home (within 56 days)", - field_108: "Reasonable preference reason They were living in insanitary, overcrowded or unsatisfactory housing", - field_109: "Reasonable preference reason They needed to move on medical and welfare reasons (including disability)", - field_110: "Reasonable preference reason They needed to move to avoid hardship to themselves or others", - field_111: "Reasonable preference reason Don't know", + field_107: "Reasonable preference reason - They were homeless or about to lose their home (within 56 days)", + field_108: "Reasonable preference reason - They were living in insanitary, overcrowded or unsatisfactory housing", + field_109: "Reasonable preference reason - They needed to move on medical and welfare reasons (including disability)", + field_110: "Reasonable preference reason - They needed to move to avoid hardship to themselves or others", + field_111: "Reasonable preference reason - Don’t know", field_112: "Was the letting made under the Choice-Based Lettings (CBL)?", field_113: "Was the letting made under the Common Allocation Policy (CAP)?", field_114: "Was the letting made under the Common Housing Register (CHR)?", field_115: "Was the letting made under the Accessible Register?", field_116: "What was the source of referral for this letting?", - field_117: "Do you know the household's combined total income after tax?", + field_117: "Do you know the household’s combined total income after tax?", field_118: "How often does the household receive income?", field_119: "How much income does the household have in total?", field_120: "Is the tenant likely to be receiving any of these housing-related benefits?", - field_121: "How much of the household's income is from Universal Credit, state pensions or benefits?", + field_121: "How much of the household’s income is from Universal Credit, state pensions or benefits?", field_122: "Does the household pay rent or other charges for the accommodation?", field_123: "How often does the household pay rent and other charges?", field_124: "If this is a care home, how much does the household pay every [time period]?", diff --git a/app/services/bulk_upload/lettings/year2025/row_parser.rb b/app/services/bulk_upload/lettings/year2025/row_parser.rb index b5aea0bcb..89dfac334 100644 --- a/app/services/bulk_upload/lettings/year2025/row_parser.rb +++ b/app/services/bulk_upload/lettings/year2025/row_parser.rb @@ -27,9 +27,9 @@ class BulkUpload::Lettings::Year2025::RowParser field_20: "Address line 2", field_21: "Town or city", field_22: "County", - field_23: "Part 1 of the property's postcode", - field_24: "Part 2 of the property's postcode", - field_25: "What is the property's local authority?", + field_23: "Part 1 of the property’s postcode", + field_24: "Part 2 of the property’s postcode", + field_25: "What is the property’s local authority?", field_26: "What type of unit is the property?", field_27: "Which type of building is the property?", field_28: "Is the property built or adapted to wheelchair-user standards?", @@ -46,39 +46,39 @@ class BulkUpload::Lettings::Year2025::RowParser field_39: "What is the type of tenancy?", field_40: "If 'Other', what is the type of tenancy?", field_41: "What is the length of the fixed-term tenancy to the nearest year?", - field_42: "What is the lead tenant's age?", - field_43: "Which of these best describes the lead tenant's gender identity?", - field_44: "Which of these best describes the lead tenant's ethnic background?", - field_45: "What is the lead tenant's nationality?", - field_46: "Which of these best describes the lead tenant's working situation?", + field_42: "What is the lead tenant’s age?", + field_43: "Which of these best describes the lead tenant’s gender identity?", + field_44: "Which of these best describes the lead tenant’s ethnic background?", + field_45: "What is the lead tenant’s nationality?", + field_46: "Which of these best describes the lead tenant’s working situation?", field_47: "Is person 2 the partner of the lead tenant?", - field_48: "What is person 2's age?", - field_49: "Which of these best describes person 2's gender identity?", - field_50: "Which of these best describes person 2's working situation?", + field_48: "What is person 2’s age?", + field_49: "Which of these best describes person 2’s gender identity?", + field_50: "Which of these best describes person 2’s working situation?", field_51: "Is person 3 the partner of the lead tenant?", - field_52: "What is person 3's age?", - field_53: "Which of these best describes person 3's gender identity?", - field_54: "Which of these best describes person 3's working situation?", + field_52: "What is person 3’s age?", + field_53: "Which of these best describes person 3’s gender identity?", + field_54: "Which of these best describes person 3’s working situation?", field_55: "Is person 4 the partner of the lead tenant?", - field_56: "What is person 4's age?", - field_57: "Which of these best describes person 4's gender identity?", - field_58: "Which of these best describes person 4's working situation?", + field_56: "What is person 4’s age?", + field_57: "Which of these best describes person 4’s gender identity?", + field_58: "Which of these best describes person 4’s working situation?", field_59: "Is person 5 the partner of the lead tenant?", - field_60: "What is person 5's age?", - field_61: "Which of these best describes person 5's gender identity?", - field_62: "Which of these best describes person 5's working situation?", + field_60: "What is person 5’s age?", + field_61: "Which of these best describes person 5’s gender identity?", + field_62: "Which of these best describes person 5’s working situation?", field_63: "Is person 6 the partner of the lead tenant?", - field_64: "What is person 6's age?", - field_65: "Which of these best describes person 6's gender identity?", - field_66: "Which of these best describes person 6's working situation?", + field_64: "What is person 6’s age?", + field_65: "Which of these best describes person 6’s gender identity?", + field_66: "Which of these best describes person 6’s working situation?", field_67: "Is person 7 the partner of the lead tenant?", - field_68: "What is person 7's age?", - field_69: "Which of these best describes person 7's gender identity?", - field_70: "Which of these best describes person 7's working situation?", + field_68: "What is person 7’s age?", + field_69: "Which of these best describes person 7’s gender identity?", + field_70: "Which of these best describes person 7’s working situation?", field_71: "Is person 8 the partner of the lead tenant?", - field_72: "What is person 8's age?", - field_73: "Which of these best describes person 8's gender identity?", - field_74: "Which of these best describes person 8's working situation?", + field_72: "What is person 8’s age?", + field_73: "Which of these best describes person 8’s gender identity?", + field_74: "Which of these best describes person 8’s working situation?", field_75: "Does anybody in the household have links to the UK armed forces?", field_76: "Is this person still serving in the UK armed forces?", field_77: "Was this person seriously injured or ill as a result of serving in the UK armed forces?", @@ -90,42 +90,42 @@ class BulkUpload::Lettings::Year2025::RowParser field_83: "Does anybody in the household have any disabled access needs?", field_84: "Does anybody in the household have any disabled access needs?", field_85: "Does anybody in the household have a physical or mental health condition (or other illness) expected to last 12 months or more?", - field_86: "Does this person's condition affect their dexterity?", - field_87: "Does this person's condition affect their learning or understanding or concentrating?", - field_88: "Does this person's condition affect their hearing?", - field_89: "Does this person's condition affect their memory?", - field_90: "Does this person's condition affect their mental health?", - field_91: "Does this person's condition affect their mobility?", - field_92: "Does this person's condition affect them socially or behaviourally?", - field_93: "Does this person's condition affect their stamina or breathing or fatigue?", - field_94: "Does this person's condition affect their vision?", - field_95: "Does this person's condition affect them in another way?", + field_86: "Does this person’s condition affect their dexterity?", + field_87: "Does this person’s condition affect their learning or understanding or concentrating?", + field_88: "Does this person’s condition affect their hearing?", + field_89: "Does this person’s condition affect their memory?", + field_90: "Does this person’s condition affect their mental health?", + field_91: "Does this person’s condition affect their mobility?", + field_92: "Does this person’s condition affect them socially or behaviourally?", + field_93: "Does this person’s condition affect their stamina or breathing or fatigue?", + field_94: "Does this person’s condition affect their vision?", + field_95: "Does this person’s condition affect them in another way?", field_96: "How long has the household continuously lived in the local authority area of the new letting?", field_97: "How long has the household been on the local authority waiting list for the new letting?", field_98: "What is the tenant’s main reason for the household leaving their last settled home?", field_99: "If 'Other', what was the main reason for leaving their last settled home?", field_100: "Where was the household immediately before this letting?", field_101: "Did the household experience homelessness immediately before this letting?", - field_102: "Do you know the postcode of the household's last settled home?", - field_103: "What is the postcode of the household's last settled home?", - field_104: "What is the postcode of the household's last settled home?", - field_105: "What is the local authority of the household's last settled home?", + field_102: "Do you know the postcode of the household’s last settled home?", + field_103: "What is the postcode of the household’s last settled home?", + field_104: "What is the postcode of the household’s last settled home?", + field_105: "What is the local authority of the household’s last settled home?", field_106: "Was the household given 'reasonable preference' by the local authority?", - field_107: "Reasonable preference reason They were homeless or about to lose their home (within 56 days)", - field_108: "Reasonable preference reason They were living in insanitary, overcrowded or unsatisfactory housing", - field_109: "Reasonable preference reason They needed to move on medical and welfare reasons (including disability)", - field_110: "Reasonable preference reason They needed to move to avoid hardship to themselves or others", - field_111: "Reasonable preference reason Don't know", + field_107: "Reasonable preference reason - They were homeless or about to lose their home (within 56 days)", + field_108: "Reasonable preference reason - They were living in insanitary, overcrowded or unsatisfactory housing", + field_109: "Reasonable preference reason - They needed to move on medical and welfare reasons (including disability)", + field_110: "Reasonable preference reason - They needed to move to avoid hardship to themselves or others", + field_111: "Reasonable preference reason - Don’t know", field_112: "Was the letting made under the Choice-Based Lettings (CBL)?", field_113: "Was the letting made under the Common Allocation Policy (CAP)?", field_114: "Was the letting made under the Common Housing Register (CHR)?", field_115: "Was the letting made under the Accessible Register?", field_116: "What was the source of referral for this letting?", - field_117: "Do you know the household's combined total income after tax?", + field_117: "Do you know the household’s combined total income after tax?", field_118: "How often does the household receive income?", field_119: "How much income does the household have in total?", field_120: "Is the tenant likely to be receiving any of these housing-related benefits?", - field_121: "How much of the household's income is from Universal Credit, state pensions or benefits?", + field_121: "How much of the household’s income is from Universal Credit, state pensions or benefits?", field_122: "Does the household pay rent or other charges for the accommodation?", field_123: "How often does the household pay rent and other charges?", field_124: "What is the basic rent?", diff --git a/app/services/bulk_upload/sales/year2023/row_parser.rb b/app/services/bulk_upload/sales/year2023/row_parser.rb index 39fb41d6b..ddcf18b6a 100644 --- a/app/services/bulk_upload/sales/year2023/row_parser.rb +++ b/app/services/bulk_upload/sales/year2023/row_parser.rb @@ -16,7 +16,7 @@ class BulkUpload::Sales::Year2023::RowParser field_9: "What is the type of discounted ownership sale?", field_10: "What is the type of outright sale?", - field_11: "If 'other', what is the 'other' type?", + field_11: "If 'Other', what is the 'Other' type?", field_12: "Is the buyer a company?", field_13: "Will the buyers live in the property?", field_14: "Is this a joint purchase?", @@ -24,7 +24,7 @@ class BulkUpload::Sales::Year2023::RowParser field_16: "How many bedrooms does the property have?", field_17: "What type of unit is the property?", field_18: "Which type of bulding is the property?", - field_19: "If known, enter this property's UPRN", + field_19: "If known, enter this property’s UPRN", field_20: "Address line 1", field_21: "Address line 2", @@ -39,19 +39,19 @@ class BulkUpload::Sales::Year2023::RowParser field_30: "Age of buyer 1", field_31: "Gender identity of buyer 1", - field_32: "What is buyer 1's ethnic group?", - field_33: "What is buyer 1's nationality?", - field_34: "If 'Any other country', what is buyer 1's nationality?", + field_32: "What is buyer 1’s ethnic group?", + field_33: "What is buyer 1’s nationality?", + field_34: "If 'Any other country', what is buyer 1’s nationality?", field_35: "Working situation of buyer 1", field_36: "Will buyer 1 live in the property?", field_37: "Relationship to buyer 1 for person 2", field_38: "Age of person 2", field_39: "Gender identity of person 2", - field_40: "Which of the following best describes buyer 2's ethnic background?", + field_40: "Which of the following best describes buyer 2’s ethnic background?", - field_41: "What is buyer 2's nationality?", - field_42: "If 'Any other country', what is buyer 2's nationality?", - field_43: "What is buyer 2 or person 2's working situation?", + field_41: "What is buyer 2’s nationality?", + field_42: "If 'Any other country', what is buyer 2’s nationality?", + field_43: "What is buyer 2 or person 2’s working situation?", field_44: "Will buyer 2 live in the property?", field_45: "Besides the buyers, how many people will live in the property?", field_46: "Relationship to buyer 1 for person 3", @@ -72,28 +72,28 @@ class BulkUpload::Sales::Year2023::RowParser field_60: "Gender identity of person 6", field_61: "Working situation of person 6", - field_62: "What was buyer 1's previous tenure?", - field_63: "Do you know the postcode of buyer 1's last settled home?", - field_64: "Part 1 of postcode of buyer 1's last settled home", - field_65: "Part 2 of postcode of buyer 1's last settled home", - field_66: "What is the local authority of buyer 1's last settled home?", + field_62: "What was buyer 1’s previous tenure?", + field_63: "Do you know the postcode of buyer 1’s last settled home?", + field_64: "Part 1 of postcode of buyer 1’s last settled home", + field_65: "Part 2 of postcode of buyer 1’s last settled home", + field_66: "What is the local authority of buyer 1’s last settled home?", field_67: "Was the buyer registered with their PRP (HA)?", field_68: "Was the buyer registered with another PRP (HA)?", field_69: "Was the buyer registered with the local authority?", field_70: "Was the buyer registered with a Help to Buy agent?", field_71: "At the time of purchase, was buyer 2 living at the same address as buyer 1?", - field_72: "What was buyer 2's previous tenure?", + field_72: "What was buyer 2’s previous tenure?", field_73: "Has the buyer ever served in the UK Armed Forces and for how long?", field_74: "Is the buyer still serving in the UK armed forces?", field_75: "Are any of the buyers a spouse or civil partner of a UK Armed Forces regular who died in service within the last 2 years?", field_76: "Does anyone in the household consider themselves to have a disability?", field_77: "Does anyone in the household use a wheelchair?", - field_78: "What is buyer 1's gross annual income?", - field_79: "Was buyer 1's income used for a mortgage application?", - field_80: "What is buyer 2's gross annual income?", + field_78: "What is buyer 1’s gross annual income?", + field_79: "Was buyer 1’s income used for a mortgage application?", + field_80: "What is buyer 2’s gross annual income?", - field_81: "Was buyer 2's income used for a mortgage application?", + field_81: "Was buyer 2’s income used for a mortgage application?", field_82: "Were the buyers receiving any of these housing-related benefits immediately before buying this property?", field_83: "What is the total amount the buyers had in savings before they paid any deposit for the property?", field_84: "Have any of the purchasers previously owned a property?", @@ -113,16 +113,16 @@ class BulkUpload::Sales::Year2023::RowParser field_97: "What is the year of the practical completion or handover date?", field_98: "Was the household re-housed under a local authority nominations agreement?", field_99: "Was the buyer a private registered provider, housing association or local authority tenant immediately before this sale?", - field_100: "How many bedrooms did the buyer's previous property have?", + field_100: "How many bedrooms did the buyer’s previous property have?", - field_101: "What was the type of the buyer's previous property?", - field_102: "What was the rent type of the buyer's previous property?", + field_101: "What was the type of the buyer’s previous property?", + field_102: "What was the rent type of the buyer’s previous property?", field_103: "What was the full purchase price?", field_104: "What was the initial percentage equity stake purchased?", field_105: "Was a mortgage used for the purchase of this property? - Shared ownership", field_106: "What is the mortgage amount?", field_107: "What is the name of the mortgage lender? - Shared ownership", - field_108: "If 'other', what is the name of the mortgage lender?", + field_108: "If 'Other', what is the name of the mortgage lender?", field_109: "What is the length of the mortgage in years? - Shared ownership", field_110: "Does this include any extra borrowing?", @@ -138,7 +138,7 @@ class BulkUpload::Sales::Year2023::RowParser field_120: "What is the mortgage amount?", field_121: "What is the name of the mortgage lender? - Discounted ownership", - field_122: "If 'other', what is the name of the mortgage lender?", + field_122: "If 'Other', what is the name of the mortgage lender?", field_123: "What is the length of the mortgage in years? - Discounted ownership", field_124: "Does this include any extra borrowing?", field_125: "How much was the cash deposit paid on the property?", @@ -148,7 +148,7 @@ class BulkUpload::Sales::Year2023::RowParser field_129: "What is the mortgage amount?", field_130: "What is the name of the mortgage lender? - Outright sale", - field_131: "If 'other', what is the name of the mortgage lender?", + field_131: "If 'Other', what is the name of the mortgage lender?", field_132: "What is the length of the mortgage in years? - Outright sale", field_133: "Does this include any extra borrowing?", field_134: "How much was the cash deposit paid on the property?", diff --git a/app/services/bulk_upload/sales/year2024/row_parser.rb b/app/services/bulk_upload/sales/year2024/row_parser.rb index a613a118c..a1b214182 100644 --- a/app/services/bulk_upload/sales/year2024/row_parser.rb +++ b/app/services/bulk_upload/sales/year2024/row_parser.rb @@ -17,7 +17,7 @@ class BulkUpload::Sales::Year2024::RowParser field_10: "What is the type of discounted ownership sale?", field_11: "What is the type of outright sale?", - field_12: "If 'other', what is the 'other' type?", + field_12: "If 'Other', what is the 'Other' type?", field_13: "Is the buyer a company?", field_14: "Will the buyers live in the property?", field_15: "Is this a joint purchase?", @@ -27,7 +27,7 @@ class BulkUpload::Sales::Year2024::RowParser field_19: "How many bedrooms does the property have?", field_20: "What type of unit is the property?", field_21: "Which type of bulding is the property?", - field_22: "If known, enter this property's UPRN", + field_22: "If known, enter this property’s UPRN", field_23: "Address line 1", field_24: "Address line 2", @@ -40,17 +40,17 @@ class BulkUpload::Sales::Year2024::RowParser field_31: "Age of buyer 1", field_32: "Gender identity of buyer 1", - field_33: "What is buyer 1's ethnic group?", - field_34: "What is buyer 1's nationality?", + field_33: "What is buyer 1’s ethnic group?", + field_34: "What is buyer 1’s nationality?", field_35: "Working situation of buyer 1", field_36: "Will buyer 1 live in the property?", field_37: "Relationship to buyer 1 for person 2", field_38: "Age of person 2", field_39: "Gender identity of person 2", - field_40: "Which of the following best describes buyer 2's ethnic background?", + field_40: "Which of the following best describes buyer 2’s ethnic background?", - field_41: "What is buyer 2's nationality?", - field_42: "What is buyer 2 or person 2's working situation?", + field_41: "What is buyer 2’s nationality?", + field_42: "What is buyer 2 or person 2’s working situation?", field_43: "Will buyer 2 live in the property?", field_44: "Besides the buyers, how many people will live in the property?", field_45: "Relationship to buyer 1 for person 3", @@ -71,28 +71,28 @@ class BulkUpload::Sales::Year2024::RowParser field_59: "Gender identity of person 6", field_60: "Working situation of person 6", - field_61: "What was buyer 1's previous tenure?", - field_62: "Do you know the postcode of buyer 1's last settled home?", - field_63: "Part 1 of postcode of buyer 1's last settled home", - field_64: "Part 2 of postcode of buyer 1's last settled home", - field_65: "What is the local authority of buyer 1's last settled home?", + field_61: "What was buyer 1’s previous tenure?", + field_62: "Do you know the postcode of buyer 1’s last settled home?", + field_63: "Part 1 of postcode of buyer 1’s last settled home", + field_64: "Part 2 of postcode of buyer 1’s last settled home", + field_65: "What is the local authority of buyer 1’s last settled home?", field_66: "Was the buyer registered with their PRP (HA)?", field_67: "Was the buyer registered with another PRP (HA)?", field_68: "Was the buyer registered with the local authority?", field_69: "Was the buyer registered with a Help to Buy agent?", field_70: "At the time of purchase, was buyer 2 living at the same address as buyer 1?", - field_71: "What was buyer 2's previous tenure?", + field_71: "What was buyer 2’s previous tenure?", field_72: "Has the buyer ever served in the UK Armed Forces and for how long?", field_73: "Is the buyer still serving in the UK armed forces?", field_74: "Are any of the buyers a spouse or civil partner of a UK Armed Forces regular who died in service within the last 2 years?", field_75: "Does anyone in the household consider themselves to have a disability?", field_76: "Does anyone in the household use a wheelchair?", - field_77: "What is buyer 1's gross annual income?", - field_78: "Was buyer 1's income used for a mortgage application?", - field_79: "What is buyer 2's gross annual income?", + field_77: "What is buyer 1’s gross annual income?", + field_78: "Was buyer 1’s income used for a mortgage application?", + field_79: "What is buyer 2’s gross annual income?", - field_80: "Was buyer 2's income used for a mortgage application?", + field_80: "Was buyer 2’s income used for a mortgage application?", field_81: "Were the buyers receiving any of these housing-related benefits immediately before buying this property?", field_82: "What is the total amount the buyers had in savings before they paid any deposit for the property?", field_83: "Have any of the purchasers previously owned a property?", @@ -111,16 +111,16 @@ class BulkUpload::Sales::Year2024::RowParser field_95: "What is the month of the practical completion or handover date?", field_96: "What is the year of the practical completion or handover date?", field_97: "Was the household re-housed under a local authority nominations agreement?", - field_98: "How many bedrooms did the buyer's previous property have?", + field_98: "How many bedrooms did the buyer’s previous property have?", - field_99: "What was the type of the buyer's previous property?", - field_100: "What was the rent type of the buyer's previous property?", + field_99: "What was the type of the buyer’s previous property?", + field_100: "What was the rent type of the buyer’s previous property?", field_101: "What was the full purchase price?", field_102: "What was the initial percentage equity stake purchased?", field_103: "Was a mortgage used for the purchase of this property? - Shared ownership", field_104: "What is the mortgage amount?", field_105: "What is the name of the mortgage lender? - Shared ownership", - field_106: "If 'other', what is the name of the mortgage lender?", + field_106: "If 'Other', what is the name of the mortgage lender?", field_107: "What is the length of the mortgage in years? - Shared ownership", field_108: "Does this include any extra borrowing?", @@ -136,7 +136,7 @@ class BulkUpload::Sales::Year2024::RowParser field_118: "What is the mortgage amount?", field_119: "What is the name of the mortgage lender? - Discounted ownership", - field_120: "If 'other', what is the name of the mortgage lender?", + field_120: "If 'Other', what is the name of the mortgage lender?", field_121: "What is the length of the mortgage in years? - Discounted ownership", field_122: "Does this include any extra borrowing?", field_123: "How much was the cash deposit paid on the property?", diff --git a/app/services/bulk_upload/sales/year2025/row_parser.rb b/app/services/bulk_upload/sales/year2025/row_parser.rb index 886b3e928..d4be45910 100644 --- a/app/services/bulk_upload/sales/year2025/row_parser.rb +++ b/app/services/bulk_upload/sales/year2025/row_parser.rb @@ -21,7 +21,7 @@ class BulkUpload::Sales::Year2025::RowParser field_14: "Was the buyer interviewed for any of the answers you will provide on this log?", field_15: "Data Protection question", - field_16: "If known, enter this property's UPRN", + field_16: "If known, enter this property’s UPRN", field_17: "Address line 1", field_18: "Address line 2", field_19: "Town or city", @@ -36,16 +36,16 @@ class BulkUpload::Sales::Year2025::RowParser field_28: "Age of buyer 1", field_29: "Gender identity of buyer 1", - field_30: "What is buyer 1's ethnic group?", - field_31: "What is buyer 1's nationality?", + field_30: "What is buyer 1’s ethnic group?", + field_31: "What is buyer 1’s nationality?", field_32: "Working situation of buyer 1", field_33: "Will buyer 1 live in the property?", field_34: "Is buyer 2 or person 2 the partner of buyer 1?", field_35: "Age of person 2", field_36: "Gender identity of person 2", - field_37: "Which of the following best describes buyer 2's ethnic background?", - field_38: "What is buyer 2's nationality?", - field_39: "What is buyer 2 or person 2's working situation?", + field_37: "Which of the following best describes buyer 2’s ethnic background?", + field_38: "What is buyer 2’s nationality?", + field_39: "What is buyer 2 or person 2’s working situation?", field_40: "Will buyer 2 live in the property?", field_41: "Besides the buyers, how many people will live in the property?", @@ -66,13 +66,13 @@ class BulkUpload::Sales::Year2025::RowParser field_56: "Gender identity of person 6", field_57: "Working situation of person 6", - field_58: "What was buyer 1's previous tenure?", - field_59: "Do you know the postcode of buyer 1's last settled home?", - field_60: "Part 1 of postcode of buyer 1's last settled home", - field_61: "Part 2 of postcode of buyer 1's last settled home", - field_62: "What is the local authority of buyer 1's last settled home?", + field_58: "What was buyer 1’s previous tenure?", + field_59: "Do you know the postcode of buyer 1’s last settled home?", + field_60: "Part 1 of postcode of buyer 1’s last settled home", + field_61: "Part 2 of postcode of buyer 1’s last settled home", + field_62: "What is the local authority of buyer 1’s last settled home?", field_63: "At the time of purchase, was buyer 2 living at the same address as buyer 1?", - field_64: "What was buyer 2's previous tenure?", + field_64: "What was buyer 2’s previous tenure?", field_65: "Has the buyer ever served in the UK Armed Forces and for how long?", field_66: "Is the buyer still serving in the UK armed forces?", @@ -80,10 +80,10 @@ class BulkUpload::Sales::Year2025::RowParser field_68: "Does anyone in the household consider themselves to have a disability?", field_69: "Does anyone in the household use a wheelchair?", - field_70: "What is buyer 1's gross annual income?", - field_71: "Was buyer 1's income used for a mortgage application?", - field_72: "What is buyer 2's gross annual income?", - field_73: "Was buyer 2's income used for a mortgage application?", + field_70: "What is buyer 1’s gross annual income?", + field_71: "Was buyer 1’s income used for a mortgage application?", + field_72: "What is buyer 2’s gross annual income?", + field_73: "Was buyer 2’s income used for a mortgage application?", field_74: "Were the buyers receiving any of these housing-related benefits immediately before buying this property?", field_75: "What is the total amount the buyers had in savings before they paid any deposit for the property?", field_76: "Have any of the purchasers previously owned a property?", @@ -94,9 +94,9 @@ class BulkUpload::Sales::Year2025::RowParser field_80: "What is the day of the practical completion or handover date?", field_81: "What is the month of the practical completion or handover date?", field_82: "What is the year of the practical completion or handover date?", - field_83: "How many bedrooms did the buyer's previous property have?", - field_84: "What was the type of the buyer's previous property?", - field_85: "What was the rent type of the buyer's previous property?", + field_83: "How many bedrooms did the buyer’s previous property have?", + field_84: "What was the type of the buyer’s previous property?", + field_85: "What was the rent type of the buyer’s previous property?", field_86: "What was the full purchase price?", field_87: "What was the initial percentage share purchased?", field_88: "Was a mortgage used for the purchase of this property? - Shared ownership", diff --git a/config/locales/en.yml b/config/locales/en.yml index 3e35a32ce..086a26923 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -423,7 +423,7 @@ en: warnings: organisation: - deactivate: "All schemes and users at this organisation will be deactivated. All the organisation's relationships will be removed. It will no longer be possible to create logs for this organisation." + deactivate: "All schemes and users at this organisation will be deactivated. All the organisation’s relationships will be removed. It will no longer be possible to create logs for this organisation." reactivate: "All schemes, users, and relationships that were active when this organisation was deactivated will be reactivated." location: deactivate: diff --git a/config/locales/forms/2023/lettings/guidance.en.yml b/config/locales/forms/2023/lettings/guidance.en.yml index 1ce7e8a0c..326d37dba 100644 --- a/config/locales/forms/2023/lettings/guidance.en.yml +++ b/config/locales/forms/2023/lettings/guidance.en.yml @@ -14,7 +14,7 @@ en:

If your organisation’s schemes were migrated from old CORE, they may have new names and codes. Search by postcode to find your scheme.

" scheme_changes_link_text: "Read more about how schemes have changed" view_schemes_link_text: "View your organisation’s schemes" - + privacy_notice_tenant: content: "Make sure the tenant has seen %{privacy_notice_link} before completing this log." privacy_notice_link_text: "the Ministry of Housing, Communities and Local Government (MHCLG) privacy notice" @@ -39,7 +39,7 @@ en: title: "What is a void date?" content: "

Date the property was (legally or contractually) available to let, or for:

" \ No newline at end of file + " diff --git a/config/locales/forms/2023/lettings/household_characteristics.en.yml b/config/locales/forms/2023/lettings/household_characteristics.en.yml index 09db802f5..274c2528d 100644 --- a/config/locales/forms/2023/lettings/household_characteristics.en.yml +++ b/config/locales/forms/2023/lettings/household_characteristics.en.yml @@ -20,8 +20,8 @@ en: age1: page_header: "" age1_known: - check_answer_label: "Lead tenant's age" - check_answer_prompt: "Enter lead tenant's age if known" + check_answer_label: "Lead tenant’s age" + check_answer_prompt: "Enter lead tenant’s age if known" 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: @@ -93,7 +93,7 @@ en: details_known_2: page_header: "You’ve given us the details for 1 person in the household" check_answer_label: "Details known for person 2" - check_answer_prompt: "Tell us if you know person 2's details" + check_answer_prompt: "Tell us if you know person 2’s details" hint_text: "You must provide details for everyone in the household if you know them." question_text: "Do you know details for person 2?" @@ -108,7 +108,7 @@ en: page_header: "" age2_known: check_answer_label: "Person 2’s age" - check_answer_prompt: "Enter person 2's age if known" + check_answer_prompt: "Enter person 2’s age if known" hint_text: "" question_text: "Do you know person 2’s age?" age2: @@ -134,7 +134,7 @@ en: details_known_3: page_header: "You’ve given us the details for 2 people in the household" check_answer_label: "Details known for person 3" - check_answer_prompt: "Tell us if you know person 3's details" + check_answer_prompt: "Tell us if you know person 3’s details" hint_text: "You must provide details for everyone in the household if you know them." question_text: "Do you know details for person 3?" @@ -149,7 +149,7 @@ en: page_header: "" age3_known: check_answer_label: "Person 3’s age" - check_answer_prompt: "Enter person 3's age if known" + check_answer_prompt: "Enter person 3’s age if known" hint_text: "" question_text: "Do you know person 3’s age?" age3: @@ -175,7 +175,7 @@ en: details_known_4: page_header: "You’ve given us the details for 3 people in the household" check_answer_label: "Details known for person 4" - check_answer_prompt: "Tell us if you know person 4's details" + check_answer_prompt: "Tell us if you know person 4’s details" hint_text: "You must provide details for everyone in the household if you know them." question_text: "Do you know details for person 4?" @@ -190,7 +190,7 @@ en: page_header: "" age4_known: check_answer_label: "Person 4’s age" - check_answer_prompt: "Enter person 4's age if known" + check_answer_prompt: "Enter person 4’s age if known" hint_text: "" question_text: "Do you know person 4’s age?" age4: @@ -216,7 +216,7 @@ en: details_known_5: page_header: "You’ve given us the details for 4 people in the household" check_answer_label: "Details known for person 5" - check_answer_prompt: "Tell us if you know person 5's details" + check_answer_prompt: "Tell us if you know person 5’s details" hint_text: "You must provide details for everyone in the household if you know them." question_text: "Do you know details for person 5?" @@ -231,7 +231,7 @@ en: page_header: "" age5_known: check_answer_label: "Person 5’s age" - check_answer_prompt: "Enter person 5's age if known" + check_answer_prompt: "Enter person 5’s age if known" hint_text: "" question_text: "Do you know person 5’s age?" age5: @@ -257,7 +257,7 @@ en: details_known_6: page_header: "You’ve given us the details for 5 people in the household" check_answer_label: "Details known for person 6" - check_answer_prompt: "Tell us if you know person 6's details" + check_answer_prompt: "Tell us if you know person 6’s details" hint_text: "You must provide details for everyone in the household if you know them." question_text: "Do you know details for person 6?" @@ -272,7 +272,7 @@ en: page_header: "" age6_known: check_answer_label: "Person 6’s age" - check_answer_prompt: "Enter person 6's age if known" + check_answer_prompt: "Enter person 6’s age if known" hint_text: "" question_text: "Do you know person 6’s age?" age6: @@ -298,7 +298,7 @@ en: details_known_7: page_header: "You’ve given us the details for 6 people in the household" check_answer_label: "Details known for person 7" - check_answer_prompt: "Tell us if you know person 7's details" + check_answer_prompt: "Tell us if you know person 7’s details" hint_text: "You must provide details for everyone in the household if you know them." question_text: "Do you know details for person 7?" @@ -313,7 +313,7 @@ en: page_header: "" age7_known: check_answer_label: "Person 7’s age" - check_answer_prompt: "Enter person 7's age if known" + check_answer_prompt: "Enter person 7’s age if known" hint_text: "" question_text: "Do you know person 7’s age?" age7: @@ -339,7 +339,7 @@ en: details_known_8: page_header: "You’ve given us the details for 7 people in the household" check_answer_label: "Details known for person 8" - check_answer_prompt: "Tell us if you know person 8's details" + check_answer_prompt: "Tell us if you know person 8’s details" hint_text: "You must provide details for everyone in the household if you know them." question_text: "Do you know details for person 8?" @@ -354,7 +354,7 @@ en: page_header: "" age8_known: check_answer_label: "Person 8’s age" - check_answer_prompt: "Enter person 8's age if known" + check_answer_prompt: "Enter person 8’s age if known" hint_text: "" question_text: "Do you know person 8’s age?" age8: diff --git a/config/locales/forms/2023/lettings/household_situation.en.yml b/config/locales/forms/2023/lettings/household_situation.en.yml index 1ce9f900a..eb9ecae7f 100644 --- a/config/locales/forms/2023/lettings/household_situation.en.yml +++ b/config/locales/forms/2023/lettings/household_situation.en.yml @@ -80,8 +80,8 @@ en: previous_local_authority: page_header: "" previous_la_known: - check_answer_label: "Local authority of household's last settled accommodation" - check_answer_prompt: "Enter the local authority of the buyer's last settled accommodation if known" + check_answer_label: "Local authority of household’s last settled accommodation" + check_answer_prompt: "Enter the local authority of the buyer’s last settled accommodation if known" hint_text: "This is also known as the household’s ‘last settled home’." question_text: "Do you know the local authority of the household’s last settled accommodation?" prevloc: diff --git a/config/locales/forms/2023/lettings/property_information.en.yml b/config/locales/forms/2023/lettings/property_information.en.yml index 089e29c0e..3745957c5 100644 --- a/config/locales/forms/2023/lettings/property_information.en.yml +++ b/config/locales/forms/2023/lettings/property_information.en.yml @@ -9,12 +9,12 @@ en: check_answer_label: "UPRN known" check_answer_prompt: "Enter UPRN if known" hint_text: "The Unique Property Reference Number (UPRN) is a unique number system created by Ordnance Survey and used by housing providers and various industries across the UK. An example UPRN is 10010457355.

The UPRN may not be the same as the property reference assigned by your organisation.

If you don’t know the UPRN you can enter the address of the property instead on the next screen." - question_text: "Do you know the property's UPRN?" + question_text: "Do you know the property’s UPRN?" uprn: check_answer_label: "UPRN" check_answer_prompt: "" hint_text: "" - question_text: "What is the property's UPRN?" + question_text: "What is the property’s UPRN?" uprn_confirmed: page_header: "We found an address that might be this property" @@ -24,7 +24,7 @@ en: question_text: "Is this the property address?" address: - page_header: "Q12 - What is the property's address?" + page_header: "Q12 - What is the property’s address?" address_line1: check_answer_label: "Address lines 1 and 2" check_answer_prompt: "Enter address lines 1 and 2" @@ -61,7 +61,7 @@ en: first_time_property_let_as_social_housing: page_header: "" check_answer_label: "First time being let as social housing" - check_answer_prompt: "Tell us if it's the first time being let as social housing" + check_answer_prompt: "Tell us if it’s the first time being let as social housing" hint_text: "" question_text: "Is this the first time the property has been let as social housing?" diff --git a/config/locales/forms/2023/lettings/setup.en.yml b/config/locales/forms/2023/lettings/setup.en.yml index c4927532e..00b6811c0 100644 --- a/config/locales/forms/2023/lettings/setup.en.yml +++ b/config/locales/forms/2023/lettings/setup.en.yml @@ -55,7 +55,7 @@ en: renewal: page_header: "" check_answer_label: "Property renewal" - check_answer_prompt: "Tell us if it's a property renewal" + check_answer_prompt: "Tell us if it’s a property renewal" hint_text: "A renewal is a letting to the same tenant in the same property. If the property was previously being used as temporary accommodation, then answer 'no'." question_text: "Is this letting a renewal?" diff --git a/config/locales/forms/2023/lettings/soft_validations.en.yml b/config/locales/forms/2023/lettings/soft_validations.en.yml index 450547f72..4b2b5af18 100644 --- a/config/locales/forms/2023/lettings/soft_validations.en.yml +++ b/config/locales/forms/2023/lettings/soft_validations.en.yml @@ -42,7 +42,7 @@ en: partner_under_16_value_check: page_header: "" check_answer_label: "Partner under 16 confirmation" - check_answer_prompt: "Confirm partner's age" + check_answer_prompt: "Confirm partner’s age" hint_text: "" question_text: "Are you sure this is correct?" title_text: "You told us this person is aged %{age} years and has 'Partner' relationship to the lead tenant." diff --git a/config/locales/forms/2023/lettings/tenancy_information.en.yml b/config/locales/forms/2023/lettings/tenancy_information.en.yml index 1208251b9..892a5ce70 100644 --- a/config/locales/forms/2023/lettings/tenancy_information.en.yml +++ b/config/locales/forms/2023/lettings/tenancy_information.en.yml @@ -6,14 +6,14 @@ en: joint: page_header: "" check_answer_label: "Joint tenancy" - check_answer_prompt: "Tell us if it's a joint tenancy" + check_answer_prompt: "Tell us if it’s a joint tenancy" hint_text: "" question_text: "Is this a joint tenancy?" startertenancy: page_header: "" check_answer_label: "Starter or introductory tenancy" - check_answer_prompt: "Tell us if it's a starter or introductory tenancy" + check_answer_prompt: "Tell us if it’s a starter or introductory tenancy" hint_text: "This is also known as an ‘introductory period’." question_text: "Is this a starter tenancy?" diff --git a/config/locales/forms/2023/sales/household_characteristics.en.yml b/config/locales/forms/2023/sales/household_characteristics.en.yml index 94871e918..60c642fd4 100644 --- a/config/locales/forms/2023/sales/household_characteristics.en.yml +++ b/config/locales/forms/2023/sales/household_characteristics.en.yml @@ -35,12 +35,12 @@ en: page_header: "" age1_known: check_answer_label: "Buyer 1’s age" - check_answer_prompt: "Enter buyer 1's age if known" + check_answer_prompt: "Enter buyer 1’s age if known" 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: "Do you know buyer 1’s age?" age1: check_answer_label: "Buyer 1’s age" - check_answer_prompt: "Enter buyer 1's age" + check_answer_prompt: "Enter buyer 1’s age" hint_text: "" question_text: "Age" @@ -99,10 +99,10 @@ en: ecstat1: page_header: "" - check_answer_label: "Buyer 1's working situation" + check_answer_label: "Buyer 1’s working situation" check_answer_prompt: "" 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: "Which of these best describes buyer 1's working situation?" + question_text: "Which of these best describes buyer 1’s working situation?" buy1livein: page_header: "" @@ -114,10 +114,10 @@ en: relat2: buyer: page_header: "" - check_answer_label: "Buyer 2's relationship to buyer 1" + check_answer_label: "Buyer 2’s relationship to buyer 1" check_answer_prompt: "" hint_text: "" - question_text: "What is buyer 2's relationship to buyer 1?" + question_text: "What is buyer 2’s relationship to buyer 1?" person: page_header: "" check_answer_label: "Person 2’s relationship to buyer 1" @@ -130,24 +130,24 @@ en: page_header: "" age2_known: check_answer_label: "Buyer 2’s age" - check_answer_prompt: "Enter buyer 2's age if known" + check_answer_prompt: "Enter buyer 2’s age if known" hint_text: "" question_text: "Do you know buyer 2’s age?" age2: check_answer_label: "Buyer 2’s age" - check_answer_prompt: "Enter buyer 2's age" + check_answer_prompt: "Enter buyer 2’s age" hint_text: "" question_text: "Age" person: page_header: "" age2_known: check_answer_label: "Person 2’s age" - check_answer_prompt: "Enter person 2's age if known" + check_answer_prompt: "Enter person 2’s age if known" hint_text: "" question_text: "Do you know person 2’s age?" age2: check_answer_label: "Person 2’s age" - check_answer_prompt: "Enter person 2's age" + check_answer_prompt: "Enter person 2’s age" hint_text: "" question_text: "Age" @@ -214,10 +214,10 @@ en: ecstat2: buyer: page_header: "" - check_answer_label: "Buyer 2's working situation" + check_answer_label: "Buyer 2’s working situation" check_answer_prompt: "" hint_text: "" - question_text: "Which of these best describes buyer 2's working situation?" + question_text: "Which of these best describes buyer 2’s working situation?" person: page_header: "" check_answer_label: "Person 2’s working situation" @@ -249,14 +249,14 @@ en: details_known_2: page_header: "" check_answer_label: "Details known for person 2?" - check_answer_prompt: "Tell us if you know person 2's details" + check_answer_prompt: "Tell us if you know person 2’s details" hint_text: "" question_text: "Do you know the details for person 2?" details_known_3: page_header: "" check_answer_label: "Details known for person 3?" - check_answer_prompt: "Tell us if you know person 3's details" + check_answer_prompt: "Tell us if you know person 3’s details" hint_text: "" question_text: "Do you know the details for person 3?" @@ -271,12 +271,12 @@ en: page_header: "" age3_known: check_answer_label: "Person 3’s age" - check_answer_prompt: "Enter person 3's age if known" + check_answer_prompt: "Enter person 3’s age if known" hint_text: "" question_text: "Do you know person 3’s age?" age3: check_answer_label: "Person 3’s age" - check_answer_prompt: "Enter person 3's age" + check_answer_prompt: "Enter person 3’s age" hint_text: "" question_text: "Age" @@ -297,7 +297,7 @@ en: details_known_4: page_header: "" check_answer_label: "Details known for person 4?" - check_answer_prompt: "Tell us if you know person 4's details" + check_answer_prompt: "Tell us if you know person 4’s details" hint_text: "" question_text: "Do you know the details for person 4?" @@ -312,12 +312,12 @@ en: page_header: "" age4_known: check_answer_label: "Person 4’s age" - check_answer_prompt: "Enter person 4's age if known" + check_answer_prompt: "Enter person 4’s age if known" hint_text: "" question_text: "Do you know person 4’s age?" age4: check_answer_label: "Person 4’s age" - check_answer_prompt: "Enter person 4's age" + check_answer_prompt: "Enter person 4’s age" hint_text: "" question_text: "Age" @@ -338,7 +338,7 @@ en: details_known_5: page_header: "" check_answer_label: "Details known for person 5?" - check_answer_prompt: "Tell us if you know person 5's details" + check_answer_prompt: "Tell us if you know person 5’s details" hint_text: "" question_text: "Do you know the details for person 5?" @@ -353,12 +353,12 @@ en: page_header: "" age5_known: check_answer_label: "Person 5’s age" - check_answer_prompt: "Enter person 5's age if known" + check_answer_prompt: "Enter person 5’s age if known" hint_text: "" question_text: "Do you know person 5’s age?" age5: check_answer_label: "Person 5’s age" - check_answer_prompt: "Enter person 5's age" + check_answer_prompt: "Enter person 5’s age" hint_text: "" question_text: "Age" @@ -379,7 +379,7 @@ en: details_known_6: page_header: "" check_answer_label: "Details known for person 6?" - check_answer_prompt: "Tell us if you know person 6's details" + check_answer_prompt: "Tell us if you know person 6’s details" hint_text: "" question_text: "Do you know the details for person 6?" @@ -394,12 +394,12 @@ en: page_header: "" age6_known: check_answer_label: "Person 6’s age" - check_answer_prompt: "Enter person 6's age if known" + check_answer_prompt: "Enter person 6’s age if known" hint_text: "" question_text: "Do you know person 6’s age?" age6: check_answer_label: "Person 6’s age" - check_answer_prompt: "Enter person 6's age" + check_answer_prompt: "Enter person 6’s age" hint_text: "" question_text: "Age" diff --git a/config/locales/forms/2023/sales/household_situation.en.yml b/config/locales/forms/2023/sales/household_situation.en.yml index 63131b772..a0a6d8947 100644 --- a/config/locales/forms/2023/sales/household_situation.en.yml +++ b/config/locales/forms/2023/sales/household_situation.en.yml @@ -27,7 +27,7 @@ en: page_header: "" previous_la_known: check_answer_label: "Local authority of buyer 1’s last settled accommodation" - check_answer_prompt: "Enter the local authority of the buyer's last settled accommodation if known" + check_answer_prompt: "Enter the local authority of the buyer’s last settled accommodation if known" hint_text: "This is also known as the household’s 'last settled home'" question_text: "Do you know the local authority of buyer 1’s last settled accommodation?" prevloc: 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 939849e48..1466630d3 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 @@ -7,7 +7,7 @@ en: page_header: "" income1nk: check_answer_label: "Buyer 1’s gross annual income known" - check_answer_prompt: "Enter buyer 1's gross annual income if known" + check_answer_prompt: "Enter buyer 1’s gross annual income if known" hint_text: "" question_text: "Do you know buyer 1’s annual income?" income1: @@ -27,7 +27,7 @@ en: page_header: "" income2nk: check_answer_label: "Buyer 2’s gross annual income known" - check_answer_prompt: "Enter buyer 2's gross annual income if known" + check_answer_prompt: "Enter buyer 2’s gross annual income if known" hint_text: "" question_text: "Do you know buyer 2’s annual income?" income2: @@ -60,7 +60,7 @@ en: page_header: "" savingsnk: check_answer_label: "Buyers’ total savings" - check_answer_prompt: "Enter buyers' total savings if known" + check_answer_prompt: "Enter buyers’ total savings if known" hint_text: "" question_text: "Do you know how much the buyers had in savings before they paid any deposit for the property?" savings: @@ -72,7 +72,7 @@ en: page_header: "" savingsnk: check_answer_label: "Buyer’s total savings" - check_answer_prompt: "Enter buyer's total savings if known" + check_answer_prompt: "Enter buyer’s total savings if known" hint_text: "" question_text: "Do you know how much the buyer had in savings before they paid any deposit for the property?" savings: diff --git a/config/locales/forms/2023/sales/other_household_information.en.yml b/config/locales/forms/2023/sales/other_household_information.en.yml index b26aa3e9c..54436e15e 100644 --- a/config/locales/forms/2023/sales/other_household_information.en.yml +++ b/config/locales/forms/2023/sales/other_household_information.en.yml @@ -28,7 +28,7 @@ en: page_header: "" check_answer_label: "Household member has a disability" check_answer_prompt: "Tell us if someone has a disability" - hint_text: "This includes any long-term health condition that has an impact on the person's day-to-day life" + hint_text: "This includes any long-term health condition that has an impact on the person’s day-to-day life" question_text: "Does anyone in the household consider themselves to have a disability?" wheel: diff --git a/config/locales/forms/2023/sales/property_information.en.yml b/config/locales/forms/2023/sales/property_information.en.yml index d74af46e3..ec0591281 100644 --- a/config/locales/forms/2023/sales/property_information.en.yml +++ b/config/locales/forms/2023/sales/property_information.en.yml @@ -9,12 +9,12 @@ en: check_answer_label: "UPRN known" check_answer_prompt: "Enter UPRN if known" hint_text: "The Unique Property Reference Number (UPRN) is a unique number system created by Ordnance Survey and used by housing providers and various industries across the UK. An example UPRN is 10010457355.

The UPRN may not be the same as the property reference assigned by your organisation.

If you don’t know the UPRN you can enter the address of the property instead on the next screen." - question_text: "Do you know the property's UPRN?" + question_text: "Do you know the property’s UPRN?" uprn: check_answer_label: "UPRN" check_answer_prompt: "" hint_text: "" - question_text: "What is the property's UPRN?" + question_text: "What is the property’s UPRN?" uprn_confirmed: page_header: "We found an address that might be this property" @@ -24,7 +24,7 @@ en: question_text: "Is this the property address?" address: - page_header: "Q15 - What is the property's address?" + page_header: "Q15 - What is the property’s address?" address_line1: check_answer_label: "Address lines 1 and 2" check_answer_prompt: "Enter address lines 1 and 2" diff --git a/config/locales/forms/2023/sales/sale_information.en.yml b/config/locales/forms/2023/sales/sale_information.en.yml index 137e95a87..2962bc54b 100644 --- a/config/locales/forms/2023/sales/sale_information.en.yml +++ b/config/locales/forms/2023/sales/sale_information.en.yml @@ -32,7 +32,7 @@ en: staircasing: page_header: "" check_answer_label: "Staircasing transaction" - check_answer_prompt: "Tell us if it's a staircasing transaction" + check_answer_prompt: "Tell us if it’s a 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." question_text: "Is this a staircasing transaction?" about_staircasing: diff --git a/config/locales/forms/2023/sales/soft_validations.en.yml b/config/locales/forms/2023/sales/soft_validations.en.yml index 11e6bea28..71b1653b3 100644 --- a/config/locales/forms/2023/sales/soft_validations.en.yml +++ b/config/locales/forms/2023/sales/soft_validations.en.yml @@ -7,9 +7,9 @@ en: max: page_header: "" check_answer_label: "Retirement confirmation" - check_answer_prompt: "Confirm person isn't retired" + check_answer_prompt: "Confirm person isn’t retired" hint_text: "" - question_text: "Are you sure this person isn't retired?" + question_text: "Are you sure this person isn’t retired?" title_text: "You told us this person is over 66 and not retired." informative_text: "The minimum expected retirement age in England is 66." min: @@ -146,7 +146,7 @@ en: check_answer_label: "Deposit confirmation" check_answer_prompt: "Confirm deposit amount" hint_text: "" - question_text: "Are you sure that the deposit is this much higher than the buyer's savings?" + question_text: "Are you sure that the deposit is this much higher than the buyer’s savings?" title_text: "You told us the buyers’ deposit was %{deposit} and their savings were %{savings}." informative_text: "The deposit amount is higher than we would expect for the amount of savings they have." not_joint_purchase: @@ -154,7 +154,7 @@ en: check_answer_label: "Deposit confirmation" check_answer_prompt: "Confirm deposit amount" hint_text: "" - question_text: "Are you sure that the deposit is this much higher than the buyer's savings?" + question_text: "Are you sure that the deposit is this much higher than the buyer’s savings?" title_text: "You told us the buyer’s deposit was %{deposit} and their savings were %{savings}." informative_text: "The deposit amount is higher than we would expect for the amount of savings they have." @@ -196,7 +196,7 @@ en: partner_under_16_value_check: page_header: "" check_answer_label: "Partner under 16 confirmation" - check_answer_prompt: "Confirm partner's age" + check_answer_prompt: "Confirm partner’s age" hint_text: "" question_text: "Are you sure this is correct?" title_text: "You told us this person is aged %{age} years and has 'Partner' relationship to buyer 1." diff --git a/config/locales/forms/2024/lettings/guidance.en.yml b/config/locales/forms/2024/lettings/guidance.en.yml index ba5d152d6..41349c607 100644 --- a/config/locales/forms/2024/lettings/guidance.en.yml +++ b/config/locales/forms/2024/lettings/guidance.en.yml @@ -39,7 +39,7 @@ en: title: "What is a void date?" content: "

Date the property was (legally or contractually) available to let, or for: