From 222a191d9ca41d6385446edc84c1402d681398b0 Mon Sep 17 00:00:00 2001 From: Manny Dinssa <44172848+Dinssa@users.noreply.github.com> Date: Mon, 20 Jan 2025 15:26:56 +0000 Subject: [PATCH] CLDC-3740: Replace you didn't answer text with link to question (#2836) * Different versions of details_html * One version of details_html * Replace you didnt answer with link * Fix lint * Update some tests * Update some tests * Add question marks to yes no questions - test * Improve formatting helper * Improve formatting helper * Improve prompt message * Revert "Add question marks to yes no questions - test" This reverts commit 40bee289 * Rename question method * Add check answer prompt method to question model and translation key * Add translation key to soft validations * Lettings custom prompts * Update to handle new helpdesk ticket logic * Update copy * Update copy * Update method names * Add check answer prompt to soft validations * Change copy * Do not put error objects into cookies * Hide change link for inferred or derived values not yet answered * Revert "Hide change link for inferred or derived values not yet answered" This reverts commit ec1fd1c9aa7db852c0250600ce39335335344f65. * Update lettings related check answer prompts * Update some sales related check answer prompts * Update some sales related check answer prompts * Bug fix * More sales prompts * Replace text for bulk upload * Update uprn known test with specific error message already used * Translation file to CSV * Revert "Translation file to CSV" This reverts commit 0565fea7172ba9fe78af806ee19afdac255a60bc. * Add a red link to show questions that still must be answered (after bulk upload) * Lint * Update feature tests * Update component tests * Update helper tests * Update requests tests * Update request test * Refactor improvements * Refactor improvements 0.2 * Lint * Stay consistent with date question message * Rename variable * Add tests * Improvements * Refactor details table helper * Remove action link not just hide * Revert "Remove action link not just hide" This reverts commit 59ecac5cf3a2c8f1453d7f5ad6c6a1a2ef891578. * Users - remove action link * Organisations - remove action link * Merge requests - remove action link * Revert "Refactor details table helper" This reverts commit b74fd830f13ff0179efeff77421a3d7e43e76d83. * Schemes - remove action link * Location - remove action link * Logs - remove action link * Lint * Refactor V2 details table helper * Allow respond_to? to see private methods * Remove .presence duplication of logic * Change "Answer if" to "Tell us if" * Add missing CAP * Update age questions sales and lettings * Update postcode and la questions * Update wording * Updates and improvements * Another update * Fix bug * typo * typo * update relat to buyer/lead prompts * Update test * Additional copy * Additional copy * Update copy "housing-related" to "housing related" --------- Co-authored-by: Kat <54268893+kosiakkatrina@users.noreply.github.com> --- ...eck_answers_summary_list_card_component.rb | 12 +- app/frontend/styles/_red-link.scss | 14 ++ app/frontend/styles/application.scss | 1 + app/helpers/check_answers_helper.rb | 17 +- app/helpers/details_table_helper.rb | 36 +++- app/helpers/formatting_helper.rb | 5 +- app/helpers/locations_helper.rb | 33 ++- app/helpers/merge_requests_helper.rb | 41 +++- app/helpers/organisations_helper.rb | 13 ++ app/helpers/schemes_helper.rb | 18 +- app/helpers/user_helper.rb | 20 ++ app/models/form/question.rb | 15 +- .../form/_check_answers_summary_list.html.erb | 2 +- app/views/locations/check_answers.html.erb | 10 +- app/views/locations/show.html.erb | 10 +- app/views/organisations/show.html.erb | 19 +- .../schemes/_scheme_summary_list_row.html.erb | 8 +- app/views/schemes/check_answers.html.erb | 2 +- app/views/schemes/show.html.erb | 2 +- app/views/users/show.html.erb | 16 +- .../lettings/household_characteristics.en.yml | 71 ++++++- .../2023/lettings/household_needs.en.yml | 12 +- .../2023/lettings/household_situation.en.yml | 30 ++- .../2023/lettings/income_and_benefits.en.yml | 32 ++- .../2023/lettings/property_information.en.yml | 22 +- .../locales/forms/2023/lettings/setup.en.yml | 13 ++ .../2023/lettings/soft_validations.en.yml | 184 ++++++++-------- .../2023/lettings/tenancy_information.en.yml | 17 +- .../sales/household_characteristics.en.yml | 109 +++++++--- .../2023/sales/household_situation.en.yml | 10 +- .../sales/income_benefits_and_savings.en.yml | 35 ++- .../sales/other_household_information.en.yml | 15 +- .../2023/sales/property_information.en.yml | 15 +- .../forms/2023/sales/sale_information.en.yml | 74 +++++-- config/locales/forms/2023/sales/setup.en.yml | 26 ++- .../forms/2023/sales/soft_validations.en.yml | 30 ++- .../lettings/household_characteristics.en.yml | 71 ++++++- .../2024/lettings/household_needs.en.yml | 12 +- .../2024/lettings/household_situation.en.yml | 30 ++- .../2024/lettings/income_and_benefits.en.yml | 34 ++- .../2024/lettings/property_information.en.yml | 29 ++- .../locales/forms/2024/lettings/setup.en.yml | 14 ++ .../2024/lettings/soft_validations.en.yml | 199 ++++++++++-------- .../2024/lettings/tenancy_information.en.yml | 17 +- .../sales/household_characteristics.en.yml | 81 ++++++- .../2024/sales/household_situation.en.yml | 10 +- .../sales/income_benefits_and_savings.en.yml | 35 ++- .../sales/other_household_information.en.yml | 15 +- .../2024/sales/property_information.en.yml | 20 +- .../forms/2024/sales/sale_information.en.yml | 80 +++++-- config/locales/forms/2024/sales/setup.en.yml | 26 ++- .../forms/2024/sales/soft_validations.en.yml | 31 ++- .../lettings/household_characteristics.en.yml | 71 ++++++- .../2025/lettings/household_needs.en.yml | 9 + .../2025/lettings/household_situation.en.yml | 28 ++- .../2025/lettings/income_and_benefits.en.yml | 34 ++- .../2025/lettings/property_information.en.yml | 34 ++- .../locales/forms/2025/lettings/setup.en.yml | 14 ++ .../2025/lettings/soft_validations.en.yml | 199 ++++++++++-------- .../2025/lettings/tenancy_information.en.yml | 21 +- .../sales/household_characteristics.en.yml | 81 ++++++- .../2025/sales/household_situation.en.yml | 9 +- .../sales/income_benefits_and_savings.en.yml | 35 ++- .../sales/other_household_information.en.yml | 15 +- .../2025/sales/property_information.en.yml | 20 +- .../forms/2025/sales/sale_information.en.yml | 66 +++++- config/locales/forms/2025/sales/setup.en.yml | 27 ++- .../forms/2025/sales/soft_validations.en.yml | 31 ++- .../validations/sales/sale_information.en.yml | 2 +- ...nswers_summary_list_card_component_spec.rb | 20 +- .../check_answers_page_lettings_logs_spec.rb | 10 +- spec/features/lettings_log_spec.rb | 4 +- spec/features/schemes_spec.rb | 4 +- spec/helpers/check_answers_helper_spec.rb | 2 +- spec/helpers/details_table_helper_spec.rb | 21 +- spec/helpers/merge_requests_helper_spec.rb | 22 ++ spec/models/form/question_spec.rb | 26 ++- .../form/sales/questions/uprn_known_spec.rb | 2 +- spec/requests/check_errors_controller_spec.rb | 10 +- spec/requests/form_controller_spec.rb | 2 +- .../requests/lettings_logs_controller_spec.rb | 4 +- .../merge_requests/show.html.erb_spec.rb | 6 +- 82 files changed, 1907 insertions(+), 615 deletions(-) create mode 100644 app/frontend/styles/_red-link.scss diff --git a/app/components/check_answers_summary_list_card_component.rb b/app/components/check_answers_summary_list_card_component.rb index 5242c7f41..c22b2eee0 100644 --- a/app/components/check_answers_summary_list_card_component.rb +++ b/app/components/check_answers_summary_list_card_component.rb @@ -47,11 +47,13 @@ class CheckAnswersSummaryListCardComponent < ViewComponent::Base private def unanswered_value(question) - if log.creation_method_bulk_upload? && log.bulk_upload.present? && !log.optional_fields.include?(question.id) - "You still need to answer this question".html_safe - else - "You didn’t answer this question".html_safe - end + link_class = if log.creation_method_bulk_upload? && log.bulk_upload.present? && !log.optional_fields.include?(question.id) + "app-red-link app-red-link---no-visited-state" + else + "govuk-link govuk-link--no-visited-state" + end + + govuk_link_to question.check_answer_prompt, correct_validation_action_href(question, log, nil, @correcting_hard_validation), class: link_class end def number_of_buyers diff --git a/app/frontend/styles/_red-link.scss b/app/frontend/styles/_red-link.scss new file mode 100644 index 000000000..421f55bcb --- /dev/null +++ b/app/frontend/styles/_red-link.scss @@ -0,0 +1,14 @@ +.app-red-link { + @include govuk-typography-common; + @include govuk-link-decoration; + @include govuk-link-style-text; +} + +.app-red-link:link, +.app-red-link---no-visited-state:visited { + color: govuk-colour("red"); +} + +.app-red-link:hover { + color: govuk-shade(govuk-colour("red"), 20); +} diff --git a/app/frontend/styles/application.scss b/app/frontend/styles/application.scss index 94135074e..9639ab57c 100644 --- a/app/frontend/styles/application.scss +++ b/app/frontend/styles/application.scss @@ -48,6 +48,7 @@ $govuk-breakpoints: ( @import "search"; @import "sub-navigation"; @import "unread-notification"; +@import "red-link"; @import "custom-rails-admin"; // App utilities diff --git a/app/helpers/check_answers_helper.rb b/app/helpers/check_answers_helper.rb index d69414670..2d15dc07d 100644 --- a/app/helpers/check_answers_helper.rb +++ b/app/helpers/check_answers_helper.rb @@ -55,11 +55,18 @@ private [question.question_number_string, question.check_answer_label.to_s.presence || question.header.to_s].compact.join(" - ") end + def unanswered_action_href(question, log) + referrer = question.displayed_as_answered?(log) ? "check_answers" : "check_answers_new_answer" + send("#{log.model_name.param_key}_#{question.page.id}_path", log, referrer:) + end + def unanswered_value(log:, question:) - if log.creation_method_bulk_upload? && log.bulk_upload.present? && !log.optional_fields.include?(question.id) - "You still need to answer this question".html_safe - else - "You didn’t answer this question".html_safe - end + link_class = if log.creation_method_bulk_upload? && log.bulk_upload.present? && !log.optional_fields.include?(question.id) + "app-red-link app-red-link---no-visited-state" + else + "govuk-link govuk-link--no-visited-state" + end + + govuk_link_to question.check_answer_prompt, unanswered_action_href(question, log), class: link_class end end diff --git a/app/helpers/details_table_helper.rb b/app/helpers/details_table_helper.rb index b7f880fdf..d5499eec4 100644 --- a/app/helpers/details_table_helper.rb +++ b/app/helpers/details_table_helper.rb @@ -1,14 +1,42 @@ module DetailsTableHelper - def details_html(attribute) + def details_html(attribute, resource = nil) if attribute[:format] == :bullet && attribute[:value].length > 1 list = attribute[:value].map { |value| "
  • #{value}
    • " }.join simple_format(list, { class: "govuk-list govuk-list--bullet" }, wrapper_tag: "ul") else - return simple_format(attribute[:value].first.to_s, { class: "govuk-body" }, wrapper_tag: "p") if attribute[:value].is_a?(Array) - - value = attribute[:value].presence || "You didn’t answer this question".html_safe + return simple_format(attribute[:value].first.to_s, { class: "govuk-body" }, wrapper_tag: "p") if attribute[:value].is_a?(Array) && attribute[:value].any? + value = determine_value(attribute, resource) simple_format(value.to_s, { class: "govuk-body" }, wrapper_tag: "p") end end + +private + + def determine_value(attribute, resource) + return attribute[:value] if attribute[:value].present? + + method_name = "#{resource.class.name.downcase}_value" + return send(method_name, attribute, resource) if respond_to?(method_name, true) + + "No answer provided".html_safe + end + + def location_value(attribute, resource) + return nil unless LocationPolicy.new(current_user, resource).update? + + govuk_link_to(location_details_link_message(attribute), location_edit_path(resource, attribute[:attribute]), class: "govuk-link govuk-link--no-visited-state") + end + + def organisation_value(attribute, resource) + return nil unless can_edit_org?(current_user) && attribute[:editable] + + govuk_link_to(organisation_details_link_message(attribute), edit_organisation_path(resource), class: "govuk-link govuk-link--no-visited-state") + end + + def scheme_value(attribute, resource) + return nil unless can_change_scheme_answer?(attribute[:name], resource) + + govuk_link_to(scheme_details_link_message(attribute), scheme_edit_path(resource, attribute[:id]), class: "govuk-link govuk-link--no-visited-state") + end end diff --git a/app/helpers/formatting_helper.rb b/app/helpers/formatting_helper.rb index ffa8b05e9..4f8313448 100644 --- a/app/helpers/formatting_helper.rb +++ b/app/helpers/formatting_helper.rb @@ -2,8 +2,7 @@ module FormattingHelper def format_ending(text) return text if text.blank? - first_word = text.split.first - modified_text = first_word == first_word.upcase ? text : lowercase_first_letter(text) + modified_text = lowercase_first_letter(text) ensure_sentence_ending(modified_text) end @@ -17,7 +16,7 @@ module FormattingHelper end def lowercase_first_letter(text) - return text if text.blank? + return text if text.blank? || text.split.first == text.split.first.upcase text[0].downcase + text[1..] end diff --git a/app/helpers/locations_helper.rb b/app/helpers/locations_helper.rb index 60b668cea..9ef74ca51 100644 --- a/app/helpers/locations_helper.rb +++ b/app/helpers/locations_helper.rb @@ -8,6 +8,10 @@ module LocationsHelper selection_options(%w[Yes No]) end + def location_editable_attributes + %w[postcode name units type_of_unit mobility_standards] + end + def type_of_units_selection selection_options(Location.type_of_units) end @@ -64,8 +68,25 @@ module LocationsHelper send("scheme_location_#{attribute}_path", location.scheme, location, referrer: "check_answers", route: params[:route]) end - def action_text_helper(attr, location) - attr[:value].blank? || (attr[:attribute] == "availability" && location.startdate.blank?) ? "Answer" : "Change" + def location_action_text(attr, location) + return "" if attr[:value].blank? || (attr[:attribute] == "availability" && location.startdate.blank?) + + "Change" + end + + def location_action_link(attr, scheme, location, current_user) + return unless LocationPolicy.new(current_user, location).update? + return unless current_user.support? && attr[:value].present? + + paths = { + "postcode" => scheme_location_postcode_path(scheme, location, referrer: "details"), + "name" => scheme_location_name_path(scheme, location, referrer: "details"), + "units" => scheme_location_units_path(scheme, location, referrer: "details"), + "type_of_unit" => scheme_location_type_of_unit_path(scheme, location, referrer: "details"), + "mobility_standards" => scheme_location_mobility_standards_path(scheme, location, referrer: "details"), + } + + paths[attr[:attribute]] end def toggle_location_link(location) @@ -95,6 +116,14 @@ module LocationsHelper end end + def location_details_link_message(attribute) + text = lowercase_first_letter(attribute[:name]) + return "Select #{text}" if %w[local_authority type_of_unit mobility_standards].include?(attribute[:attribute]) + return "Set #{text}" if attribute[:attribute] == "availability" + + "Enter #{text}" + end + private ActivePeriod = Struct.new(:from, :to) diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb index a8ed72120..3d9577ce9 100644 --- a/app/helpers/merge_requests_helper.rb +++ b/app/helpers/merge_requests_helper.rb @@ -2,10 +2,32 @@ module MergeRequestsHelper include GovukLinkHelper include GovukVisuallyHiddenHelper - def display_value_or_placeholder(value, placeholder = "You didn't answer this question") + def display_value_or_placeholder(value, placeholder = "No answer provided") value.presence || content_tag(:span, placeholder, class: "app-!-colour-muted") end + def value_exists?(merge_request, attribute) + merge_request.send(attribute).present? || (attribute == "helpdesk_ticket" && merge_request.has_helpdesk_ticket == false) + end + + def details_prompt_link(page, merge_request) + govuk_link_to(merge_request_details_prompt(page), send("#{page}_merge_request_path", merge_request, referrer: "check_answers"), class: "govuk-link govuk-link--no-visited-state") + end + + def merge_request_details_prompt(page) + messages = { + "existing_absorbing_organisation" => "Tell us if absorbing organisation is already active", + "helpdesk_ticket" => "Enter helpdesk ticket number", + "merging_organisations" => "Add merging organisations", + "merge_date" => "Set merge date", + } + messages[page] || "Enter #{lowercase_first_letter(page.humanize)}" + end + + def merge_request_action_text(merge_request, attribute) + value_exists?(merge_request, attribute) ? "Change" : "" + end + def request_details(merge_request) [ { label: "Requester", value: display_value_or_placeholder(merge_request.requester&.name) }, @@ -16,10 +38,10 @@ module MergeRequestsHelper def merge_details(merge_request) [ - { label: "Absorbing organisation", value: display_value_or_placeholder(merge_request.absorbing_organisation_name), action: merge_request_action(merge_request, "absorbing_organisation") }, - { label: "Merging organisations", value: merge_request.merge_request_organisations.any? ? merge_request.merge_request_organisations.map(&:merging_organisation_name).join("
    ").html_safe : display_value_or_placeholder(nil), action: merge_request_action(merge_request, "merging_organisations") }, - { label: "Merge date", value: display_value_or_placeholder(merge_request.merge_date), action: merge_request_action(merge_request, "merge_date") }, - { label: "Absorbing organisation already active?", value: display_value_or_placeholder(merge_request.existing_absorbing_organisation_label), action: merge_request_action(merge_request, "existing_absorbing_organisation") }, + { label: "Absorbing organisation", value: display_value_or_placeholder(merge_request.absorbing_organisation_name, details_prompt_link("absorbing_organisation", merge_request)), action: merge_request_action(merge_request, "absorbing_organisation") }, + { label: "Merging organisations", value: merge_request.merge_request_organisations.any? ? merge_request.merge_request_organisations.map(&:merging_organisation_name).join("
    ").html_safe : display_value_or_placeholder(nil, details_prompt_link("merging_organisations", merge_request)), action: merge_request_action(merge_request, "merging_organisations") }, + { label: "Merge date", value: display_value_or_placeholder(merge_request.merge_date, details_prompt_link("merge_date", merge_request)), action: merge_request_action(merge_request, "merge_date") }, + { label: "Absorbing organisation already active?", value: display_value_or_placeholder(merge_request.existing_absorbing_organisation_label, details_prompt_link("existing_absorbing_organisation", merge_request)), action: merge_request_action(merge_request, "existing_absorbing_organisation") }, ] end @@ -75,9 +97,12 @@ module MergeRequestsHelper end end - def merge_request_action(merge_request, page) + def merge_request_action(merge_request, page, attribute = nil) + attribute = page if attribute.nil? + return nil unless value_exists?(merge_request, attribute) + unless merge_request.status == "request_merged" || merge_request.status == "processing" - { text: "Change", href: send("#{page}_merge_request_path", merge_request, referrer: "check_answers"), visually_hidden_text: page.humanize } + { text: merge_request_action_text(merge_request, attribute), href: send("#{page}_merge_request_path", merge_request, referrer: "check_answers"), visually_hidden_text: page.humanize } end end @@ -287,7 +312,7 @@ module MergeRequestsHelper elsif merge_request.has_helpdesk_ticket == false "Not reported by a helpdesk ticket" else - display_value_or_placeholder(nil) + display_value_or_placeholder(nil, details_prompt_link("helpdesk_ticket", merge_request)) end end end diff --git a/app/helpers/organisations_helper.rb b/app/helpers/organisations_helper.rb index 75d5869fa..19c77b357 100644 --- a/app/helpers/organisations_helper.rb +++ b/app/helpers/organisations_helper.rb @@ -54,4 +54,17 @@ module OrganisationsHelper def delete_organisation_link(organisation) govuk_button_link_to "Delete this organisation", delete_confirmation_organisation_path(organisation), warning: true end + + def organisation_action_text(attr, organisation) + return "" if attr[:value].blank? || (attr[:attribute] == "phone" && organisation.phone.blank?) + + "Change" + end + + def organisation_details_link_message(attribute) + text = lowercase_first_letter(attribute[:name]) + return "Add #{text}" if attribute[:name] == "Rent periods" + + "Enter #{text}" + end end diff --git a/app/helpers/schemes_helper.rb b/app/helpers/schemes_helper.rb index f262c08ff..753f33917 100644 --- a/app/helpers/schemes_helper.rb +++ b/app/helpers/schemes_helper.rb @@ -64,10 +64,10 @@ module SchemesHelper schemes_csv_download_organisation_path(organisation, search:, download_type:) end - def change_answer_link(scheme, question_id, user) + def scheme_edit_path(scheme, question_id, user = nil) case question_id when "service_name", "sensitive", "scheme_type", "registered_under_care_act", "owning_organisation_id", "arrangement_type" - user.support? || !scheme.confirmed? ? scheme_details_path(scheme, referrer: "check-answers") : scheme_edit_name_path(scheme) + user&.support? || !scheme.confirmed? ? scheme_details_path(scheme, referrer: "check-answers") : scheme_edit_name_path(scheme) when "primary_client_group" scheme_primary_client_group_path(scheme, referrer: "check-answers") when "has_other_client_group" @@ -79,6 +79,12 @@ module SchemesHelper end end + def change_link_text(question_id, scheme) + return "" if scheme.public_send(question_id).nil? + + "Change" + end + def scheme_status_hint(scheme) case scheme.status when :deactivating_soon @@ -101,6 +107,14 @@ module SchemesHelper organisation.owned_schemes.duplicate_sets.any? || organisation.owned_schemes.any? { |scheme| scheme.locations.duplicate_sets.any? } end + def scheme_details_link_message(attribute) + text = lowercase_first_letter(attribute[:name]) + return "Select #{text}" if %w[primary_client_group secondary_client_group support_type intended_stay].include?(attribute[:id]) + return "Tell us if it #{text}" if attribute[:id] == "has_other_client_group" + + "Enter #{text}" + end + def scheme_back_button_path(scheme, current_page) return scheme_check_answers_path(scheme) if request.params[:referrer] == "check-answers" return scheme_confirm_secondary_client_group_path(scheme, referrer: "check-answers") if request.params[:referrer] == "has-other-client-group" diff --git a/app/helpers/user_helper.rb b/app/helpers/user_helper.rb index bbcb0acae..13eab0d14 100644 --- a/app/helpers/user_helper.rb +++ b/app/helpers/user_helper.rb @@ -75,4 +75,24 @@ module UserHelper text end + + def user_details_html(user, current_user, attribute) + value = user.send(attribute) + return value.humanize if value.present? + + case attribute + when "role" + current_user.data_coordinator? || current_user.support? ? govuk_link_to("Select role", aliased_user_edit(user, current_user), class: "govuk-link govuk-link--no-visited-state") : "No role assigned" + when "phone" + govuk_link_to("Enter telephone number", aliased_user_edit(user, current_user), class: "govuk-link govuk-link--no-visited-state") + else + "No answer provided" + end + end + + def user_action_text(user, attribute) + return "Change" if %w[role phone].include?(attribute) && user.send(attribute).present? + + "" + end end diff --git a/app/models/form/question.rb b/app/models/form/question.rb index a91187003..8e17f9752 100644 --- a/app/models/form/question.rb +++ b/app/models/form/question.rb @@ -15,6 +15,7 @@ class Form::Question @page = page if hsh @check_answer_label = hsh["check_answer_label"] + @check_answer_prompt = hsh["check_answer_prompt"] @header = hsh["header"] @top_guidance_partial = hsh["top_guidance_partial"] @bottom_guidance_partial = hsh["bottom_guidance_partial"] @@ -58,6 +59,10 @@ class Form::Question @check_answer_label ||= I18n.t("forms.#{form.start_date.year}.#{copy_key}.check_answer_label", default: "") end + def check_answer_prompt + @check_answer_prompt || I18n.t("forms.#{form.start_date.year}.#{copy_key}.check_answer_prompt", default: nil).presence || generate_check_answer_prompt + end + def header @header ||= I18n.t("forms.#{form.start_date.year}.#{copy_key}.question_text", default: "") end @@ -130,7 +135,7 @@ class Form::Question end def action_text(log, correcting_hard_validation: false) - return "Answer" unless displayed_as_answered?(log) + return "" unless displayed_as_answered?(log) correcting_hard_validation ? "Clear" : "Change" end @@ -239,6 +244,14 @@ class Form::Question I18n.t("validations.not_answered", question: question_text.downcase) end + def generate_check_answer_prompt + prompt_ending = lowercase_first_letter(error_label.presence || check_answer_label.presence || header.presence || id.humanize) || "this question." + return "Select #{prompt_ending}" if %w[checkbox radio select].include?(type) + return "Set #{prompt_ending}" if type == "date" + + "Enter #{prompt_ending}" + end + def suffix_label(log) return "" unless suffix return suffix if suffix.is_a?(String) diff --git a/app/views/form/_check_answers_summary_list.html.erb b/app/views/form/_check_answers_summary_list.html.erb index f849847a2..4748cdca2 100644 --- a/app/views/form/_check_answers_summary_list.html.erb +++ b/app/views/form/_check_answers_summary_list.html.erb @@ -25,7 +25,7 @@ <% end %> <% end %> - <% if @log.collection_period_open_for_editing? %> + <% if @log.collection_period_open_for_editing? && question.answer_label(@log, current_user).present? %> <% row.with_action( text: question.action_text(@log), href: action_href( diff --git a/app/views/locations/check_answers.html.erb b/app/views/locations/check_answers.html.erb index 7a3a72e13..497abf63f 100644 --- a/app/views/locations/check_answers.html.erb +++ b/app/views/locations/check_answers.html.erb @@ -23,14 +23,16 @@ <% row.with_key { attr[:name] } %> <% if attr[:attribute].eql?("postcode") && @location.is_la_inferred %> <% row.with_value do %> - <%= details_html(attr) %> + <%= details_html(attr, @location) %> <%= formatted_local_authority_timeline(@location) %> <% end %> <% else %> - <% row.with_value { details_html(attr) } %> + <% row.with_value { details_html(attr, @location) if user_can_edit_scheme?(current_user, @scheme) } %> <% end %> - <% if LocationPolicy.new(current_user, @location).update? %> - <% row.with_action(text: action_text_helper(attr, @location), href: location_edit_path(@location, attr[:attribute])) %> + <% if LocationPolicy.new(current_user, @location).update? && attr[:value] %> + <% row.with_action(text: location_action_text(attr, @location), href: location_edit_path(@location, attr[:attribute])) %> + <% else %> + <% row.with_action %> <% end %> <% end %> <% end %> diff --git a/app/views/locations/show.html.erb b/app/views/locations/show.html.erb index 0cb09af8f..16583c6e5 100644 --- a/app/views/locations/show.html.erb +++ b/app/views/locations/show.html.erb @@ -27,18 +27,14 @@ <% end %> <% elsif attr[:attribute].eql?("postcode") && @location.is_la_inferred %> <% row.with_value do %> - <%= details_html(attr) %> + <%= details_html(attr, @location) %> <%= formatted_local_authority_timeline(@location) %> <% end %> <% else %> - <%= row.with_value { details_html(attr) } %> + <%= row.with_value { details_html(attr, @location) } %> <% end %> <% if LocationPolicy.new(current_user, @location).update? %> - <% row.with_action(text: "Change", href: scheme_location_postcode_path(@scheme, @location, referrer: "details")) if attr[:attribute] == "postcode" && current_user.support? %> - <% row.with_action(text: "Change", href: scheme_location_name_path(@scheme, @location, referrer: "details")) if attr[:attribute] == "name" %> - <% row.with_action(text: "Change", href: scheme_location_units_path(@scheme, @location, referrer: "details")) if attr[:attribute] == "units" && current_user.support? %> - <% row.with_action(text: "Change", href: scheme_location_type_of_unit_path(@scheme, @location, referrer: "details")) if attr[:attribute] == "type_of_unit" && current_user.support? %> - <% row.with_action(text: "Change", href: scheme_location_mobility_standards_path(@scheme, @location, referrer: "details")) if attr[:attribute] == "mobility_standards" && current_user.support? %> + <%= row.with_action(text: "Change", href: location_action_link(attr, @scheme, @location, current_user)) if location_editable_attributes.include?(attr[:attribute]) %> <% end %> <% end %> <% end %> diff --git a/app/views/organisations/show.html.erb b/app/views/organisations/show.html.erb index 214b988f0..42c2482f7 100644 --- a/app/views/organisations/show.html.erb +++ b/app/views/organisations/show.html.erb @@ -22,17 +22,22 @@ <% if can_edit_org?(current_user) && attr[:editable] %> <%= summary_list.with_row do |row| %> <% row.with_key { attr[:name] } %> - <% row.with_value { details_html(attr) } %> - <% row.with_action( - visually_hidden_text: attr[:name].to_s.humanize.downcase, - href: edit_organisation_path(@organisation), - html_attributes: { "data-qa": "change-#{attr[:name].downcase}" }, - ) %> + <% row.with_value { details_html(attr, @organisation) } %> + <% if attr[:value] %> + <% row.with_action( + text: organisation_action_text(attr, @organisation), + visually_hidden_text: attr[:name].to_s.humanize.downcase, + href: edit_organisation_path(@organisation), + html_attributes: { "data-qa": "change-#{attr[:name].downcase}" }, + ) %> + <% else %> + <% row.with_action %> + <% end %> <% end %> <% else %> <%= summary_list.with_row do |row| %> <% row.with_key { attr[:name] } %> - <% row.with_value { details_html(attr) } %> + <% row.with_value { details_html(attr, @organisation) } %> <% row.with_action %> <% end %> <% end %> diff --git a/app/views/schemes/_scheme_summary_list_row.html.erb b/app/views/schemes/_scheme_summary_list_row.html.erb index 6655c17be..8204d856e 100644 --- a/app/views/schemes/_scheme_summary_list_row.html.erb +++ b/app/views/schemes/_scheme_summary_list_row.html.erb @@ -7,17 +7,17 @@

    Error: <%= scheme.errors[attribute[:id].to_sym][0] %>

    - <%= details_html(attribute) %> + <%= details_html(attribute, @scheme) %> <% else %>
    - <%= details_html(attribute) %> + <%= details_html(attribute, @scheme) %>
    <% end %> - <% if can_change_scheme_answer?(attribute[:name], scheme) && attribute[:edit] %> + <% if can_change_scheme_answer?(attribute[:name], scheme) && attribute[:edit] && attribute[:value] %>
    - Change + <%= change_link_text(attribute[:id], @scheme) %>
    <% end %> diff --git a/app/views/schemes/check_answers.html.erb b/app/views/schemes/check_answers.html.erb index a98c86a51..2af818727 100644 --- a/app/views/schemes/check_answers.html.erb +++ b/app/views/schemes/check_answers.html.erb @@ -10,7 +10,7 @@
    <% @scheme.check_details_attributes.each do |attr| %> <% if attr[:name] != "Status" && (attr[:id] != "secondary_client_group" || @scheme.has_other_client_group == "Yes") %> - <%= render partial: "scheme_summary_list_row", locals: { scheme: @scheme, attribute: attr, change_link: change_answer_link(@scheme, attr[:id], current_user) } %> + <%= render partial: "scheme_summary_list_row", locals: { scheme: @scheme, attribute: attr, change_link: scheme_edit_path(@scheme, attr[:id], current_user) } %> <% end %> <% end %>
    diff --git a/app/views/schemes/show.html.erb b/app/views/schemes/show.html.erb index 58bcd521e..5cf692676 100644 --- a/app/views/schemes/show.html.erb +++ b/app/views/schemes/show.html.erb @@ -38,7 +38,7 @@ <% elsif attr[:id] != "secondary_client_group" || @scheme.has_other_client_group == "Yes" %> - <%= render partial: "scheme_summary_list_row", locals: { scheme: @scheme, attribute: attr, change_link: change_answer_link(@scheme, attr[:id], current_user) } %> + <%= render partial: "scheme_summary_list_row", locals: { scheme: @scheme, attribute: attr, change_link: scheme_edit_path(@scheme, attr[:id], current_user) } %> <% end %> <% end %> diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index d6f2c1e88..78f2a06d3 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -52,9 +52,14 @@ <%= summary_list.with_row do |row| row.with_key { "Telephone number" } - row.with_value { @user.phone_with_extension } - if UserPolicy.new(current_user, @user).edit_telephone_numbers? - row.with_action(visually_hidden_text: "telephone number", href: aliased_user_edit(@user, current_user), html_attributes: { "data-qa": "change-telephone-number" }) + row.with_value { user_details_html(@user, current_user, "phone") } + if UserPolicy.new(current_user, @user).edit_telephone_numbers? && @user.phone.present? + row.with_action( + text: user_action_text(@user, "phone"), + visually_hidden_text: "telephone number", + href: aliased_user_edit(@user, current_user), + html_attributes: { "data-qa": "change-telephone-number" }, + ) else row.with_action end @@ -90,9 +95,10 @@ <%= summary_list.with_row do |row| row.with_key { "Role" } - row.with_value { @user.role&.humanize } - if UserPolicy.new(current_user, @user).edit_roles? + row.with_value { user_details_html(@user, current_user, "role") } + if UserPolicy.new(current_user, @user).edit_roles? && @user.role row.with_action( + text: user_action_text(@user, "role"), visually_hidden_text: "role", href: aliased_user_edit(@user, current_user), html_attributes: { "data-qa": "change-role" }, diff --git a/config/locales/forms/2023/lettings/household_characteristics.en.yml b/config/locales/forms/2023/lettings/household_characteristics.en.yml index 3de0745b1..09db802f5 100644 --- a/config/locales/forms/2023/lettings/household_characteristics.en.yml +++ b/config/locales/forms/2023/lettings/household_characteristics.en.yml @@ -6,35 +6,41 @@ en: declaration: page_header: "Ministry of Housing, Communities and Local Government privacy notice" check_answer_label: "Tenant has seen the privacy notice" + check_answer_prompt: "Tell us if tenant has seen the privacy notice" hint_text: "" question_text: "Declaration" hhmemb: page_header: "" check_answer_label: "Number of household members" + check_answer_prompt: "Enter total number of household members" hint_text: "You can provide details for a maximum of 8 people." question_text: "How many people live in the household for this letting?" age1: page_header: "" age1_known: - check_answer_label: "" + 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: check_answer_label: "Lead tenant’s age" + check_answer_prompt: "" hint_text: "" question_text: "Age" sex1: page_header: "" check_answer_label: "Lead tenant’s gender identity" + check_answer_prompt: "" 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" + check_answer_prompt: "" 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?" @@ -42,282 +48,331 @@ en: ethnic_background_black: page_header: "" check_answer_label: "Lead tenant’s ethnic background" + check_answer_prompt: "" 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 the following best describes lead tenant’s Black, African, Caribbean or Black British background?" ethnic_background_asian: page_header: "" check_answer_label: "Lead tenant’s ethnic background" + check_answer_prompt: "" 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 the following best describes lead tenant’s Asian or Asian British background?" ethnic_background_arab: page_header: "" check_answer_label: "Lead tenant’s ethnic background" + check_answer_prompt: "" 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 the following best describes the lead tenant’s Arab background?" ethnic_background_mixed: page_header: "" check_answer_label: "Lead tenant’s ethnic background" + check_answer_prompt: "" 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 the following best describes lead tenant’s Mixed or Multiple ethnic groups background?" ethnic_background_white: page_header: "" check_answer_label: "Lead tenant’s ethnic background" + check_answer_prompt: "" 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 the following best describes lead tenant’s White background?" national: page_header: "" check_answer_label: "Lead tenant’s nationality" + check_answer_prompt: "" 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 nationality of the lead tenant?" ecstat1: page_header: "" check_answer_label: "Lead tenant’s working situation" + check_answer_prompt: "" 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 working situation?" 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" hint_text: "You must provide details for everyone in the household if you know them." question_text: "Do you know details for person 2?" relat2: page_header: "" check_answer_label: "Person 2’s relationship to the lead tenant" + check_answer_prompt: "" hint_text: "" question_text: "What is person 2’s relationship to the lead tenant?" age2: page_header: "" age2_known: - check_answer_label: "" + check_answer_label: "Person 2’s age" + 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: "" hint_text: "" question_text: "Age" sex2: page_header: "" check_answer_label: "Person 2’s gender identity" + check_answer_prompt: "" hint_text: "" question_text: "Which of these best describes person 2’s gender identity?" ecstat2: page_header: "" check_answer_label: "Person 2’s working situation" + check_answer_prompt: "" hint_text: "" question_text: "Which of these best describes person 2’s working situation?" 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" hint_text: "You must provide details for everyone in the household if you know them." question_text: "Do you know details for person 3?" relat3: page_header: "" check_answer_label: "Person 3’s relationship to the lead tenant" + check_answer_prompt: "" hint_text: "" question_text: "What is person 3’s relationship to the lead tenant?" age3: page_header: "" age3_known: - check_answer_label: "" + check_answer_label: "Person 3’s age" + 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: "" hint_text: "" question_text: "Age" sex3: page_header: "" check_answer_label: "Person 3’s gender identity" + check_answer_prompt: "" hint_text: "" question_text: "Which of these best describes person 3’s gender identity?" ecstat3: page_header: "" check_answer_label: "Person 3’s working situation" + check_answer_prompt: "" hint_text: "" question_text: "Which of these best describes person 3’s working situation?" 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" hint_text: "You must provide details for everyone in the household if you know them." question_text: "Do you know details for person 4?" relat4: page_header: "" check_answer_label: "Person 4’s relationship to the lead tenant" + check_answer_prompt: "" hint_text: "" question_text: "What is person 4’s relationship to the lead tenant?" age4: page_header: "" age4_known: - check_answer_label: "" + check_answer_label: "Person 4’s age" + 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: "" hint_text: "" question_text: "Age" sex4: page_header: "" check_answer_label: "Person 4’s gender identity" + check_answer_prompt: "" hint_text: "" question_text: "Which of these best describes person 4’s gender identity?" ecstat4: page_header: "" check_answer_label: "Person 4’s working situation" + check_answer_prompt: "" hint_text: "" question_text: "Which of these best describes person 4’s working situation?" 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" hint_text: "You must provide details for everyone in the household if you know them." question_text: "Do you know details for person 5?" relat5: page_header: "" check_answer_label: "Person 5’s relationship to the lead tenant" + check_answer_prompt: "" hint_text: "" question_text: "What is person 5’s relationship to the lead tenant?" age5: page_header: "" age5_known: - check_answer_label: "" + check_answer_label: "Person 5’s age" + 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: "" hint_text: "" question_text: "Age" sex5: page_header: "" check_answer_label: "Person 5’s gender identity" + check_answer_prompt: "" hint_text: "" question_text: "Which of these best describes person 5’s gender identity?" ecstat5: page_header: "" check_answer_label: "Person 5’s working situation" + check_answer_prompt: "" hint_text: "" question_text: "Which of these best describes person 5’s working situation?" 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" hint_text: "You must provide details for everyone in the household if you know them." question_text: "Do you know details for person 6?" relat6: page_header: "" check_answer_label: "Person 6’s relationship to the lead tenant" + check_answer_prompt: "" hint_text: "" question_text: "What is person 6’s relationship to the lead tenant?" age6: page_header: "" age6_known: - check_answer_label: "" + check_answer_label: "Person 6’s age" + 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: "" hint_text: "" question_text: "Age" sex6: page_header: "" check_answer_label: "Person 6’s gender identity" + check_answer_prompt: "" hint_text: "" question_text: "Which of these best describes person 6’s gender identity?" ecstat6: page_header: "" check_answer_label: "Person 6’s working situation" + check_answer_prompt: "" hint_text: "" question_text: "Which of these best describes person 6’s working situation?" 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" hint_text: "You must provide details for everyone in the household if you know them." question_text: "Do you know details for person 7?" relat7: page_header: "" check_answer_label: "Person 7’s relationship to the lead tenant" + check_answer_prompt: "" hint_text: "" question_text: "What is person 7’s relationship to the lead tenant?" age7: page_header: "" age7_known: - check_answer_label: "" + check_answer_label: "Person 7’s age" + check_answer_prompt: "Enter person 7's age if known" hint_text: "" question_text: "Do you know person 7’s age?" age7: check_answer_label: "Person 7’s age" + check_answer_prompt: "" hint_text: "" question_text: "Age" sex7: page_header: "" check_answer_label: "Person 7’s gender identity" + check_answer_prompt: "" hint_text: "" question_text: "Which of these best describes person 7’s gender identity?" ecstat7: page_header: "" check_answer_label: "Person 7’s working situation" + check_answer_prompt: "" hint_text: "" question_text: "Which of these best describes person 7’s working situation?" 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" hint_text: "You must provide details for everyone in the household if you know them." question_text: "Do you know details for person 8?" relat8: page_header: "" check_answer_label: "Person 8’s relationship to the lead tenant" + check_answer_prompt: "" hint_text: "" question_text: "What is person 8’s relationship to the lead tenant?" age8: page_header: "" age8_known: - check_answer_label: "" + check_answer_label: "Person 8’s age" + check_answer_prompt: "Enter person 8's age if known" hint_text: "" question_text: "Do you know person 8’s age?" age8: check_answer_label: "Person 8’s age" + check_answer_prompt: "" hint_text: "" question_text: "Age" sex8: page_header: "" check_answer_label: "Person 8’s gender identity" + check_answer_prompt: "" 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" + check_answer_prompt: "" hint_text: "" question_text: "Which of these best describes person 8’s working situation?" diff --git a/config/locales/forms/2023/lettings/household_needs.en.yml b/config/locales/forms/2023/lettings/household_needs.en.yml index 1e1a2823e..2d3dc8a60 100644 --- a/config/locales/forms/2023/lettings/household_needs.en.yml +++ b/config/locales/forms/2023/lettings/household_needs.en.yml @@ -6,30 +6,35 @@ en: armedforces: page_header: "" check_answer_label: "Household links to UK armed forces" + check_answer_prompt: "Tell us if there are any household links to UK armed forces" hint_text: "This excludes national service.

    If there are several people in the household with links to the UK armed forces, you should answer for the regular. If there’s no regular, answer for the reserve. If there’s no reserve, answer for the spouse or civil partner." question_text: "Does anybody in the household have any links to the UK armed forces?" leftreg: page_header: "" check_answer_label: "Person still serving in UK armed forces" + check_answer_prompt: "Tell us if the person is still serving in UK armed forces" hint_text: "" question_text: "Is the person still serving in the UK armed forces?" reservist: page_header: "" check_answer_label: "Person seriously injured or ill as result of serving in UK armed forces" + check_answer_prompt: "Tell us if the person is seriously injured or ill as result of serving in UK armed forces" hint_text: "" question_text: "Was the person seriously injured or ill as a result of serving in the UK armed forces?" preg_occ: page_header: "" check_answer_label: "Anybody in household pregnant" + check_answer_prompt: "Tell us if anybody in the household is pregnant" hint_text: "" question_text: "Is anybody in the household pregnant?" housingneeds: page_header: "" check_answer_label: "Anybody with disabled access needs" + check_answer_prompt: "Tell us if there is anybody with disabled access needs" hint_text: "" question_text: "Does anybody in the household have any disabled access needs?" @@ -37,22 +42,25 @@ en: page_header: "Disabled access needs" housingneeds_type: check_answer_label: "Disabled access needs" + check_answer_prompt: "" hint_text: "" question_text: "What type of access needs do they have?" housingneeds_other: check_answer_label: "Other disabled access needs" + check_answer_prompt: "Tell us if they have any other disabled access needs" hint_text: "" question_text: "Do they have any other disabled access needs?" illness: page_header: "" check_answer_label: "Anybody in household with physical or mental health condition" + check_answer_prompt: "Tell us if anybody in the household has a physical or mental health condition" hint_text: "" question_text: "Does anybody in the household have a physical or mental health condition (or other illness) expected to last 12 months or more?" - + condition_effects: page_header: "" check_answer_label: "How is person affected by condition or illness" + check_answer_prompt: "Select how the person is affected by their condition or illness" hint_text: "Select all that apply." question_text: "How is the person affected by their condition or illness?" - \ No newline at end of file diff --git a/config/locales/forms/2023/lettings/household_situation.en.yml b/config/locales/forms/2023/lettings/household_situation.en.yml index 9e5e50918..0144c98fa 100644 --- a/config/locales/forms/2023/lettings/household_situation.en.yml +++ b/config/locales/forms/2023/lettings/household_situation.en.yml @@ -6,12 +6,14 @@ en: layear: page_header: "" check_answer_label: "Length of time in local authority area" + check_answer_prompt: "" hint_text: "" question_text: "How long has the household continuously lived in the local authority area of the new letting?" waityear: page_header: "" check_answer_label: "Length of time on local authority waiting list" + check_answer_prompt: "" hint_text: "" question_text: "How long has the household been on the local authority waiting list for the new letting?" @@ -20,78 +22,92 @@ en: page_header: "" reason: check_answer_label: "Reason for leaving last settled home" + check_answer_prompt: "" hint_text: "You told us this letting is a renewal. We have removed some options because of this." question_text: "What is the tenant’s main reason for the household leaving their last settled home?" reasonother: check_answer_label: "Length of time on local authority waiting list" + check_answer_prompt: "" hint_text: "" question_text: "How long has the household been on the local authority waiting list for the new letting?" reason_for_leaving_last_settled_home: page_header: "" reason: check_answer_label: "Reason for leaving last settled home" + check_answer_prompt: "" hint_text: "The tenant’s ‘last settled home’ is their last long-standing home. For tenants who were in temporary accommodation or sleeping rough, their last settled home is where they were living previously." question_text: "What is the tenant’s main reason for the household leaving their last settled home?" reasonother: check_answer_label: "" + check_answer_prompt: "" hint_text: "" question_text: "What is the reason?" prevten: renewal: page_header: "" - check_answer_label: "Where was the household immediately before this letting?" + check_answer_label: "Where household was immediately before this letting" + check_answer_prompt: "" hint_text: "You told us this letting is a renewal. We have removed some options because of this.

    This is where the household was the night before they moved into this new let." question_text: "Where was the household immediately before this letting?" not_renewal: page_header: "" - check_answer_label: "Where was the household immediately before this letting?" + check_answer_label: "Where household was immediately before this letting" + check_answer_prompt: "" hint_text: "This is where the household was the night before they moved into this new let." question_text: "Where was the household immediately before this letting?" homeless: page_header: "" check_answer_label: "Household homeless immediately before letting" + check_answer_prompt: "Tell us if household homeless immediately before letting" hint_text: "" question_text: "Did the household experience homelessness immediately before this letting?" previous_postcode: page_header: "" ppcodenk: - check_answer_label: "" + check_answer_label: "Postcode of the household’s last settled accommodation" + check_answer_prompt: "Enter the postcode of the household’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 postcode of the household’s last settled accommodation?" ppostcode_full: check_answer_label: "Postcode of household’s last settled accommodation" + check_answer_prompt: "" hint_text: "" question_text: "Postcode for the previous accommodation" previous_local_authority: page_header: "" previous_la_known: - check_answer_label: "" + 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: check_answer_label: "Location of household’s last settled accommodation" + check_answer_prompt: "" hint_text: "Select ‘Northern Ireland’, ‘Scotland’, ‘Wales’ or ‘Outside the UK’ if the household’s last settled home was outside England." question_text: "Select a local authority" reasonpref: page_header: "" check_answer_label: "Household given reasonable preference" + check_answer_prompt: "Tell us if the household was given reasonable preference" hint_text: "Households may be given ‘reasonable preference’ for social housing, also known as ‘priority need’, by the local authority." question_text: "Was the household given ‘reasonable preference’ by the local authority?" reasonable_preference_reason: page_header: "" check_answer_label: "Reason for reasonable preference" + check_answer_prompt: "" hint_text: "Select all that apply." question_text: "Why was the household given ‘reasonable preference’?" letting_allocation: page_header: "" check_answer_label: "Allocation system" + check_answer_prompt: "" hint_text: "Select all that apply." question_text: "How was this letting allocated?" @@ -100,21 +116,25 @@ en: prp: page_header: "" check_answer_label: "Source of referral for letting" + check_answer_prompt: "" hint_text: "" question_text: "What was the source of referral for this letting?" la: page_header: "" check_answer_label: "Source of referral for letting" + check_answer_prompt: "" hint_text: "You told us that you are a local authority. We have removed some options because of this." question_text: "What was the source of referral for this letting?" general_needs: prp: page_header: "" check_answer_label: "Source of referral for letting" + check_answer_prompt: "" hint_text: "You told us that the needs type is general needs. We have removed some options because of this." question_text: "What was the source of referral for this letting?" la: page_header: "" check_answer_label: "Source of referral for letting" + check_answer_prompt: "" hint_text: "You told us that you are a local authority and that the needs type is general needs. We have removed some options because of this." - question_text: "What was the source of referral for this letting?" \ No newline at end of file + question_text: "What was the source of referral for this letting?" 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 dc5ee5a53..eb6b99f79 100644 --- a/config/locales/forms/2023/lettings/income_and_benefits.en.yml +++ b/config/locales/forms/2023/lettings/income_and_benefits.en.yml @@ -5,42 +5,49 @@ en: income_and_benefits: net_income_known: page_header: "Household’s combined income after tax" - check_answer_label: "Do you know the household’s combined total income after tax?" + check_answer_label: "Household’s combined total income after tax" + check_answer_prompt: "Tell us if you know the household’s combined total income after tax" hint_text: "" question_text: "Do you know the household’s combined income after tax?" income_amount: page_header: "Total household income" incfreq: - check_answer_label: "How often does the household receive this amount?" + check_answer_label: "How often the household receives this amount" + check_answer_prompt: "Tell us how often does the household receives this amount" hint_text: "" question_text: "How often does the household receive this amount?" earnings: check_answer_label: "Total household income" + check_answer_prompt: "" hint_text: "" question_text: "How much income does the household have in total?" hb: page_header: "" - check_answer_label: "Housing-related benefits received" + check_answer_label: "Housing related benefits received" + check_answer_prompt: "Tell us if household receives housing related benefits" hint_text: "" - question_text: "Is the household likely to be receiving any of these housing-related benefits?" + question_text: "Is the household likely to be receiving any of these housing related benefits?" benefits: page_header: "" check_answer_label: "Household income from Universal Credit, state pension or benefit" + check_answer_prompt: "Tell us if household income is from Universal Credit, state pension or benefit" hint_text: "This excludes child and housing benefit, council tax support and tax credits." question_text: "How much of the household’s income is from Universal Credit, state pensions or benefits?" household_charge: page_header: "" check_answer_label: "Does the household pay rent or charges" + check_answer_prompt: "Tell us if the household pay rent or charges" hint_text: "If rent is charged on the property then answer Yes to this question, even if the tenants do not pay it themselves." question_text: "Does the household pay rent or other charges for the accommodation?" period: page_header: "" check_answer_label: "Frequency of household rent and charges" + check_answer_prompt: "" hint_text: "Select how often the household is charged. This may be different to how often they pay." question_text: "How often does the household pay rent and other charges?" @@ -48,22 +55,27 @@ en: page_header: "" is_carehome: check_answer_label: "Care home accommodation" + check_answer_prompt: "Tell us if care home accommodation" hint_text: "" question_text: "Is this accommodation a care home?" chcharge_weekly: check_answer_label: "Care home charges" + check_answer_prompt: "" hint_text: "" question_text: "How much does the household pay every week?" chcharge_bi_weekly: check_answer_label: "Care home charges" + check_answer_prompt: "" hint_text: "" question_text: "How much does the household pay every 2 weeks?" chcharge_4_weekly: check_answer_label: "Care home charges" + check_answer_prompt: "" hint_text: "" question_text: "How much does the household pay every 4 weeks?" chcharge_monthly: check_answer_label: "Care home charges" + check_answer_prompt: "" hint_text: "" question_text: "How much does the household pay every month?" @@ -71,38 +83,46 @@ en: page_header: "Household rent and charges" brent: check_answer_label: "Basic rent" + check_answer_prompt: "" hint_text: "This is the amount paid before any charges are added for services (for example, hot water or cleaning). Households may receive housing benefit or Universal Credit towards basic rent." question_text: "What is the basic rent?" scharge: check_answer_label: "Service charge" + check_answer_prompt: "" hint_text: "For example, for cleaning. Households may receive housing benefit or Universal Credit towards the service charge." question_text: "What is the service charge?" pscharge: check_answer_label: "Personal service charge" + check_answer_prompt: "" hint_text: "For example, for heating or hot water. This doesn’t include housing benefit or Universal Credit." question_text: "What is the personal service charge?" supcharg: check_answer_label: "Support charge" + check_answer_prompt: "" hint_text: "Any charges made to fund support services included in tenancy agreement." question_text: "What is the support charge?" tcharge: check_answer_label: "Household rent and charges" + check_answer_prompt: "" hint_text: "This is the total for rent and all charges." question_text: "Total charge" hbrentshortfall: page_header: "" check_answer_label: "Any outstanding amount for basic rent and charges" + check_answer_prompt: "Tell us if any outstanding amount for basic rent and charges" hint_text: "Also known as the ‘outstanding amount’." - question_text: "After the household has received any housing-related benefits, will they still need to pay for rent and charges?" + question_text: "After the household has received any housing related benefits, will they still need to pay for rent and charges?" outstanding_amount: page_header: "" tshortfall_known: - check_answer_label: "Do you know the outstanding amount?" + check_answer_label: "Outstanding amount known" + check_answer_prompt: "Tell us if you know the outstanding amount" hint_text: "You only need to give an approximate figure." question_text: "Can you estimate the outstanding amount?" tshortfall: check_answer_label: "Estimated outstanding amount" + check_answer_prompt: "" hint_text: "Also known as the ‘outstanding amount’." question_text: "Estimated outstanding amount" diff --git a/config/locales/forms/2023/lettings/property_information.en.yml b/config/locales/forms/2023/lettings/property_information.en.yml index f1b652935..089e29c0e 100644 --- a/config/locales/forms/2023/lettings/property_information.en.yml +++ b/config/locales/forms/2023/lettings/property_information.en.yml @@ -6,17 +6,20 @@ en: uprn: page_header: "" uprn_known: - check_answer_label: "UPRN known?" + 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?" uprn: check_answer_label: "UPRN" + check_answer_prompt: "" hint_text: "" question_text: "What is the property's UPRN?" uprn_confirmed: page_header: "We found an address that might be this property" check_answer_label: "Is this the right address?" + check_answer_prompt: "Tell us if this is the right address" hint_text: "" question_text: "Is this the property address?" @@ -24,81 +27,96 @@ en: 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" hint_text: "" question_text: "Address line 1" address_line2: check_answer_label: "" + check_answer_prompt: "" hint_text: "" question_text: "Address line 2 (optional)" town_or_city: check_answer_label: "Town or city" + check_answer_prompt: "" hint_text: "" question_text: "Town or city" county: check_answer_label: "County" + check_answer_prompt: "" hint_text: "" question_text: "County (optional)" postcode_full: check_answer_label: "Postcode" + check_answer_prompt: "" hint_text: "" question_text: "Postcode" la: page_header: "" check_answer_label: "Local authority" + check_answer_prompt: "" hint_text: "" question_text: "What is the property’s local authority?" first_time_property_let_as_social_housing: page_header: "" - check_answer_label: "First time being let as social-housing?" + 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" hint_text: "" question_text: "Is this the first time the property has been let as social housing?" unitletas: page_header: "" check_answer_label: "Most recent let type" + check_answer_prompt: "" hint_text: "" question_text: "What type was the property most recently let as?" rsnvac: page_header: "" check_answer_label: "Vacancy reason" + check_answer_prompt: "" hint_text: "" question_text: "What is the reason for the property being vacant?" offered: page_header: "" check_answer_label: "Times previously offered since becoming available." + check_answer_prompt: "" hint_text: "Do not include the offer that led to this letting. This is after the last tenancy ended. If the property is being offered for let for the first time, enter 0." question_text: "How many times was the property offered between becoming vacant and this letting?" unittype_gn: page_header: "" check_answer_label: "Type of unit" + check_answer_prompt: "" hint_text: "" question_text: "What type of unit is the property?" builtype: page_header: "" check_answer_label: "Type of building" + check_answer_prompt: "" hint_text: "" question_text: "What type of building is the property?" wchair: page_header: "" check_answer_label: "Property built or adapted to wheelchair-user standards" + check_answer_prompt: "Tell us if property is built or adapted to wheelchair-user standards" hint_text: "" question_text: "Is the property built or adapted to wheelchair-user standards?" beds: page_header: "" check_answer_label: "Number of bedrooms" + check_answer_prompt: "" hint_text: "If shared accommodation, enter the number of bedrooms occupied by this household. A bedsit has 1 bedroom." question_text: "How many bedrooms does the property have?" voiddate: page_header: "Void date" check_answer_label: "Void date" + check_answer_prompt: "" hint_text: "" question_text: "What is the void date?" diff --git a/config/locales/forms/2023/lettings/setup.en.yml b/config/locales/forms/2023/lettings/setup.en.yml index 5df98796a..c4927532e 100644 --- a/config/locales/forms/2023/lettings/setup.en.yml +++ b/config/locales/forms/2023/lettings/setup.en.yml @@ -6,30 +6,35 @@ en: owning_organisation_id: page_header: "" check_answer_label: "Stock owner" + check_answer_prompt: "" hint_text: "" question_text: "Which organisation owns this property?" managing_organisation_id: page_header: "" check_answer_label: "Managing agent" + check_answer_prompt: "" hint_text: "" question_text: "Which organisation manages this letting?" assigned_to_id: page_header: "" check_answer_label: "Log owner" + check_answer_prompt: "Select user" hint_text: "" question_text: "Which user are you creating this log for?" needstype: page_header: "" check_answer_label: "Needs type" + check_answer_prompt: "" hint_text: "General needs housing includes both self-contained and shared housing without support or specific adaptations. Supported housing can include direct access hostels, group homes, residential care and nursing homes." question_text: "What is the needs type?" scheme_id: page_header: "Scheme" check_answer_label: "Scheme name" + check_answer_prompt: "" hint_text: "Enter postcode or scheme name" question_text: "What scheme is this log for?" @@ -37,23 +42,27 @@ en: less_than_twenty: page_header: "Location" check_answer_label: "Location" + check_answer_prompt: "" hint_text: "" question_text: "Which location is this letting for?" twenty_or_more: page_header: "Location" check_answer_label: "Location" + check_answer_prompt: "" hint_text: '
    This scheme has 20 or more locations.
    Enter postcode or address.' question_text: "Which location is this letting for?" renewal: page_header: "" check_answer_label: "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?" startdate: page_header: "" check_answer_label: "Tenancy start date" + check_answer_prompt: "" hint_text: "" question_text: "What is the tenancy start date?" @@ -61,21 +70,25 @@ en: page_header: "Rent Type" rent_type: check_answer_label: "Rent type" + check_answer_prompt: "" hint_text: "" question_text: "What is the rent type?" irproduct_other: check_answer_label: "Product name" + check_answer_prompt: "" hint_text: "" question_text: "Name of rent product" tenancycode: page_header: "" check_answer_label: "Tenant code" + check_answer_prompt: "" hint_text: "This is how you usually refer to this tenancy on your own systems." question_text: "What is the tenant code?" propcode: page_header: "" check_answer_label: "Property reference" + check_answer_prompt: "" hint_text: "This is how you usually refer to this property on your own systems." question_text: "What is the property reference?" diff --git a/config/locales/forms/2023/lettings/soft_validations.en.yml b/config/locales/forms/2023/lettings/soft_validations.en.yml index d0354f127..450547f72 100644 --- a/config/locales/forms/2023/lettings/soft_validations.en.yml +++ b/config/locales/forms/2023/lettings/soft_validations.en.yml @@ -7,6 +7,7 @@ en: no_females_pregnant_household_value_check: page_header: "" check_answer_label: "Pregnancy confirmation" + check_answer_prompt: "Confirm pregnancy answer" hint_text: "" question_text: "Are you sure this is correct?" title_text: "You told us somebody in the household is pregnant." @@ -14,119 +15,134 @@ en: females_in_soft_age_range_in_pregnant_household_value_check: page_header: "" check_answer_label: "Pregnancy confirmation" + check_answer_prompt: "Confirm pregnancy status" hint_text: "" question_text: "Are you sure this is correct?" title_text: "You told us somebody in the household is pregnant." informative_text: "You also told us that any female tenants living at the property are in the following age ranges:" no_retirement_value_check: - page_header: "" - check_answer_label: "Retirement confirmation" - hint_text: "" - question_text: "Are you sure this person is retired?" - title_text: "You told us this person is aged %{age} years and retired." - informative_text: "The minimum expected retirement age in England is 66." + page_header: "" + check_answer_label: "Retirement confirmation" + check_answer_prompt: "Confirm retirement status" + hint_text: "" + question_text: "Are you sure this person is retired?" + title_text: "You told us this person is aged %{age} years and retired." + informative_text: "The minimum expected retirement age in England is 66." retirement_value_check: - page_header: "" - check_answer_label: "Retirement confirmation" - hint_text: "" - 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: "" + page_header: "" + check_answer_label: "Retirement confirmation" + check_answer_prompt: "Confirm retirement status" + hint_text: "" + 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: "" partner_under_16_value_check: - page_header: "" - check_answer_label: "Partner under 16 confirmation" - 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." - informative_text: "Are you sure this is correct?" + page_header: "" + check_answer_label: "Partner under 16 confirmation" + 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." + informative_text: "Are you sure this is correct?" multiple_partners_value_check: - page_header: "" - check_answer_label: "Multiple partners confirmation" - hint_text: "" - question_text: "Are you sure this is correct?" - title_text: "You told us there are more than 1 persons with 'Partner' relationship to the lead tenant." - informative_text: "Are you sure this is correct?" + page_header: "" + check_answer_label: "Multiple partners confirmation" + check_answer_prompt: "Confirm multiple partners" + hint_text: "" + question_text: "Are you sure this is correct?" + title_text: "You told us there are more than 1 persons with 'Partner' relationship to the lead tenant." + informative_text: "Are you sure this is correct?" reasonother_value_check: - page_header: "" - check_answer_label: "Reason other confirmation" - hint_text: "" - question_text: "Are you sure this doesn’t fit an existing category?" - title_text: "You told us that the tenant’s main reason for leaving their last settled home was %{reasonother}." - informative_text: "The reason you have entered looks very similar to one of the existing response categories. Please check the categories and select the appropriate one. If the existing categories are not suitable, please confirm here to move onto the next question." + page_header: "" + check_answer_label: "Reason other confirmation" + check_answer_prompt: "Confirm reason for leaving" + hint_text: "" + question_text: "Are you sure this doesn’t fit an existing category?" + title_text: "You told us that the tenant’s main reason for leaving their last settled home was %{reasonother}." + informative_text: "The reason you have entered looks very similar to one of the existing response categories. Please check the categories and select the appropriate one. If the existing categories are not suitable, please confirm here to move onto the next question." referral_value_check: - page_header: "" - check_answer_label: "Referral confirmation" - hint_text: "" - question_text: "Are you sure?" - title_text: "Are you sure?" - informative_text: "This is a general needs log, and this referral type is for supported housing." + page_header: "" + check_answer_label: "Referral confirmation" + check_answer_prompt: "Confirm referral type" + hint_text: "" + question_text: "Are you sure?" + title_text: "Are you sure?" + informative_text: "This is a general needs log, and this referral type is for supported housing." net_income_value_check: - page_header: "" - check_answer_label: "Net income confirmation" - hint_text: "" - question_text: "Are you sure this is correct?" - title_text: "You told us that the household’s income is %{earnings} %{incfreq}." - informative_text: "This is %{net_income_higher_or_lower_text} than we would expect for the household’s working situation." + page_header: "" + check_answer_label: "Net income confirmation" + check_answer_prompt: "Confirm net income" + hint_text: "" + question_text: "Are you sure this is correct?" + title_text: "You told us that the household’s income is %{earnings} %{incfreq}." + informative_text: "This is %{net_income_higher_or_lower_text} than we would expect for the household’s working situation." care_home_charges_value_check: - page_header: "" - check_answer_label: "Care home charges confirmation" - hint_text: "" - question_text: "Are you sure there are no care home charges?" - title_text: "Care home charges should be provided if this is a care home accommodation." - informative_text: "Are you sure there are no care home charges?" + page_header: "" + check_answer_label: "Care home charges confirmation" + check_answer_prompt: "Confirm care home charges" + hint_text: "" + question_text: "Are you sure there are no care home charges?" + title_text: "Care home charges should be provided if this is a care home accommodation." + informative_text: "Are you sure there are no care home charges?" rent_value_check: - page_header: "" - check_answer_label: "Total rent confirmation" - hint_text: "Check the following:" - question_text: "Are you sure this is correct?" - title_text: "You told us the rent is %{brent}." - informative_text: "This is %{higher_or_lower} than we would expect." + page_header: "" + check_answer_label: "Total rent confirmation" + check_answer_prompt: "Confirm total rent" + hint_text: "Check the following:" + question_text: "Are you sure this is correct?" + title_text: "You told us the rent is %{brent}." + informative_text: "This is %{higher_or_lower} than we would expect." scharge_value_check: - page_header: "" - check_answer_label: "Service charge confirmation" - hint_text: "Check the following:" - question_text: "Are you sure?" - title_text: "You told us the service charge is %{scharge}." - informative_text: "This is higher than we would expect." + page_header: "" + check_answer_label: "Service charge confirmation" + check_answer_prompt: "Confirm service charge" + hint_text: "Check the following:" + question_text: "Are you sure?" + title_text: "You told us the service charge is %{scharge}." + informative_text: "This is higher than we would expect." pscharge_value_check: - page_header: "" - check_answer_label: "Personal service charge confirmation" - hint_text: "Check the following:" - question_text: "Are you sure?" - title_text: "You told us the personal service charge is %{pscharge}." - informative_text: "This is higher than we would expect." + page_header: "" + check_answer_label: "Personal service charge confirmation" + check_answer_prompt: "Confirm personal service charge" + hint_text: "Check the following:" + question_text: "Are you sure?" + title_text: "You told us the personal service charge is %{pscharge}." + informative_text: "This is higher than we would expect." supcharg_value_check: - page_header: "" - check_answer_label: "Support charge confirmation" - hint_text: "Check the following:" - question_text: "Are you sure?" - title_text: "You told us the support charge is %{supcharg}." - informative_text: "This is higher than we would expect." + page_header: "" + check_answer_label: "Support charge confirmation" + check_answer_prompt: "Confirm support charge" + hint_text: "Check the following:" + question_text: "Are you sure?" + title_text: "You told us the support charge is %{supcharg}." + informative_text: "This is higher than we would expect." void_date_value_check: - page_header: "" - check_answer_label: "Void date confirmation" - hint_text: "" - question_text: "Are you sure the property has been vacant for this long?" - title_text: "You told us that the property has been vacant for more than 2 years." - informative_text: "This is higher than we would expect." + page_header: "" + check_answer_label: "Void date confirmation" + check_answer_prompt: "Confirm void date" + hint_text: "" + question_text: "Are you sure the property has been vacant for this long?" + title_text: "You told us that the property has been vacant for more than 2 years." + informative_text: "This is higher than we would expect." major_repairs_date_value_check: - page_header: "" - check_answer_label: "Major repairs date confirmation" - hint_text: "" - question_text: "Are you sure the property has been vacant for this long?" - title_text: "You told us the property has been vacant for 2 years." - informative_text: "This is higher than we would expect." + page_header: "" + check_answer_label: "Major repairs date confirmation" + check_answer_prompt: "Confirm major repairs date" + hint_text: "" + question_text: "Are you sure the property has been vacant for this long?" + title_text: "You told us the property has been vacant for 2 years." + informative_text: "This is higher than we would expect." diff --git a/config/locales/forms/2023/lettings/tenancy_information.en.yml b/config/locales/forms/2023/lettings/tenancy_information.en.yml index e9331d4dc..ba9dfd4d2 100644 --- a/config/locales/forms/2023/lettings/tenancy_information.en.yml +++ b/config/locales/forms/2023/lettings/tenancy_information.en.yml @@ -5,13 +5,15 @@ en: tenancy_information: joint: page_header: "" - check_answer_label: "Is this a joint tenancy?" + check_answer_label: "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: "Is this a starter or introductory tenancy?" + check_answer_label: "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?" @@ -20,20 +22,24 @@ en: page_header: "" tenancy: check_answer_label: "Type of main tenancy" + check_answer_prompt: "" hint_text: "" question_text: "What is the type of tenancy?" tenancyother: check_answer_label: "" + check_answer_prompt: "" hint_text: "" question_text: "Please state the tenancy type" starter_tenancy_type: page_header: "" tenancy: check_answer_label: "Type of main tenancy after the starter period has ended" + check_answer_prompt: "" hint_text: "This is also known as an ‘introductory period’." question_text: "What is the type of tenancy after the starter period has ended?" tenancyother: check_answer_label: "" + check_answer_prompt: "" hint_text: "" question_text: "Please state the tenancy type" @@ -41,26 +47,31 @@ en: tenancy_length: page_header: "" check_answer_label: "Length of fixed-term tenancy" + check_answer_prompt: "" hint_text: "Do not include the starter or introductory period." question_text: "What is the length of the fixed-term tenancy to the nearest year?" tenancy_length_affordable_rent: page_header: "" check_answer_label: "Length of fixed-term tenancy" + check_answer_prompt: "" hint_text: "Do not include the starter or introductory period.
    The minimum period is 2 years for social or affordable rent general needs logs and you do not need a log for shorter tenancies." question_text: "What is the length of the fixed-term tenancy to the nearest year?" tenancy_length_intermediate_rent: page_header: "" check_answer_label: "Length of fixed-term tenancy" + check_answer_prompt: "" hint_text: "Do not include the starter or introductory period.
    The minimum period is 1 year for intermediate rent general needs logs and you do not need a log for shorter tenancies." question_text: "What is the length of the fixed-term tenancy to the nearest year?" tenancy_length_periodic: page_header: "" check_answer_label: "Length of periodic tenancy" + check_answer_prompt: "" hint_text: "As this is a periodic tenancy, this question is optional. If you do not have the information available click save and continue" question_text: "What is the length of the periodic tenancy to the nearest year?" sheltered: page_header: "" - check_answer_label: "Is this letting in sheltered accommodation?" + check_answer_label: "Letting in sheltered accommodation" + check_answer_prompt: "Tell us if letting is in sheltered accommodation" hint_text: "Sheltered housing and special retirement housing are for tenants with low-level care and support needs. This typically provides some limited support to enable independent living, such as alarm-based assistance or a scheme manager.

    Extra care housing is for tenants with medium to high care and support needs, often with 24 hour access to support staff provided by an agency registered with the Care Quality Commission." question_text: "Is this letting in sheltered accommodation?" diff --git a/config/locales/forms/2023/sales/household_characteristics.en.yml b/config/locales/forms/2023/sales/household_characteristics.en.yml index ed03bc698..94871e918 100644 --- a/config/locales/forms/2023/sales/household_characteristics.en.yml +++ b/config/locales/forms/2023/sales/household_characteristics.en.yml @@ -4,26 +4,30 @@ en: sales: household_characteristics: noint: - joint_purchase: - page_header: "" - check_answer_label: "Buyers interviewed in person?" - hint_text: "You should still try to answer all questions even if the buyers weren’t interviewed in person" - question_text: "Were the buyers interviewed for any of the answers you will provide on this log?" - not_joint_purchase: - page_header: "" - check_answer_label: "Buyer interviewed in person?" - hint_text: "You should still try to answer all questions even if the buyer wasn’t interviewed in person" - question_text: "Was the buyer interviewed for any of the answers you will provide on this log?" + joint_purchase: + page_header: "" + check_answer_label: "Buyers interviewed in person" + check_answer_prompt: "Tell us if buyers interviewed in person" + hint_text: "You should still try to answer all questions even if the buyers weren’t interviewed in person" + question_text: "Were the buyers interviewed for any of the answers you will provide on this log?" + not_joint_purchase: + page_header: "" + check_answer_label: "Buyer interviewed in person" + check_answer_prompt: "Tell us if buyer interviewed in person" + hint_text: "You should still try to answer all questions even if the buyer wasn’t interviewed in person" + question_text: "Was the buyer interviewed for any of the answers you will provide on this log?" privacynotice: joint_purchase: page_header: "" - check_answer_label: "Buyers have seen the privacy notice?" + check_answer_label: "Buyers have seen the privacy notice" + check_answer_prompt: "Tell us if buyers have seen the privacy notice" hint_text: "" question_text: "Declaration" not_joint_purchase: page_header: "" - check_answer_label: "Buyer has seen the privacy notice?" + check_answer_label: "Buyer has seen the privacy notice" + check_answer_prompt: "Tell us if buyer has seen the privacy notice" hint_text: "" question_text: "Declaration" @@ -31,22 +35,26 @@ en: page_header: "" age1_known: check_answer_label: "Buyer 1’s age" + 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" hint_text: "" question_text: "Age" sex1: page_header: "" check_answer_label: "Buyer 1’s gender identity" + 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 gender identity?" ethnic_group: page_header: "" check_answer_label: "Buyer 1’s ethnic group" + 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: "What is buyer 1’s ethnic group?" @@ -54,44 +62,52 @@ en: ethnic_background_black: page_header: "" check_answer_label: "Buyer 1’s ethnic background" + 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 the following best describes buyer 1’s Black, African, Caribbean or Black British background?" ethnic_background_asian: page_header: "" check_answer_label: "Buyer 1’s ethnic background" + 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 the following best describes buyer 1’s Asian or Asian British background?" ethnic_background_arab: page_header: "" check_answer_label: "Buyer 1’s ethnic background" + 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 the following best describes buyer 1’s Arab background?" ethnic_background_mixed: page_header: "" check_answer_label: "Buyer 1’s ethnic background" + 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 the following best describes buyer 1’s Mixed or Multiple ethnic groups background?" ethnic_background_white: page_header: "" check_answer_label: "Buyer 1’s ethnic background" + 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 the following best describes buyer 1’s White background?" national: page_header: "" check_answer_label: "Buyer 1’s nationality" + 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: "What is buyer 1’s nationality?" ecstat1: page_header: "" 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?" buy1livein: page_header: "" - check_answer_label: "Will buyer 1 live in the property?" + check_answer_label: "Buyer 1 lives in the property" + check_answer_prompt: "Tell us if buyer 1 lives in the property" 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: "Will buyer 1 live in the property?" @@ -99,11 +115,13 @@ en: buyer: page_header: "" 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?" person: page_header: "" check_answer_label: "Person 2’s relationship to buyer 1" + check_answer_prompt: "" hint_text: "" question_text: "What is person 2’s relationship to buyer 1?" @@ -112,20 +130,24 @@ en: page_header: "" age2_known: check_answer_label: "Buyer 2’s age" + 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" hint_text: "" question_text: "Age" person: page_header: "" age2_known: - check_answer_label: "Person 2’s age known?" + check_answer_label: "Person 2’s age" + check_answer_prompt: "Enter person 2's age if known" hint_text: "" question_text: "Do you know person 2’s age?" - age: + age2: check_answer_label: "Person 2’s age" + check_answer_prompt: "Enter person 2's age" hint_text: "" question_text: "Age" @@ -133,50 +155,59 @@ en: buyer: page_header: "" check_answer_label: "Buyer 2’s gender identity" + check_answer_prompt: "" hint_text: "" question_text: "Which of these best describes buyer 2’s gender identity?" person: page_header: "" check_answer_label: "Person 2’s gender identity" + check_answer_prompt: "" hint_text: "" 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?" + page_header: "" + check_answer_label: "Buyer 2’s ethnic group" + check_answer_prompt: "" + hint_text: "" + question_text: "What is buyer 2’s ethnic group?" ethnicbuy2: ethnic_background_black: page_header: "" check_answer_label: "Buyer 2’s ethnic background" + check_answer_prompt: "" hint_text: "" question_text: "Which of the following best describes buyer 2’s Black, African, Caribbean or Black British background?" ethnic_background_asian: page_header: "" check_answer_label: "Buyer 2’s ethnic background" + check_answer_prompt: "" hint_text: "" question_text: "Which of the following best describes buyer 2’s Asian or Asian British background?" ethnic_background_arab: page_header: "" check_answer_label: "Buyer 2’s ethnic background" + check_answer_prompt: "" hint_text: "" question_text: "Which of the following best describes buyer 2’s Arab background?" ethnic_background_mixed: page_header: "" check_answer_label: "Buyer 2’s ethnic background" + check_answer_prompt: "" hint_text: "" question_text: "Which of the following best describes buyer 2’s Mixed or Multiple ethnic groups background?" ethnic_background_white: page_header: "" check_answer_label: "Buyer 2’s ethnic background" + check_answer_prompt: "" hint_text: "" question_text: "Which of the following best describes buyer 2’s White background?" nationalbuy2: page_header: "" check_answer_label: "Buyer 2’s nationality" + check_answer_prompt: "" hint_text: "" question_text: "What is buyer 2’s nationality?" @@ -184,17 +215,20 @@ en: buyer: page_header: "" 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?" person: page_header: "" check_answer_label: "Person 2’s working situation" + check_answer_prompt: "" hint_text: "" 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?" + check_answer_label: "Buyer 2 lives in the property" + check_answer_prompt: "Tell us if buyer 2 lives in the property" hint_text: "" question_text: "Will buyer 2 live in the property?" @@ -202,156 +236,183 @@ en: joint_purchase: page_header: "" check_answer_label: "Number of other people living in the property" + check_answer_prompt: "" hint_text: "You can provide details for a maximum of 4 other people for a joint purchase." question_text: "Besides the buyers, how many other people live or will live in the property?" not_joint_purchase: page_header: "" check_answer_label: "Number of other people living in the property" + check_answer_prompt: "" hint_text: "You can provide details for a maximum of 5 other people if there is only one buyer." question_text: "Besides the buyer, how many other people live or will live in the property?" 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" 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" hint_text: "" question_text: "Do you know the details for person 3?" relat3: page_header: "" check_answer_label: "Person 3’s relationship to buyer 1" + check_answer_prompt: "" hint_text: "" question_text: "What is person 3’s relationship to buyer 1?" age3: page_header: "" age3_known: - check_answer_label: "Person 3’s age known?" + check_answer_label: "Person 3’s age" + 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" hint_text: "" question_text: "Age" sex3: page_header: "" check_answer_label: "Person 3’s gender identity" + check_answer_prompt: "" hint_text: "" question_text: "Which of these best describes person 3’s gender identity?" ecstat3: page_header: "" check_answer_label: "Person 3’s working situation" + check_answer_prompt: "" hint_text: "" question_text: "Which of these best describes person 3’s working situation?" 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" hint_text: "" question_text: "Do you know the details for person 4?" relat4: page_header: "" check_answer_label: "Person 4’s relationship to buyer 1" + check_answer_prompt: "" hint_text: "" question_text: "What is person 4’s relationship to buyer 1?" age4: page_header: "" age4_known: - check_answer_label: "Person 4’s age known?" + check_answer_label: "Person 4’s age" + 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" hint_text: "" question_text: "Age" sex4: page_header: "" check_answer_label: "Person 4’s gender identity" + check_answer_prompt: "" hint_text: "" question_text: "Which of these best describes person 4’s gender identity?" ecstat4: page_header: "" check_answer_label: "Person 4’s working situation" + check_answer_prompt: "" hint_text: "" question_text: "Which of these best describes person 4’s working situation?" 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" hint_text: "" question_text: "Do you know the details for person 5?" relat5: page_header: "" check_answer_label: "Person 5’s relationship to buyer 1" + check_answer_prompt: "" hint_text: "" question_text: "What is person 5’s relationship to buyer 1?" age5: page_header: "" age5_known: - check_answer_label: "Person 5’s age known?" + check_answer_label: "Person 5’s age" + 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" hint_text: "" question_text: "Age" sex5: page_header: "" check_answer_label: "Person 5’s gender identity" + check_answer_prompt: "" hint_text: "" question_text: "Which of these best describes person 5’s gender identity?" ecstat5: page_header: "" check_answer_label: "Person 5’s working situation" + check_answer_prompt: "" hint_text: "" question_text: "Which of these best describes person 5’s working situation?" 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" hint_text: "" question_text: "Do you know the details for person 6?" relat6: page_header: "" check_answer_label: "Person 6’s relationship to buyer 1" + check_answer_prompt: "" hint_text: "" question_text: "What is person 6’s relationship to buyer 1?" age6: page_header: "" age6_known: - check_answer_label: "Person 6’s age known?" + check_answer_label: "Person 6’s age" + 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" hint_text: "" question_text: "Age" sex6: page_header: "" check_answer_label: "Person 6’s gender identity" + check_answer_prompt: "" hint_text: "" question_text: "Which of these best describes person 6’s gender identity?" ecstat6: page_header: "" check_answer_label: "Person 6’s working situation" + check_answer_prompt: "" hint_text: "" question_text: "Which of these best describes person 6’s working situation?" diff --git a/config/locales/forms/2023/sales/household_situation.en.yml b/config/locales/forms/2023/sales/household_situation.en.yml index e22777a28..63131b772 100644 --- a/config/locales/forms/2023/sales/household_situation.en.yml +++ b/config/locales/forms/2023/sales/household_situation.en.yml @@ -6,17 +6,20 @@ en: prevten: page_header: "" check_answer_label: "Buyer 1’s previous tenure" + check_answer_prompt: "" hint_text: "" question_text: "What was buyer 1’s previous tenure?" last_accommodation: page_header: "" ppcodenk: - check_answer_label: "Buyer 1’s last settled accommodation" + check_answer_label: "Postcode of buyer 1’s last settled accommodation" + check_answer_prompt: "Enter the postcode 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 postcode of buyer 1’s last settled accommodation?" ppostcode_full: check_answer_label: "Postcode of buyer 1’s last settled accommodation" + check_answer_prompt: "" hint_text: "" question_text: "Postcode" @@ -24,27 +27,32 @@ 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" 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: check_answer_label: "Local authority of buyer 1’s last settled accommodation" + check_answer_prompt: "" hint_text: "" question_text: "Select a local authority" buyers_organisations: page_header: "" check_answer_label: "Organisations buyers were registered with" + check_answer_prompt: "" hint_text: "Select all that apply. This question is optional. If no options are applicable, leave the options blank, and select save and continue." question_text: "What organisations were the buyers registered with?" buy2living: page_header: "" check_answer_label: "Buyer 2 living at the same address" + check_answer_prompt: "" hint_text: "" header: "At the time of purchase, was buyer 2 living at the same address as buyer 1?" prevtenbuy2: page_header: "" check_answer_label: "Buyer 2’s previous tenure" + check_answer_prompt: "" hint_text: "" question_text: "What was buyer 2’s previous tenure?" 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 689c611cb..939849e48 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 @@ -6,68 +6,78 @@ en: buyer_1_income: page_header: "" income1nk: - check_answer_label: "Buyer 1’s gross annual income known?" + check_answer_label: "Buyer 1’s gross annual income 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: check_answer_label: "Buyer 1’s gross annual income" + check_answer_prompt: "" 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" + check_answer_prompt: "Tell us if buyer 1’s income used for a mortgage application" hint_text: "" question_text: "Was buyer 1’s income used for a mortgage application?" buyer_2_income: page_header: "" income2nk: - check_answer_label: "Buyer 2’s gross annual income known?" + check_answer_label: "Buyer 2’s gross annual income 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: check_answer_label: "Buyer 2’s gross annual income" + check_answer_prompt: "" 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 2’s gross annual income" 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" + check_answer_prompt: "" hint_text: "" question_text: "Was buyer 2’s income used for a mortgage application?" housing_benefits: joint_purchase: page_header: "" - check_answer_label: "Housing-related benefits buyers received before buying this property" + check_answer_label: "Housing related benefits buyers received before buying this property" hint_text: "" - question_text: "Were the buyers receiving any of these housing-related benefits immediately before buying this property?" + question_text: "Were the buyers receiving any of these housing related benefits immediately before buying this property?" not_joint_purchase: page_header: "" - check_answer_label: "Housing-related benefits buyer received before buying this property" + 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?" + 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" + 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: check_answer_label: "Buyers’ total savings before any deposit paid" + check_answer_prompt: "" hint_text: "Include any savings, investments, ISAs, premium bonds, shares, or money held in a bank or building society account." question_text: "Enter their total savings to the nearest £10" not_joint_purchase: page_header: "" savingsnk: - check_answer_label: "Buyer’s total savings known?" + check_answer_label: "Buyer’s total savings" + 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: check_answer_label: "Buyer’s total savings before any deposit paid" + check_answer_prompt: "" hint_text: "Include any savings, investments, ISAs, premium bonds, shares, or money held in a bank or building society account." question_text: "Enter their total savings to the nearest £10" @@ -75,16 +85,19 @@ en: joint_purchase: page_header: "" check_answer_label: "Buyers previously owned a property." + check_answer_prompt: "" hint_text: "" question_text: "Have any of the buyers previously owned a property?" not_joint_purchase: page_header: "" - check_answer_label: "Buyer previously owned a property." + check_answer_label: "Buyer previously owned a property" + check_answer_prompt: "Tell us if the buyer previously owned a property" hint_text: "" question_text: "Has the buyer previously owned a property?" prevshared: page_header: "" - check_answer_label: "Previous property shared ownership?" + check_answer_label: "Previous property shared ownership" + check_answer_prompt: "Tell us if the previous property was shared ownership" hint_text: "For any buyer" question_text: "Was the previous property under shared ownership?" 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 6d96ca46e..b26aa3e9c 100644 --- a/config/locales/forms/2023/sales/other_household_information.en.yml +++ b/config/locales/forms/2023/sales/other_household_information.en.yml @@ -5,30 +5,35 @@ en: other_household_information: hhregres: page_header: "" - check_answer_label: "Have any of the buyers ever served as a regular in the UK armed forces?" + check_answer_label: "Any buyer has served as regulars in the UK armed forces" + check_answer_prompt: "Tell us if any buyer has ever served as a regular in the UK armed forces" hint_text: "A regular is somebody who has served in the Royal Navy, the Royal Marines, the Royal Airforce or Army full time and does not include reserve forces" question_text: "Have any of the buyers ever served as a regular in the UK armed forces?" hhregresstill: page_header: "" - check_answer_label: "Are they still serving in the UK armed forces?" + check_answer_label: "Buyer still serving in the UK armed forces" + check_answer_prompt: "Tell us if the buyer is still serving in the UK armed forces" hint_text: "" question_text: "Is the buyer still serving in the UK armed forces?" armedforcesspouse: page_header: "" - check_answer_label: "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?" + check_answer_label: "Any buyer is a spouse or civil partner of a UK armed forces regular who died in service within the last 2 years" + check_answer_prompt: "Tell us if any buyers are a spouse or civil partner of a UK armed forces regular who died in service within the last 2 years" hint_text: "" question_text: "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?" disabled: page_header: "" - check_answer_label: "Does anyone in the household have a disability?" + 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" question_text: "Does anyone in the household consider themselves to have a disability?" wheel: page_header: "" - check_answer_label: "Does anyone in the household use a wheelchair?" + check_answer_label: "Household member uses a wheelchair" + check_answer_prompt: "Tell us if someone uses a wheelchair" hint_text: "This can be inside or outside the home" question_text: "Does anyone in the household use a wheelchair?" diff --git a/config/locales/forms/2023/sales/property_information.en.yml b/config/locales/forms/2023/sales/property_information.en.yml index c4dd84130..d74af46e3 100644 --- a/config/locales/forms/2023/sales/property_information.en.yml +++ b/config/locales/forms/2023/sales/property_information.en.yml @@ -6,17 +6,20 @@ en: uprn: page_header: "" uprn_known: - check_answer_label: "UPRN known?" + 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?" uprn: check_answer_label: "UPRN" + check_answer_prompt: "" hint_text: "" question_text: "What is the property's UPRN?" uprn_confirmed: page_header: "We found an address that might be this property" check_answer_label: "Is this the right address?" + check_answer_prompt: "Tell us if this is the right address" hint_text: "" question_text: "Is this the property address?" @@ -24,51 +27,61 @@ en: 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" hint_text: "" question_text: "Address line 1" address_line2: check_answer_label: "" + check_answer_prompt: "" hint_text: "" question_text: "Address line 2 (optional)" town_or_city: check_answer_label: "Town or city" + check_answer_prompt: "" hint_text: "" question_text: "Town or city" county: check_answer_label: "County" + check_answer_prompt: "" hint_text: "" question_text: "County (optional)" postcode_full: check_answer_label: "Postcode" + check_answer_prompt: "" hint_text: "" question_text: "Postcode" la: page_header: "" check_answer_label: "Local authority" + check_answer_prompt: "" hint_text: "" question_text: "What is the property’s local authority?" beds: page_header: "" check_answer_label: "Number of bedrooms" + check_answer_prompt: "" hint_text: "A bedsit has 1 bedroom." question_text: "How many bedrooms does the property have?" proptype: page_header: "" check_answer_label: "Type of unit" + check_answer_prompt: "" hint_text: "" question_text: "What type of unit is the property?" builtype: page_header: "" check_answer_label: "Type of building" + check_answer_prompt: "" hint_text: "" question_text: "What type of building is the property?" wchair: page_header: "" check_answer_label: "Property built or adapted to wheelchair-user standards" + check_answer_prompt: "Tell us if property is built or adapted to wheelchair-user standards" hint_text: "" question_text: "Is the property built or adapted to wheelchair-user standards?" diff --git a/config/locales/forms/2023/sales/sale_information.en.yml b/config/locales/forms/2023/sales/sale_information.en.yml index 24f767026..137e95a87 100644 --- a/config/locales/forms/2023/sales/sale_information.en.yml +++ b/config/locales/forms/2023/sales/sale_information.en.yml @@ -8,172 +8,202 @@ en: page_header: "" proplen: check_answer_label: "Number of years living in the property before purchase" + check_answer_prompt: "" hint_text: "You should round up to the nearest year" question_text: "How long did they live there?" proplen_asked: check_answer_label: "Buyers lived in the property before purchasing" + check_answer_prompt: "Tell us if buyers lived in the property before purchase" hint_text: "" question_text: "Did the buyers live in the property before purchasing it?" not_joint_purchase: page_header: "" proplen: check_answer_label: "Number of years living in the property before purchase" + check_answer_prompt: "" hint_text: "You should round up to the nearest year" question_text: "How long did they live there?" proplen_asked: check_answer_label: "Buyer lived in the property before purchasing" + check_answer_prompt: "Tell us if the buyer lived in the property before purchasing" hint_text: "" question_text: "Did the buyer live in the property before purchasing it?" staircasing: page_header: "" check_answer_label: "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: - page_header: "About the staircasing transaction" - stairbought: - check_answer_label: "Percentage bought in this staircasing transaction" + page_header: "About the staircasing transaction" + stairbought: + check_answer_label: "Percentage bought in this staircasing transaction" + check_answer_prompt: "" + hint_text: "" + question_text: "What percentage of the property has been bought in this staircasing transaction?" + stairowned: + joint_purchase: + check_answer_label: "Percentage the buyers now own in total" + check_answer_prompt: "" + hint_text: "" + question_text: "What percentage of the property do the buyers now own in total?" + not_joint_purchase: + check_answer_label: "Percentage the buyer now owns in total" + check_answer_prompt: "" hint_text: "" - question_text: "What percentage of the property has been bought in this staircasing transaction?" - stairowned: - joint_purchase: - check_answer_label: "Percentage the buyers now own in total" - hint_text: "" - question_text: "What percentage of the property do the buyers now own in total?" - not_joint_purchase: - check_answer_label: "Percentage the buyer now owns in total" - hint_text: "" - question_text: "What percentage of the property does the buyer now own in total?" + question_text: "What percentage of the property does the buyer now own in total?" resale: page_header: "" - check_answer_label: "Is this a resale?" + check_answer_label: "Resale" + check_answer_prompt: "Tell us if this is a resale" hint_text: "If the social landlord has previously sold the property to another buyer and is now reselling the property, select 'yes'. If this is the first time the property has been sold, select 'no'." question_text: "Is this a resale?" exchange_date: page_header: "" check_answer_label: "Exchange of contracts date" + check_answer_prompt: "" hint_text: "" question_text: "What is the exchange of contracts date?" handover_date: page_header: "" check_answer_label: "Practical completion or handover date" + check_answer_prompt: "" hint_text: "This is the date on which the building contractor hands over responsibility for the completed property to the private registered provider (PRP)" question_text: "What is the practical completion or handover date?" la_nominations: page_header: "" - check_answer_label: "Household rehoused under a local authority nominations agreement?" + check_answer_label: "Household rehoused under a local authority nominations agreement" + check_answer_prompt: "Tell us if 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: "" - check_answer_label: "Any buyers were registered providers, housing association or local authority tenants immediately before this sale?" + check_answer_label: "Buyers were registered providers, housing association or local authority tenants immediately before this sale" + check_answer_prompt: "Tell us if buyers were registered providers, housing association or local authority tenants" hint_text: "" question_text: "Were any of the buyers private registered providers, housing association or local authority tenants immediately before this sale?" not_joint_purchase: page_header: "" - check_answer_label: "Buyer was a registered provider, housing association or local authority tenant immediately before this sale?" + check_answer_label: "Buyer was a registered provider, housing association or local authority tenant immediately before this sale" + check_answer_prompt: "Tell us if buyer was a registered provider, housing association or local authority tenant" hint_text: "" question_text: "Was the buyer a private registered provider, housing association or local authority tenant immediately before this sale?" frombeds: page_header: "" check_answer_label: "Number of bedrooms in previous property" + check_answer_prompt: "" hint_text: "A bedsit has 1 bedroom." question_text: "How many bedrooms did the property have?" fromprop: page_header: "" check_answer_label: "Previous property type" + check_answer_prompt: "" hint_text: "" question_text: "What was the previous property type?" socprevten: page_header: "" check_answer_label: "Previous property tenure" + check_answer_prompt: "" hint_text: "" question_text: "What was the previous tenure of the buyer?" value: page_header: "About the price of the property" check_answer_label: "Full purchase price" + check_answer_prompt: "" hint_text: "Enter the full purchase price of the property before any discounts are applied. For shared ownership, enter the full purchase price paid for 100% equity (this is equal to the value of the share owned by the PRP plus the value bought by the purchaser)" question_text: "What was the full purchase price?" equity: page_header: "About the price of the property" check_answer_label: "Initial percentage equity stake" + check_answer_prompt: "" hint_text: "Enter the amount of initial equity held by the purchaser (for example, 25% or 50%)" question_text: "What was the initial percentage equity stake purchased?" mortgageused: page_header: "" check_answer_label: "Mortgage used" + check_answer_prompt: "Tell us if a mortgage was used" hint_text: "" question_text: "Was a mortgage used for the purchase of this property?" mortgage: page_header: "" check_answer_label: "Mortgage amount" + check_answer_prompt: "" 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?" mortgagelender: page_header: "" check_answer_label: "Mortgage lender" + check_answer_prompt: "" hint_text: "" question_text: "What is the name of the mortgage lender?" mortgagelenderother: page_header: "" check_answer_label: "Other Mortgage Lender" + check_answer_prompt: "" hint_text: "" question_text: "What is the other mortgage lender?" mortlen: page_header: "" check_answer_label: "Length of mortgage" + check_answer_prompt: "" hint_text: "You should round up to the nearest year. Value should not exceed 60 years." question_text: "What is the length of the mortgage?" extrabor: page_header: "" - check_answer_label: "Any other borrowing?" + check_answer_label: "Any other borrowing" + check_answer_prompt: "Tell us if there is any other borrowing" hint_text: "" question_text: "Does this include any extra borrowing?" deposit: page_header: "About the deposit" check_answer_label: "Deposit amount" + check_answer_prompt: "" hint_text: "Enter the total cash sum paid by the buyer towards the property that was not funded by the mortgage. This excludes any grant or loan" question_text: "How much cash deposit was paid on the property?" cashdis: page_header: "About the deposit" check_answer_label: "Cash discount through SocialHomeBuy" + check_answer_prompt: "" hint_text: "Enter the total cash discount given on the property being purchased through the Social HomeBuy scheme" question_text: "How much cash discount was given through Social HomeBuy?" mrent: page_header: "" check_answer_label: "Monthly rent" + check_answer_prompt: "" hint_text: "Amount paid before any charges" question_text: "What is the basic monthly rent?" leaseholdcharges: page_header: "" has_mscharge: - check_answer_label: "Does the property have any monthly leasehold charges?" + check_answer_label: "Property has monthly leasehold charges" + check_answer_prompt: "Tell us if the property has any monthly leasehold charges" hint_text: "For example, service and management charges" question_text: "Does the property have any monthly leasehold charges?" mscharge: check_answer_label: "Monthly leasehold charges" + check_answer_prompt: "" hint_text: "" question_text: "Enter the total monthly charge" @@ -181,28 +211,32 @@ en: shared_ownership: page_header: "About the price of the property" check_answer_label: "Purchase price" + check_answer_prompt: "" hint_text: "For all schemes, including Right to Acquire (RTA), Right to Buy (RTB), Voluntary Right to Buy (VRTB) or Preserved Right to Buy (PRTB) sales, enter the full price of the property without any discount" question_text: "What is the full purchase price?" discounted_ownership: page_header: "About the price of the property" check_answer_label: "Purchase price" + check_answer_prompt: "" hint_text: "For all schemes, including Right to Acquire (RTA), Right to Buy (RTB), Voluntary Right to Buy (VRTB) or Preserved Right to Buy (PRTB) sales, enter the full price of the property without any discount" question_text: "What is the full purchase price?" outright_sale: page_header: "About the price of the property" check_answer_label: "Purchase price" + check_answer_prompt: "" hint_text: "" question_text: "What is the full purchase price?" discount: page_header: "About the price of the property" check_answer_label: "Percentage discount" + check_answer_prompt: "" 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" + check_answer_prompt: "" 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?" - diff --git a/config/locales/forms/2023/sales/setup.en.yml b/config/locales/forms/2023/sales/setup.en.yml index 05e53ce8b..9d13f131b 100644 --- a/config/locales/forms/2023/sales/setup.en.yml +++ b/config/locales/forms/2023/sales/setup.en.yml @@ -6,36 +6,42 @@ en: owning_organisation_id: page_header: "" check_answer_label: "Owning organisation" + check_answer_prompt: "" hint_text: "" question_text: "Which organisation owns this log?" managing_organisation_id: page_header: "" check_answer_label: "Reported by" + check_answer_prompt: "Select reporting organisation" hint_text: "" question_text: "Which organisation is reporting this sale?" assigned_to_id: page_header: "" check_answer_label: "Log owner" + check_answer_prompt: "Select user" hint_text: "" question_text: "Which user are you creating this log for?" saledate: page_header: "" check_answer_label: "Sale completion date" + check_answer_prompt: "" hint_text: "" question_text: "What is the sale completion date?" purchid: page_header: "" check_answer_label: "Purchaser code" + check_answer_prompt: "" hint_text: "This is how you usually refer to the purchaser on your own systems." question_text: "What is the purchaser code?" ownershipsch: page_header: "" check_answer_label: "Purchase made under ownership scheme" + check_answer_prompt: "Tell us if purchase made under ownership scheme" hint_text: "" question_text: "Was this purchase made through an ownership scheme?" @@ -43,68 +49,80 @@ en: shared_ownership: page_header: "Type of shared ownership sale" check_answer_label: "Type of shared ownership sale" + check_answer_prompt: "" hint_text: "A shared ownership sale is when the purchaser buys up to 75% of the property value and pays rent to the Private Registered Provider (PRP) on the remaining portion" question_text: "What is the type of shared ownership sale?" discounted_ownership: page_header: "Type of discounted ownership sale" check_answer_label: "Type of discounted ownership sale" + check_answer_prompt: "" hint_text: "" question_text: "What is the type of discounted ownership sale?" outright_ownership: page_header: "Type of outright sale" type: check_answer_label: "Type of outright sale" + check_answer_prompt: "" hint_text: "" question_text: "What is the type of outright sale?" othtype: check_answer_label: "Type of other sale" + check_answer_prompt: "" hint_text: "" question_text: "What type of sale is it?" companybuy: page_header: "" check_answer_label: "Company buyer" + check_answer_prompt: "" hint_text: "" question_text: "Is the buyer a company?" buylivein: page_header: "" check_answer_label: "Buyers living in property" + check_answer_prompt: "Tell us if buyers live in the property" hint_text: "" question_text: "Will the buyers live in the property?" jointpur: page_header: "" check_answer_label: "Joint purchase" + check_answer_prompt: "Tell us if joint purchase" hint_text: "" question_text: "Is this a joint purchase?" jointmore: page_header: "" check_answer_label: "More than 2 joint buyers" + check_answer_prompt: "Tell us if there are more than 2 joint buyers" hint_text: "You should still try to answer all questions even if the buyers weren’t interviewed in person" question_text: "Are there more than 2 joint buyers of this property?" noint: joint_purchase: page_header: "" - check_answer_label: "Buyers interviewed in person?" + check_answer_label: "Buyers interviewed in person" + check_answer_prompt: "Tell us if buyers interviewed in person" hint_text: "You should still try to answer all questions even if the buyers weren’t interviewed in person" question_text: "Were the buyers interviewed for any of the answers you will provide on this log?" not_joint_purchase: page_header: "" - check_answer_label: "Buyer interviewed in person?" + check_answer_label: "Buyer interviewed in person" + check_answer_prompt: "Tell us if buyer interviewed in person" hint_text: "You should still try to answer all questions even if the buyer wasn’t interviewed in person" question_text: "Was the buyer interviewed for any of the answers you will provide on this log?" privacynotice: joint_purchase: page_header: "" - check_answer_label: "Buyers have seen the privacy notice?" + check_answer_label: "Buyers have seen the privacy notice" + check_answer_prompt: "Tell us if buyers have seen the privacy notice" hint_text: "" question_text: "Declaration" not_joint_purchase: page_header: "" - check_answer_label: "Buyer has seen the privacy notice?" + check_answer_label: "Buyer has seen the privacy notice" + check_answer_prompt: "Tell us if buyer has seen the privacy notice" hint_text: "" question_text: "Declaration" diff --git a/config/locales/forms/2023/sales/soft_validations.en.yml b/config/locales/forms/2023/sales/soft_validations.en.yml index abe77ccef..e61dd1cbe 100644 --- a/config/locales/forms/2023/sales/soft_validations.en.yml +++ b/config/locales/forms/2023/sales/soft_validations.en.yml @@ -7,6 +7,7 @@ en: max: page_header: "" check_answer_label: "Retirement confirmation" + check_answer_prompt: "" hint_text: "" question_text: "Are you sure this person isn't retired?" title_text: "You told us this person is over 66 and not retired." @@ -14,6 +15,7 @@ en: min: page_header: "" check_answer_label: "Retirement confirmation" + check_answer_prompt: "" hint_text: "" question_text: "Are you sure this person is retired?" title_text: "You told us this person is aged %{age} years and retired." @@ -22,6 +24,7 @@ en: old_persons_shared_ownership_value_check: page_header: "" check_answer_label: "Shared ownership confirmation" + check_answer_prompt: "" hint_text: "" question_text: "Are you sure this is correct?" title_text: @@ -31,6 +34,7 @@ en: income1_value_check: check_answer_label: "Buyer 1 income confirmation" + check_answer_prompt: "" hint_text: "" question_text: "Are you sure this is correct?" ecstat: @@ -43,6 +47,7 @@ en: income2_value_check: check_answer_label: "Buyer 2 income confirmation" + check_answer_prompt: "" hint_text: "" question_text: "Are you sure this is correct?" ecstat: @@ -56,6 +61,7 @@ en: combined_income_value_check: page_header: "" check_answer_label: "Combined income confirmation" + check_answer_prompt: "" hint_text: "" question_text: "Are you sure this is correct?" title_text: "You told us the combined income of this household is %{combined_income}. This seems high. Are you sure this is correct?" @@ -63,6 +69,7 @@ en: mortgage_value_check: page_header: "" check_answer_label: "Mortgage confirmation" + check_answer_prompt: "" hint_text: "" question_text: "Are you sure that the mortgage is more than 5 times the income used for the mortgage application?" title_text: "You told us that the mortgage amount is %{mortgage}." @@ -71,6 +78,7 @@ en: savings_value_check: page_header: "" check_answer_label: "Savings confirmation" + check_answer_prompt: "" hint_text: "" question_text: "Are you sure the savings are higher than £100,000?" joint_purchase: @@ -83,6 +91,7 @@ en: staircase_bought_value_check: page_header: "" check_answer_label: "Percentage bought confirmation" + check_answer_prompt: "" hint_text: "" question_text: "Are you sure this is correct?" title_text: "You told us that %{percentage}% was bought in this staircasing transaction." @@ -92,6 +101,7 @@ en: joint_purchase: page_header: "" check_answer_label: "Percentage owned confirmation" + check_answer_prompt: "" hint_text: "" question_text: "Are you sure?" title_text: "You told us that the buyers now own %{stairowned} of the property." @@ -99,6 +109,7 @@ en: not_joint_purchase: page_header: "" check_answer_label: "Percentage owned confirmation" + check_answer_prompt: "" hint_text: "" question_text: "Are you sure?" title_text: "You told us that the buyer now owns %{stairowned} of the property." @@ -107,6 +118,7 @@ en: hodate_check: page_header: "" check_answer_label: "Practical completion or handover date check" + check_answer_prompt: "" hint_text: "" question_text: "Are you sure?" title_text: "You told us practical completion or handover date is more than 3 years before sale completion date." @@ -114,6 +126,7 @@ en: value_value_check: page_header: "" check_answer_label: "Purchase price confirmation" + check_answer_prompt: "" hint_text: "" question_text: "Are you sure?" title_text: "You told us the purchase price is %{value}." @@ -122,6 +135,7 @@ en: shared_ownership_deposit_value_check: page_header: "" check_answer_label: "Shared ownership deposit confirmation" + check_answer_prompt: "" hint_text: "" question_text: "Are you sure this is correct?" title_text: "You told us that the %{mortgage_deposit_and_discount_error_fields} add up to %{mortgage_deposit_and_discount_total}." @@ -130,6 +144,7 @@ en: joint_purchase: page_header: "" check_answer_label: "Deposit confirmation" + check_answer_prompt: "" hint_text: "" 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}." @@ -137,6 +152,7 @@ en: not_joint_purchase: page_header: "" check_answer_label: "Deposit confirmation" + check_answer_prompt: "" hint_text: "" 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}." @@ -144,7 +160,8 @@ en: wheel_value_check: page_header: "" - check_answer_label: "Does anyone in the household use a wheelchair?" + check_answer_label: "Household member uses a wheelchair" + check_answer_prompt: "Tell us if someone uses a wheelchair" hint_text: "" question_text: "You told us that someone in the household uses a wheelchair." title_text: "You told us that someone in the household uses a wheelchair." @@ -153,6 +170,7 @@ en: buyer1: page_header: "" check_answer_label: "Buyer live in confirmation" + check_answer_prompt: "" hint_text: "" question_text: "Are you sure this is correct?" title_text: "You told us that buyer 1 will not live in the property." @@ -160,6 +178,7 @@ en: buyer2: page_header: "" check_answer_label: "Buyer live in confirmation" + check_answer_prompt: "" hint_text: "" question_text: "Are you sure this is correct?" title_text: "You told us that buyer 2 will not live in the property." @@ -168,6 +187,7 @@ en: student_not_child_value_check: page_header: "" check_answer_label: "Student not a child confirmation" + check_answer_prompt: "" hint_text: "" question_text: "Are you sure this person is not a child?" title_text: "You told us this person is a student aged between 16 and 19." @@ -176,6 +196,7 @@ en: partner_under_16_value_check: page_header: "" check_answer_label: "Partner under 16 confirmation" + check_answer_prompt: "" 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." @@ -184,6 +205,7 @@ en: multiple_partners_value_check: page_header: "" check_answer_label: "Multiple partners confirmation" + check_answer_prompt: "" hint_text: "" question_text: "Are you sure this is correct?" title_text: "You told us there are more than 1 persons with 'Partner' relationship to buyer 1." @@ -192,6 +214,7 @@ en: monthly_charges_value_check: page_header: "" check_answer_label: "Monthly charges confirmation" + check_answer_prompt: "" hint_text: "" question_text: "Are you sure this is correct?" title_text: "You told us that the monthly charges were %{mscharge}." @@ -200,6 +223,7 @@ en: extra_borrowing_value_check: page_header: "" check_answer_label: "Extra borrowing confirmation" + check_answer_prompt: "" hint_text: "" question_text: "Are you sure there is no extra borrowing?" title_text: "You told us that the mortgage and deposit total is %{mortgage_and_deposit_total}." @@ -208,6 +232,7 @@ en: percentage_discount_value_check: page_header: "" check_answer_label: "Percentage discount confirmation" + check_answer_prompt: "" hint_text: "" question_text: "Are you sure this is correct?" title_text: "You told us that the percentage discount is %{discount}." @@ -216,6 +241,7 @@ en: grant_value_check: page_header: "" check_answer_label: "Grant value confirmation" + check_answer_prompt: "" hint_text: "" question_text: "Are you sure? Grants are usually £9,000 - £16,000" title_text: "You told us that the grant amount is %{grant}." @@ -224,6 +250,7 @@ en: discounted_sale_value_check: page_header: "" check_answer_label: "Discounted sale value confirmation" + check_answer_prompt: "" hint_text: "" question_text: "Are you sure this is correct?" title_text: "Mortgage, deposit, and grant total must equal %{value_with_discount}." @@ -232,6 +259,7 @@ en: deposit_and_mortgage_value_check: page_header: "" check_answer_label: "Deposit and mortgage against discount confirmation" + check_answer_prompt: "" hint_text: "" question_text: "Are you sure? Mortgage and deposit usually equal or are more than (value - discount)" title_text: "You told us the mortgage amount was %{mortgage}, the cash deposit was %{deposit} and the discount was %{discount}." diff --git a/config/locales/forms/2024/lettings/household_characteristics.en.yml b/config/locales/forms/2024/lettings/household_characteristics.en.yml index 0537a82bd..574777f21 100644 --- a/config/locales/forms/2024/lettings/household_characteristics.en.yml +++ b/config/locales/forms/2024/lettings/household_characteristics.en.yml @@ -6,29 +6,34 @@ en: hhmemb: page_header: "" check_answer_label: "Number of household members" + check_answer_prompt: "Enter total number of household members" hint_text: "You can provide details for a maximum of 8 people." question_text: "How many people live in the household for this letting?" age1: page_header: "" age1_known: - check_answer_label: "" + 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: check_answer_label: "Lead tenant’s age" + check_answer_prompt: "" hint_text: "" question_text: "Age" sex1: page_header: "" check_answer_label: "Lead tenant’s gender identity" + check_answer_prompt: "" 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" + check_answer_prompt: "" hint_text: "" question_text: "What is the lead tenant’s ethnic group?" @@ -36,26 +41,31 @@ en: ethnic_background_black: page_header: "" check_answer_label: "Lead tenant’s ethnic background" + check_answer_prompt: "" hint_text: "" question_text: "Which of the following best describes lead tenant’s Black, African, Caribbean or Black British background?" ethnic_background_asian: page_header: "" check_answer_label: "Lead tenant’s ethnic background" + check_answer_prompt: "" hint_text: "" question_text: "Which of the following best describes lead tenant’s Asian or Asian British background?" ethnic_background_arab: page_header: "" check_answer_label: "Lead tenant’s ethnic background" + check_answer_prompt: "" hint_text: "" question_text: "Which of the following best describes the lead tenant’s Arab background?" ethnic_background_mixed: page_header: "" check_answer_label: "Lead tenant’s ethnic background" + check_answer_prompt: "" hint_text: "" question_text: "Which of the following best describes lead tenant’s Mixed or Multiple ethnic groups background?" ethnic_background_white: page_header: "" check_answer_label: "Lead tenant’s ethnic background" + check_answer_prompt: "" hint_text: "" question_text: "Which of the following best describes lead tenant’s White background?" @@ -63,260 +73,305 @@ en: page_header: "" nationality_all: check_answer_label: "Lead tenant’s nationality" + check_answer_prompt: "" hint_text: "" question_text: "Enter a nationality" nationality_all_group: check_answer_label: "Lead tenant’s nationality" + check_answer_prompt: "" hint_text: "If the lead tenant is a dual national of the United Kingdom and another country, enter United Kingdom. If they are a dual national of two other countries, the tenant should decide which country to enter." question_text: "What is the nationality of the lead tenant?" ecstat1: page_header: "" check_answer_label: "Lead tenant’s working situation" + check_answer_prompt: "" hint_text: "" question_text: "Which of these best describes the lead tenant’s working situation?" 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" hint_text: "You must provide details for everyone in the household if you know them." question_text: "Do you know details for person 2?" relat2: page_header: "" check_answer_label: "Person 2’s relationship to the lead tenant" + check_answer_prompt: "" hint_text: "" question_text: "What is person 2’s relationship to the lead tenant?" age2: page_header: "" age2_known: - check_answer_label: "" + check_answer_label: "Person 2’s age" + 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: "" hint_text: "Answer 1 for children aged under 1 year old" question_text: "Age" sex2: page_header: "" check_answer_label: "Person 2’s gender identity" + check_answer_prompt: "" 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?" ecstat2: page_header: "" check_answer_label: "Person 2’s working situation" + check_answer_prompt: "" hint_text: "" question_text: "Which of these best describes person 2’s working situation?" 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" hint_text: "You must provide details for everyone in the household if you know them." question_text: "Do you know details for person 3?" relat3: page_header: "" check_answer_label: "Person 3’s relationship to the lead tenant" + check_answer_prompt: "" hint_text: "" question_text: "What is person 3’s relationship to the lead tenant?" age3: page_header: "" age3_known: - check_answer_label: "" + check_answer_label: "Person 3’s age" + 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: "" hint_text: "Answer 1 for children aged under 1 year old" question_text: "Age" sex3: page_header: "" check_answer_label: "Person 3’s gender identity" + check_answer_prompt: "" 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?" ecstat3: page_header: "" check_answer_label: "Person 3’s working situation" + check_answer_prompt: "" hint_text: "" question_text: "Which of these best describes person 3’s working situation?" 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" hint_text: "You must provide details for everyone in the household if you know them." question_text: "Do you know details for person 4?" relat4: page_header: "" check_answer_label: "Person 4’s relationship to the lead tenant" + check_answer_prompt: "" hint_text: "" question_text: "What is person 4’s relationship to the lead tenant?" age4: page_header: "" age4_known: - check_answer_label: "" + check_answer_label: "Person 4’s age" + 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: "" hint_text: "Answer 1 for children aged under 1 year old" question_text: "Age" sex4: page_header: "" check_answer_label: "Person 4’s gender identity" + check_answer_prompt: "" 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?" ecstat4: page_header: "" check_answer_label: "Person 4’s working situation" + check_answer_prompt: "" hint_text: "" question_text: "Which of these best describes person 4’s working situation?" 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" hint_text: "You must provide details for everyone in the household if you know them." question_text: "Do you know details for person 5?" relat5: page_header: "" check_answer_label: "Person 5’s relationship to the lead tenant" + check_answer_prompt: "" hint_text: "" question_text: "What is person 5’s relationship to the lead tenant?" age5: page_header: "" age5_known: - check_answer_label: "" + check_answer_label: "Person 5’s age" + 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: "" hint_text: "Answer 1 for children aged under 1 year old" question_text: "Age" sex5: page_header: "" check_answer_label: "Person 5’s gender identity" + check_answer_prompt: "" 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?" ecstat5: page_header: "" check_answer_label: "Person 5’s working situation" + check_answer_prompt: "" hint_text: "" question_text: "Which of these best describes person 5’s working situation?" 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" hint_text: "You must provide details for everyone in the household if you know them." question_text: "Do you know details for person 6?" relat6: page_header: "" check_answer_label: "Person 6’s relationship to the lead tenant" + check_answer_prompt: "" hint_text: "" question_text: "What is person 6’s relationship to the lead tenant?" age6: page_header: "" age6_known: - check_answer_label: "" + check_answer_label: "Person 6’s age" + 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: "" hint_text: "Answer 1 for children aged under 1 year old" question_text: "Age" sex6: page_header: "" check_answer_label: "Person 6’s gender identity" + check_answer_prompt: "" 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?" ecstat6: page_header: "" check_answer_label: "Person 6’s working situation" + check_answer_prompt: "" hint_text: "" question_text: "Which of these best describes person 6’s working situation?" 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" hint_text: "You must provide details for everyone in the household if you know them." question_text: "Do you know details for person 7?" relat7: page_header: "" check_answer_label: "Person 7’s relationship to the lead tenant" + check_answer_prompt: "" hint_text: "" question_text: "What is person 7’s relationship to the lead tenant?" age7: page_header: "" age7_known: - check_answer_label: "" + check_answer_label: "Person 7’s age" + check_answer_prompt: "Enter person 7's age if known" hint_text: "" question_text: "Do you know person 7’s age?" age7: check_answer_label: "Person 7’s age" + check_answer_prompt: "" hint_text: "Answer 1 for children aged under 1 year old" question_text: "Age" sex7: page_header: "" check_answer_label: "Person 7’s gender identity" + check_answer_prompt: "" 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 7’s gender identity?" ecstat7: page_header: "" check_answer_label: "Person 7’s working situation" + check_answer_prompt: "" hint_text: "" question_text: "Which of these best describes person 7’s working situation?" 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" hint_text: "You must provide details for everyone in the household if you know them." question_text: "Do you know details for person 8?" relat8: page_header: "" check_answer_label: "Person 8’s relationship to the lead tenant" + check_answer_prompt: "" hint_text: "" question_text: "What is person 8’s relationship to the lead tenant?" age8: page_header: "" age8_known: - check_answer_label: "" + check_answer_label: "Person 8’s age" + check_answer_prompt: "Enter person 8's age if known" hint_text: "" question_text: "Do you know person 8’s age?" age8: check_answer_label: "Person 8’s age" + check_answer_prompt: "" hint_text: "Answer 1 for children aged under 1 year old" question_text: "Age" sex8: page_header: "" check_answer_label: "Person 8’s gender identity" + check_answer_prompt: "" 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 8’s gender identity?" ecstat8: page_header: "" check_answer_label: "Person 8’s working situation" + check_answer_prompt: "" hint_text: "" question_text: "Which of these best describes person 8’s working situation?" diff --git a/config/locales/forms/2024/lettings/household_needs.en.yml b/config/locales/forms/2024/lettings/household_needs.en.yml index d934be355..3f1150dca 100644 --- a/config/locales/forms/2024/lettings/household_needs.en.yml +++ b/config/locales/forms/2024/lettings/household_needs.en.yml @@ -6,30 +6,35 @@ en: armedforces: page_header: "" check_answer_label: "Household links to UK armed forces" + check_answer_prompt: "Tell us if there are any household links to UK armed forces" hint_text: "This excludes national service.

    If there are several people in the household with links to the UK armed forces, you should answer for the regular. If there’s no regular, answer for the reserve. If there’s no reserve, answer for the spouse or civil partner." question_text: "Does anybody in the household have any links to the UK armed forces?" leftreg: page_header: "" check_answer_label: "Person still serving in UK armed forces" + check_answer_prompt: "Tell us if the person is still serving in UK armed forces" hint_text: "" question_text: "Is the person still serving in the UK armed forces?" reservist: page_header: "" check_answer_label: "Person seriously injured or ill as result of serving in UK armed forces" + check_answer_prompt: "Tell us if the person is seriously injured or ill as result of serving in UK armed forces" hint_text: "" question_text: "Was the person seriously injured or ill as a result of serving in the UK armed forces?" preg_occ: page_header: "" check_answer_label: "Anybody in household pregnant" + check_answer_prompt: "Tell us if anybody in the household is pregnant" hint_text: "" question_text: "Is anybody in the household pregnant?" housingneeds: page_header: "" check_answer_label: "Anybody with disabled access needs" + check_answer_prompt: "Tell us if there is anybody with disabled access needs" hint_text: "" question_text: "Does anybody in the household have any disabled access needs?" @@ -37,22 +42,25 @@ en: page_header: "Disabled access needs" housingneeds_type: check_answer_label: "Disabled access needs" + check_answer_prompt: "" hint_text: "" question_text: "What type of access needs do they have?" housingneeds_other: check_answer_label: "Other disabled access needs" + check_answer_prompt: "Tell us if they have any other disabled access needs" hint_text: "" question_text: "Do they have any other disabled access needs?" illness: page_header: "" check_answer_label: "Anybody in household with physical or mental health condition" + check_answer_prompt: "Tell us if anybody in the household has a physical or mental health condition" hint_text: "" question_text: "Does anybody in the household have a physical or mental health condition (or other illness) expected to last 12 months or more?" - + condition_effects: page_header: "" check_answer_label: "How is person affected by condition or illness" + check_answer_prompt: "Select how the person is affected by their condition or illness" hint_text: "Select all that apply." question_text: "How is the person affected by their condition or illness?" - \ No newline at end of file diff --git a/config/locales/forms/2024/lettings/household_situation.en.yml b/config/locales/forms/2024/lettings/household_situation.en.yml index e1bf4c0ce..dcad41178 100644 --- a/config/locales/forms/2024/lettings/household_situation.en.yml +++ b/config/locales/forms/2024/lettings/household_situation.en.yml @@ -6,12 +6,14 @@ en: layear: page_header: "" check_answer_label: "Length of time in local authority area" + check_answer_prompt: "" hint_text: "" question_text: "How long has the household continuously lived in the local authority area of the new letting?" waityear: page_header: "" check_answer_label: "Length of time on local authority waiting list" + check_answer_prompt: "" hint_text: "" question_text: "How long has the household been on the local authority waiting list for the area of the new letting?" @@ -20,78 +22,92 @@ en: page_header: "" reason: check_answer_label: "Reason for leaving last settled home" + check_answer_prompt: "" hint_text: "You told us this letting is a renewal. We have removed some options because of this." question_text: "What is the tenant’s main reason for the household leaving their last settled home?" reasonother: check_answer_label: "Length of time on local authority waiting list" + check_answer_prompt: "" hint_text: "" question_text: "How long has the household been on the local authority waiting list for the area of the new letting?" reason_for_leaving_last_settled_home: page_header: "" reason: check_answer_label: "Reason for leaving last settled home" + check_answer_prompt: "" hint_text: "The tenant’s ‘last settled home’ is their last long-standing home. For tenants who were in temporary accommodation, sleeping rough or otherwise homeless, their last settled home is where they were living previously." question_text: "What is the tenant’s main reason for the household leaving their last settled home?" reasonother: check_answer_label: "" + check_answer_prompt: "" hint_text: "" question_text: "What is the reason?" prevten: renewal: page_header: "" - check_answer_label: "Where was the household immediately before this letting?" + check_answer_label: "Where household was immediately before this letting" + check_answer_prompt: "" hint_text: "You told us this letting is a renewal. We have removed some options because of this.

    This is where the household was the night before they moved into this new let." question_text: "Where was the household immediately before this letting?" not_renewal: page_header: "" - check_answer_label: "Where was the household immediately before this letting?" + check_answer_label: "Where household was immediately before this letting" + check_answer_prompt: "" hint_text: "This is where the household was the night before they moved into this new let." question_text: "Where was the household immediately before this letting?" homeless: page_header: "" check_answer_label: "Household homeless immediately before letting" + check_answer_prompt: "Tell us if household homeless immediately before letting" hint_text: "" question_text: "Did the household experience homelessness immediately before this letting?" previous_postcode: page_header: "" ppcodenk: - check_answer_label: "" + check_answer_label: "Postcode of the household’s last settled accommodation" + check_answer_prompt: "Enter the postcode of the household’s last settled accommodation if known" hint_text: "This is the tenant’s last long-standing home. It is where the tenant was living before any period in temporary accommodation, sleeping rough or otherwise homeless." question_text: "Do you know the postcode of the household’s last settled accommodation?" ppostcode_full: check_answer_label: "Postcode of household’s last settled accommodation" + check_answer_prompt: "" hint_text: "" question_text: "Postcode for the previous accommodation" previous_local_authority: page_header: "" previous_la_known: - check_answer_label: "" + 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 the tenant’s last long-standing home. It is where the tenant was living before any period in temporary accommodation, sleeping rough or otherwise homeless." question_text: "Do you know the local authority of the household’s last settled accommodation?" prevloc: check_answer_label: "Location of household’s last settled accommodation" + check_answer_prompt: "" hint_text: "Select ‘Northern Ireland’, ‘Scotland’, ‘Wales’ or ‘Outside the UK’ if the household’s last settled home was outside England." question_text: "Select a local authority" reasonpref: page_header: "" check_answer_label: "Household given reasonable preference" + check_answer_prompt: "Tell us if the household was given reasonable preference" hint_text: "Households may be given ‘reasonable preference’ for social housing under one or more specific categories by the local authority. This is also known as ‘priority need’." question_text: "Was the household given ‘reasonable preference’ by the local authority?" reasonable_preference_reason: page_header: "" check_answer_label: "Reason for reasonable preference" + check_answer_prompt: "" hint_text: "Select all that apply." question_text: "Why was the household given ‘reasonable preference’?" letting_allocation: page_header: "" check_answer_label: "Allocation system" + check_answer_prompt: "" hint_text: "Select all that apply." question_text: "How was this letting allocated?" @@ -100,21 +116,25 @@ en: prp: page_header: "" check_answer_label: "Source of referral for letting" + check_answer_prompt: "" hint_text: "" question_text: "What was the source of referral for this letting?" la: page_header: "" check_answer_label: "Source of referral for letting" + check_answer_prompt: "" hint_text: "You told us that you are a local authority. We have removed some options because of this." question_text: "What was the source of referral for this letting?" general_needs: prp: page_header: "" check_answer_label: "Source of referral for letting" + check_answer_prompt: "" hint_text: "You told us that the needs type is general needs. We have removed some options because of this." question_text: "What was the source of referral for this letting?" la: page_header: "" check_answer_label: "Source of referral for letting" + check_answer_prompt: "" hint_text: "You told us that you are a local authority and that the needs type is general needs. We have removed some options because of this." - question_text: "What was the source of referral for this letting?" \ No newline at end of file + question_text: "What was the source of referral for this letting?" 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 8e364f611..3d65b4c4b 100644 --- a/config/locales/forms/2024/lettings/income_and_benefits.en.yml +++ b/config/locales/forms/2024/lettings/income_and_benefits.en.yml @@ -5,42 +5,49 @@ en: income_and_benefits: net_income_known: page_header: "Household’s combined income after tax" - check_answer_label: "Do you know the household’s combined total income after tax?" + check_answer_label: "Household’s combined total income after tax" + check_answer_prompt: "Tell us if you know the household’s combined total income after tax" hint_text: "" question_text: "Do you know the household’s combined income after tax?" income_amount: page_header: "Total household income" incfreq: - check_answer_label: "How often does the household receive this amount?" + check_answer_label: "How often the household receives this amount" + check_answer_prompt: "Tell us how often does the household receives this amount" hint_text: "" question_text: "How often does the household receive this amount?" earnings: check_answer_label: "Total household income" + check_answer_prompt: "" hint_text: "" question_text: "How much income does the household have in total?" hb: page_header: "" - check_answer_label: "Housing-related benefits received" - hint_text: "This is about when the tenant is in their new let. If they are unsure about the situation for their new let and their financial and working situation hasn’t changed significantly, answer based on what housing-related benefits they currently receive." - question_text: "Is the household likely to be receiving any of these housing-related benefits?" + check_answer_label: "Housing related benefits received" + check_answer_prompt: "Tell us if household receives housing related benefits" + hint_text: "This is about when the tenant is in their new let. If they are unsure about the situation for their new let and their financial and working situation hasn’t changed significantly, answer based on what housing related benefits they currently receive." + question_text: "Is the household likely to be receiving any of these housing related benefits?" benefits: page_header: "" check_answer_label: "Household income from Universal Credit, state pension or benefit" + check_answer_prompt: "Tell us if household income is from Universal Credit, state pension or benefit" hint_text: "This excludes child and housing benefit, council tax support and tax credits." question_text: "How much of the household’s income is from Universal Credit, state pensions or benefits?" household_charge: page_header: "" check_answer_label: "Does the household pay rent or charges" + check_answer_prompt: "Tell us if the household pay rent or charges" hint_text: "If rent is charged on the property then answer Yes to this question, even if the tenants do not pay it themselves." question_text: "Does the household pay rent or other charges for the accommodation?" period: page_header: "" check_answer_label: "Frequency of household rent and charges" + check_answer_prompt: "" hint_text: "Select how often the household is charged. This may be different to how often they pay." question_text: "How often does the household pay rent and other charges?" @@ -48,22 +55,27 @@ en: page_header: "" is_carehome: check_answer_label: "Care home accommodation" + check_answer_prompt: "Tell us if care home accommodation" hint_text: "" question_text: "Is this accommodation a care home?" chcharge_weekly: check_answer_label: "Care home charges" + check_answer_prompt: "" hint_text: "" question_text: "How much does the household pay every week?" chcharge_bi_weekly: check_answer_label: "Care home charges" + check_answer_prompt: "" hint_text: "" question_text: "How much does the household pay every 2 weeks?" chcharge_4_weekly: check_answer_label: "Care home charges" + check_answer_prompt: "" hint_text: "" question_text: "How much does the household pay every 4 weeks?" chcharge_monthly: check_answer_label: "Care home charges" + check_answer_prompt: "" hint_text: "" question_text: "How much does the household pay every month?" @@ -71,38 +83,46 @@ en: page_header: "Household rent and charges" brent: check_answer_label: "Basic rent" + check_answer_prompt: "" hint_text: "This is the amount paid before any charges are added for services (for example, hot water or cleaning). Households may receive housing benefit or Universal Credit towards basic rent." question_text: "What is the basic rent?" scharge: check_answer_label: "Service charge" + check_answer_prompt: "" hint_text: "For example, for cleaning. Households may receive housing benefit or Universal Credit towards the service charge." question_text: "What is the service charge?" pscharge: check_answer_label: "Personal service charge" + check_answer_prompt: "" hint_text: "For example, for heating or hot water. This doesn’t include housing benefit or Universal Credit." question_text: "What is the personal service charge?" supcharg: check_answer_label: "Support charge" + check_answer_prompt: "" hint_text: "Any charges made to fund support services included in tenancy agreement." question_text: "What is the support charge?" tcharge: check_answer_label: "Household rent and charges" + check_answer_prompt: "" hint_text: "This is the total for rent and all charges." question_text: "Total charge" hbrentshortfall: page_header: "" check_answer_label: "Any outstanding amount for basic rent and charges" + check_answer_prompt: "Tell us if any outstanding amount for basic rent and charges" hint_text: "Also known as the ‘outstanding amount’." - question_text: "After the household has received any housing-related benefits, will they still need to pay for rent and charges?" + question_text: "After the household has received any housing related benefits, will they still need to pay for rent and charges?" outstanding_amount: page_header: "" tshortfall_known: - check_answer_label: "Do you know the outstanding amount?" + check_answer_label: "Outstanding amount known" + check_answer_prompt: "Tell us if you know the outstanding amount" hint_text: "You only need to give an approximate figure." question_text: "Can you estimate the outstanding amount?" tshortfall: check_answer_label: "Estimated outstanding amount" + check_answer_prompt: "" hint_text: "Also known as the ‘outstanding amount’." question_text: "Estimated outstanding amount" diff --git a/config/locales/forms/2024/lettings/property_information.en.yml b/config/locales/forms/2024/lettings/property_information.en.yml index 012ff0e0d..383a788ce 100644 --- a/config/locales/forms/2024/lettings/property_information.en.yml +++ b/config/locales/forms/2024/lettings/property_information.en.yml @@ -5,24 +5,28 @@ en: property_information: first_time_property_let_as_social_housing: page_header: "" - check_answer_label: "First time being let as social-housing?" + 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" hint_text: "" question_text: "Is this the first time the property has been let as social housing?" uprn: page_header: "" uprn_known: - check_answer_label: "UPRN known?" + 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?" uprn: check_answer_label: "UPRN" + check_answer_prompt: "" hint_text: "" question_text: "What is the property's UPRN?" uprn_confirmed: page_header: "We found an address that might be this property" check_answer_label: "Is this the right address?" + check_answer_prompt: "Tell us if this is the right address" hint_text: "" question_text: "Is this the property address?" @@ -30,16 +34,19 @@ en: page_header: "Find an address" address_line1_input: check_answer_label: "Find address" + check_answer_prompt: "Try find address" hint_text: "" question_text: "Address line 1" postcode_full_input: check_answer_label: "" + check_answer_prompt: "" hint_text: "" question_text: "Postcode" uprn_selection: page_header: "We found an address that might be this property" - check_answer_label: "Select the correct address" + check_answer_label: "Select correct address" + check_answer_prompt: "Select correct address" hint_text: "" question_text: "Select the correct address" @@ -47,71 +54,83 @@ en: 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" hint_text: "" question_text: "Address line 1" address_line2: check_answer_label: "" + check_answer_prompt: "" hint_text: "" question_text: "Address line 2 (optional)" town_or_city: check_answer_label: "Town or city" + check_answer_prompt: "" hint_text: "" question_text: "Town or city" county: check_answer_label: "County" + check_answer_prompt: "" hint_text: "" question_text: "County (optional)" postcode_full: check_answer_label: "Postcode" + check_answer_prompt: "" hint_text: "" question_text: "Postcode" la: page_header: "" check_answer_label: "Local authority" + check_answer_prompt: "" hint_text: "" question_text: "What is the property’s local authority?" - unitletas: page_header: "" check_answer_label: "Most recent let type" + check_answer_prompt: "" hint_text: "This is the rent type of the previous tenancy in this property." question_text: "What type was the property most recently let as?" rsnvac: page_header: "" check_answer_label: "Vacancy reason" + check_answer_prompt: "" hint_text: "" question_text: "What is the reason for the property being vacant?" unittype_gn: page_header: "" check_answer_label: "Type of unit" + check_answer_prompt: "" hint_text: "" question_text: "What type of unit is the property?" builtype: page_header: "" check_answer_label: "Type of building" + check_answer_prompt: "" hint_text: "" question_text: "What type of building is the property?" wchair: page_header: "" check_answer_label: "Property built or adapted to wheelchair-user standards" + check_answer_prompt: "Tell us if the property is built or adapted to wheelchair-user standards" hint_text: "This is whether someone who uses a wheelchair is able to make full use of all of the property’s rooms and facilities, including use of both inside and outside space, and entering and exiting the property." question_text: "Is the property built or adapted to wheelchair-user standards?" beds: page_header: "" check_answer_label: "Number of bedrooms" + check_answer_prompt: "" hint_text: "If shared accommodation, enter the number of bedrooms occupied by this household." question_text: "How many bedrooms does the property have?" voiddate: page_header: "Void date" check_answer_label: "Void date" + check_answer_prompt: "" hint_text: "" question_text: "What is the void date?" @@ -119,9 +138,11 @@ en: page_header: "" majorrepairs: check_answer_label: "Major repairs carried out during void period" + check_answer_prompt: "" hint_text: "Major repairs are works that could not be reasonably carried out with a tenant living at the property. For example, structural repairs." question_text: "Were any major repairs carried out during the void period?" mrcdate: check_answer_label: "Completion date of repairs" + check_answer_prompt: "" hint_text: "" question_text: "When were the repairs completed?" diff --git a/config/locales/forms/2024/lettings/setup.en.yml b/config/locales/forms/2024/lettings/setup.en.yml index 68bc95364..d3fd4d03c 100644 --- a/config/locales/forms/2024/lettings/setup.en.yml +++ b/config/locales/forms/2024/lettings/setup.en.yml @@ -6,30 +6,35 @@ en: owning_organisation_id: page_header: "" check_answer_label: "Stock owner" + check_answer_prompt: "" hint_text: "" question_text: "Which organisation owns this property?" managing_organisation_id: page_header: "" check_answer_label: "Managing agent" + check_answer_prompt: "" hint_text: "" question_text: "Which organisation manages this letting?" assigned_to_id: page_header: "" check_answer_label: "Log owner" + check_answer_prompt: "Select user" hint_text: "" question_text: "Which user are you creating this log for?" needstype: page_header: "" check_answer_label: "Needs type" + check_answer_prompt: "" hint_text: "General needs housing includes both self-contained and shared housing without support or specific adaptations. Supported housing can include direct access hostels, group homes, residential care and nursing homes." question_text: "What is the needs type?" scheme_id: page_header: "Scheme" check_answer_label: "Scheme name" + check_answer_prompt: "" hint_text: "Enter postcode, scheme name, or scheme code (for example, S123).

    A supported housing scheme provides shared or self-contained housing for a particular client group, for example younger or vulnerable people." question_text: "What scheme is this log for?" @@ -37,23 +42,27 @@ en: less_than_twenty: page_header: "Location" check_answer_label: "Location" + check_answer_prompt: "" hint_text: "" question_text: "Which location is this letting for?" twenty_or_more: page_header: "Location" check_answer_label: "Location" + check_answer_prompt: "" hint_text: '
    This scheme has 20 or more locations.
    Enter postcode or address.' question_text: "Which location is this letting for?" renewal: page_header: "" check_answer_label: "Property renewal" + check_answer_prompt: "Tell us if it's a property renewal" hint_text: "If the property was previously being used as temporary accommodation, then answer 'no'." question_text: "Is this letting a renewal of social housing to the same tenant in the same property?" startdate: page_header: "" check_answer_label: "Tenancy start date" + check_answer_prompt: "" hint_text: "" question_text: "What is the tenancy start date?" @@ -61,27 +70,32 @@ en: page_header: "Rent Type" rent_type: check_answer_label: "Rent type" + check_answer_prompt: "" hint_text: "" question_text: "What is the rent type?" irproduct_other: check_answer_label: "Product name" + check_answer_prompt: "" hint_text: "" question_text: "Name of rent product" tenancycode: page_header: "" check_answer_label: "Tenant code" + check_answer_prompt: "" hint_text: "This is how you usually refer to this tenancy on your own systems." question_text: "What is the tenant code?" propcode: page_header: "" check_answer_label: "Property reference" + check_answer_prompt: "" hint_text: "This is how you usually refer to this property on your own systems." question_text: "What is the property reference?" declaration: page_header: "Ministry of Housing, Communities and Local Government privacy notice" check_answer_label: "Tenant has seen the privacy notice" + check_answer_prompt: "Tell us if tenant has seen the privacy notice" hint_text: "" question_text: "Declaration" diff --git a/config/locales/forms/2024/lettings/soft_validations.en.yml b/config/locales/forms/2024/lettings/soft_validations.en.yml index b4a76af04..c02fb79fd 100644 --- a/config/locales/forms/2024/lettings/soft_validations.en.yml +++ b/config/locales/forms/2024/lettings/soft_validations.en.yml @@ -7,6 +7,7 @@ en: no_females_pregnant_household_value_check: page_header: "" check_answer_label: "Pregnancy confirmation" + check_answer_prompt: "Confirm pregnancy answer" hint_text: "" question_text: "Are you sure this is correct?" title_text: "You told us somebody in the household is pregnant." @@ -14,127 +15,143 @@ en: females_in_soft_age_range_in_pregnant_household_value_check: page_header: "" check_answer_label: "Pregnancy confirmation" + check_answer_prompt: "Confirm pregnancy status" hint_text: "" question_text: "Are you sure this is correct?" title_text: "You told us somebody in the household is pregnant." informative_text: "You also told us that any female tenants living at the property are in the following age ranges:" no_retirement_value_check: - page_header: "" - check_answer_label: "Retirement confirmation" - hint_text: "" - question_text: "Are you sure this person is retired?" - title_text: "You told us this person is aged %{age} years and retired." - informative_text: "The minimum expected retirement age in England is 66." + page_header: "" + check_answer_label: "Retirement confirmation" + check_answer_prompt: "Confirm retirement status" + hint_text: "" + question_text: "Are you sure this person is retired?" + title_text: "You told us this person is aged %{age} years and retired." + informative_text: "The minimum expected retirement age in England is 66." retirement_value_check: - page_header: "" - check_answer_label: "Retirement confirmation" - hint_text: "" - 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: "Are you sure this person isn’t retired?" + page_header: "" + check_answer_label: "Retirement confirmation" + check_answer_prompt: "Confirm retirement status" + hint_text: "" + 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: "Are you sure this person isn’t retired?" partner_under_16_value_check: - page_header: "" - check_answer_label: "Partner under 16 confirmation" - 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." - informative_text: "Are you sure this is correct?" + page_header: "" + check_answer_label: "Partner under 16 confirmation" + 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." + informative_text: "Are you sure this is correct?" multiple_partners_value_check: - page_header: "" - check_answer_label: "Multiple partners confirmation" - hint_text: "" - question_text: "Are you sure this is correct?" - title_text: "You told us there are more than 1 persons with 'Partner' relationship to the lead tenant." - informative_text: "Are you sure this is correct?" + page_header: "" + check_answer_label: "Multiple partners confirmation" + check_answer_prompt: "Confirm multiple partners" + hint_text: "" + question_text: "Are you sure this is correct?" + title_text: "You told us there are more than 1 persons with 'Partner' relationship to the lead tenant." + informative_text: "Are you sure this is correct?" reasonother_value_check: - page_header: "" - check_answer_label: "Reason other confirmation" - hint_text: "" - question_text: "Are you sure this doesn’t fit an existing category?" - title_text: "You told us that the tenant’s main reason for leaving their last settled home was %{reasonother}." - informative_text: "The reason you have entered looks very similar to one of the existing response categories. Please check the categories and select the appropriate one. If the existing categories are not suitable, please confirm here to move onto the next question." + page_header: "" + check_answer_label: "Reason other confirmation" + check_answer_prompt: "Confirm reason for leaving" + hint_text: "" + question_text: "Are you sure this doesn’t fit an existing category?" + title_text: "You told us that the tenant’s main reason for leaving their last settled home was %{reasonother}." + informative_text: "The reason you have entered looks very similar to one of the existing response categories. Please check the categories and select the appropriate one. If the existing categories are not suitable, please confirm here to move onto the next question." referral_value_check: - page_header: "" - check_answer_label: "Referral confirmation" - hint_text: "" - question_text: "Are you sure?" - title_text: "Are you sure?" - informative_text: "This is a general needs log, and this referral type is for supported housing." + page_header: "" + check_answer_label: "Referral confirmation" + check_answer_prompt: "Confirm referral type" + hint_text: "" + question_text: "Are you sure?" + title_text: "Are you sure?" + informative_text: "This is a general needs log, and this referral type is for supported housing." net_income_value_check: - page_header: "" - check_answer_label: "Net income confirmation" - hint_text: "" - question_text: "Are you sure this is correct?" - title_text: "You told us that the household’s income is %{earnings} %{incfreq}." - informative_text: "This is %{net_income_higher_or_lower_text} than we would expect for the household’s working situation." + page_header: "" + check_answer_label: "Net income confirmation" + check_answer_prompt: "Confirm net income" + hint_text: "" + question_text: "Are you sure this is correct?" + title_text: "You told us that the household’s income is %{earnings} %{incfreq}." + informative_text: "This is %{net_income_higher_or_lower_text} than we would expect for the household’s working situation." care_home_charges_value_check: - page_header: "" - check_answer_label: "Care home charges confirmation" - hint_text: "" - question_text: "Are you sure there are no care home charges?" - title_text: "Care home charges should be provided if this is a care home accommodation." - informative_text: "Are you sure there are no care home charges?" + page_header: "" + check_answer_label: "Care home charges confirmation" + check_answer_prompt: "Confirm care home charges" + hint_text: "" + question_text: "Are you sure there are no care home charges?" + title_text: "Care home charges should be provided if this is a care home accommodation." + informative_text: "Are you sure there are no care home charges?" rent_value_check: - page_header: "" - check_answer_label: "Total rent confirmation" - hint_text: "Check the following:" - question_text: "Are you sure this is correct?" - title_text: "You told us the rent is %{brent}." - informative_text: "This is %{higher_or_lower} than we would expect." + page_header: "" + check_answer_label: "Total rent confirmation" + check_answer_prompt: "Confirm total rent" + hint_text: "Check the following:" + question_text: "Are you sure this is correct?" + title_text: "You told us the rent is %{brent}." + informative_text: "This is %{higher_or_lower} than we would expect." scharge_value_check: - page_header: "" - check_answer_label: "Service charge confirmation" - hint_text: "Check the following:" - question_text: "Are you sure?" - title_text: "You told us the service charge is %{scharge}." - informative_text: "This is higher than we would expect." + page_header: "" + check_answer_label: "Service charge confirmation" + check_answer_prompt: "Confirm service charge" + hint_text: "Check the following:" + question_text: "Are you sure?" + title_text: "You told us the service charge is %{scharge}." + informative_text: "This is higher than we would expect." pscharge_value_check: - page_header: "" - check_answer_label: "Personal service charge confirmation" - hint_text: "Check the following:" - question_text: "Are you sure?" - title_text: "You told us the personal service charge is %{pscharge}." - informative_text: "This is higher than we would expect." + page_header: "" + check_answer_label: "Personal service charge confirmation" + check_answer_prompt: "Confirm personal service charge" + hint_text: "Check the following:" + question_text: "Are you sure?" + title_text: "You told us the personal service charge is %{pscharge}." + informative_text: "This is higher than we would expect." supcharg_value_check: - page_header: "" - check_answer_label: "Support charge confirmation" - hint_text: "Check the following:" - question_text: "Are you sure?" - title_text: "You told us the support charge is %{supcharg}." - informative_text: "This is higher than we would expect." + page_header: "" + check_answer_label: "Support charge confirmation" + check_answer_prompt: "Confirm support charge" + hint_text: "Check the following:" + question_text: "Are you sure?" + title_text: "You told us the support charge is %{supcharg}." + informative_text: "This is higher than we would expect." void_date_value_check: - page_header: "" - check_answer_label: "Void date confirmation" - hint_text: "" - question_text: "Are you sure the property has been vacant for this long?" - title_text: "You told us that the property has been vacant for more than 2 years." - informative_text: "This is longer than we would expect." + page_header: "" + check_answer_label: "Void date confirmation" + check_answer_prompt: "Confirm void date" + hint_text: "" + question_text: "Are you sure the property has been vacant for this long?" + title_text: "You told us that the property has been vacant for more than 2 years." + informative_text: "This is longer than we would expect." major_repairs_date_value_check: - page_header: "" - check_answer_label: "Major repairs date confirmation" - hint_text: "" - question_text: "Are you sure the property has been vacant for this long?" - title_text: "You told us the property has been vacant for 2 years." - informative_text: "This is longer than we would expect." - + page_header: "" + check_answer_label: "Major repairs date confirmation" + check_answer_prompt: "Confirm major repairs date" + hint_text: "" + question_text: "Are you sure the property has been vacant for this long?" + title_text: "You told us the property has been vacant for 2 years." + informative_text: "This is longer than we would expect." + no_address_found: - page_header: "" - check_answer_label: "No address found" - hint_text: "" - question_text: "We could not find an address that matches your search. You can search again or continue to enter the address manually." - title_text: "No address found" - informative_text: "We could not find an address that matches your search. You can search again or continue to enter the address manually." + page_header: "" + check_answer_label: "No address found" + check_answer_prompt: "Try find address" + hint_text: "" + question_text: "We could not find an address that matches your search. You can search again or continue to enter the address manually." + title_text: "No address found" + informative_text: "We could not find an address that matches your search. You can search again or continue to enter the address manually." diff --git a/config/locales/forms/2024/lettings/tenancy_information.en.yml b/config/locales/forms/2024/lettings/tenancy_information.en.yml index bee380e7c..73ea4a226 100644 --- a/config/locales/forms/2024/lettings/tenancy_information.en.yml +++ b/config/locales/forms/2024/lettings/tenancy_information.en.yml @@ -5,13 +5,15 @@ en: tenancy_information: joint: page_header: "" - check_answer_label: "Is this a joint tenancy?" + check_answer_label: "Joint tenancy" + check_answer_prompt: "Tell us if it's a joint tenancy" hint_text: "This is where two or more people are named on the tenancy agreement" question_text: "Is this a joint tenancy?" startertenancy: page_header: "" - check_answer_label: "Is this a starter or introductory tenancy?" + check_answer_label: "Starter or introductory tenancy" + check_answer_prompt: "Tell us if it's a starter or introductory tenancy" hint_text: "If the tenancy has an ‘introductory period’ answer ‘yes’.

    You should submit a CORE log at the beginning of the starter tenancy or introductory period, with the best information you have at the time. You do not need to submit a log when a tenant later rolls onto the main tenancy." question_text: "Is this a starter tenancy?" @@ -20,20 +22,24 @@ en: page_header: "" tenancy: check_answer_label: "Type of main tenancy" + check_answer_prompt: "" hint_text: "" question_text: "What is the type of tenancy?" tenancyother: check_answer_label: "" + check_answer_prompt: "" hint_text: "" question_text: "Please state the tenancy type" starter_tenancy_type: page_header: "" tenancy: check_answer_label: "Type of main tenancy after the starter or introductory period has ended" + check_answer_prompt: "" hint_text: "" question_text: "What is the type of tenancy after the starter or introductory period has ended?" tenancyother: check_answer_label: "" + check_answer_prompt: "" hint_text: "" question_text: "Please state the tenancy type" @@ -41,26 +47,31 @@ en: tenancy_length: page_header: "" check_answer_label: "Length of fixed-term tenancy" + check_answer_prompt: "" hint_text: "Do not include the starter or introductory period." question_text: "What is the length of the fixed-term tenancy to the nearest year?" tenancy_length_affordable_rent: page_header: "" check_answer_label: "Length of fixed-term tenancy" + check_answer_prompt: "" hint_text: "Do not include the starter or introductory period.
    The minimum period is 2 years for social or affordable rent general needs logs. You do not need to submit CORE logs for these types of tenancies if they are shorter than 2 years." question_text: "What is the length of the fixed-term tenancy to the nearest year?" tenancy_length_intermediate_rent: page_header: "" check_answer_label: "Length of fixed-term tenancy" + check_answer_prompt: "" hint_text: "Do not include the starter or introductory period.
    The minimum period is 1 year for intermediate rent general needs logs. You do not need to submit CORE logs for these types of tenancies if they are shorter than 1 year." question_text: "What is the length of the fixed-term tenancy to the nearest year?" tenancy_length_periodic: page_header: "" check_answer_label: "Length of periodic tenancy" + check_answer_prompt: "" hint_text: "As this is a periodic tenancy, this question is optional. If you do not have the information available click save and continue" question_text: "What is the length of the periodic tenancy to the nearest year?" sheltered: page_header: "" - check_answer_label: "Is this letting in sheltered accommodation?" + check_answer_label: "Letting in sheltered accommodation" + check_answer_prompt: "Tell us if letting is in sheltered accommodation" hint_text: "Sheltered housing and special retirement housing are for tenants with low-level care and support needs. This typically provides some limited support to enable independent living, such as alarm-based assistance or a scheme manager.

    Extra care housing is for tenants with medium to high care and support needs, often with 24 hour access to support staff provided by an agency registered with the Care Quality Commission." question_text: "Is this letting in sheltered accommodation?" diff --git a/config/locales/forms/2024/sales/household_characteristics.en.yml b/config/locales/forms/2024/sales/household_characteristics.en.yml index 5b06639fe..239958f30 100644 --- a/config/locales/forms/2024/sales/household_characteristics.en.yml +++ b/config/locales/forms/2024/sales/household_characteristics.en.yml @@ -7,22 +7,26 @@ en: page_header: "" age1_known: check_answer_label: "Buyer 1’s age" + 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" hint_text: "" question_text: "Age" sex1: page_header: "" check_answer_label: "Buyer 1’s gender identity" + check_answer_prompt: "" 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 buyer 1’s gender identity?" ethnic_group: page_header: "" check_answer_label: "Buyer 1’s ethnic group" + check_answer_prompt: "" hint_text: "" question_text: "What is buyer 1’s ethnic group?" @@ -30,50 +34,59 @@ en: ethnic_background_black: page_header: "" check_answer_label: "Buyer 1’s ethnic background" + check_answer_prompt: "" hint_text: "" question_text: "Which of the following best describes buyer 1’s Black, African, Caribbean or Black British background?" ethnic_background_asian: page_header: "" check_answer_label: "Buyer 1’s ethnic background" + check_answer_prompt: "" hint_text: "" question_text: "Which of the following best describes buyer 1’s Asian or Asian British background?" ethnic_background_arab: page_header: "" check_answer_label: "Buyer 1’s ethnic background" + check_answer_prompt: "" hint_text: "" question_text: "Which of the following best describes buyer 1’s Arab background?" ethnic_background_mixed: page_header: "" check_answer_label: "Buyer 1’s ethnic background" + check_answer_prompt: "" hint_text: "" question_text: "Which of the following best describes buyer 1’s Mixed or Multiple ethnic groups background?" ethnic_background_white: page_header: "" check_answer_label: "Buyer 1’s ethnic background" + check_answer_prompt: "" hint_text: "" question_text: "Which of the following best describes buyer 1’s White background?" nationality_all_group: page_header: "" check_answer_label: "Buyer 1’s nationality" + check_answer_prompt: "" hint_text: "If buyer 1 is a dual national of the United Kingdom and another country, enter United Kingdom. If they are a dual national of two other countries, the buyer should decide which country to enter." question_text: "What is buyer 1’s nationality?" nationality_all: page_header: "" check_answer_label: "Buyer 1’s nationality" + check_answer_prompt: "" hint_text: "" question_text: "Enter a nationality" ecstat1: page_header: "" check_answer_label: "Buyer 1's working situation" + check_answer_prompt: "" hint_text: "" question_text: "Which of these best describes buyer 1's working situation?" buy1livein: page_header: "" - check_answer_label: "Will buyer 1 live in the property?" + check_answer_label: "Buyer 1 lives in the property" + check_answer_prompt: "Tell us if buyer 1 lives in the property" hint_text: "" question_text: "Will buyer 1 live in the property?" @@ -81,11 +94,13 @@ en: buyer: page_header: "" 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?" person: page_header: "" check_answer_label: "Person 2’s relationship to buyer 1" + check_answer_prompt: "" hint_text: "" question_text: "What is person 2’s relationship to buyer 1?" @@ -94,20 +109,24 @@ en: page_header: "" age2_known: check_answer_label: "Buyer 2’s age" + 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" hint_text: "" question_text: "Age" person: page_header: "" age2_known: - check_answer_label: "Person 2’s age known?" + check_answer_label: "Person 2’s age" + 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" hint_text: "" question_text: "Age" @@ -115,56 +134,66 @@ en: buyer: page_header: "" check_answer_label: "Buyer 2’s gender identity" + check_answer_prompt: "" 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 buyer 2’s gender identity?" person: page_header: "" check_answer_label: "Person 2’s gender identity" + check_answer_prompt: "" 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?" ethnic_group2: - page_header: "" - check_answer_label: "Buyer 2’s ethnic group" - hint_text: "" - question_text: "What is buyer 2’s ethnic group?" + page_header: "" + check_answer_label: "Buyer 2’s ethnic group" + check_answer_prompt: "" + hint_text: "" + question_text: "What is buyer 2’s ethnic group?" ethnicbuy2: ethnic_background_black: page_header: "" check_answer_label: "Buyer 2’s ethnic background" + check_answer_prompt: "" hint_text: "" question_text: "Which of the following best describes buyer 2’s Black, African, Caribbean or Black British background?" ethnic_background_asian: page_header: "" check_answer_label: "Buyer 2’s ethnic background" + check_answer_prompt: "" hint_text: "" question_text: "Which of the following best describes buyer 2’s Asian or Asian British background?" ethnic_background_arab: page_header: "" check_answer_label: "Buyer 2’s ethnic background" + check_answer_prompt: "" hint_text: "" question_text: "Which of the following best describes buyer 2’s Arab background?" ethnic_background_mixed: page_header: "" check_answer_label: "Buyer 2’s ethnic background" + check_answer_prompt: "" hint_text: "" question_text: "Which of the following best describes buyer 2’s Mixed or Multiple ethnic groups background?" ethnic_background_white: page_header: "" check_answer_label: "Buyer 2’s ethnic background" + check_answer_prompt: "" hint_text: "" question_text: "Which of the following best describes buyer 2’s White background?" nationality_all_buyer2_group: page_header: "" check_answer_label: "Buyer 2’s nationality" + check_answer_prompt: "" hint_text: "If buyer 1 is a dual national of the United Kingdom and another country, enter United Kingdom. If they are a dual national of two other countries, the buyer should decide which country to enter." question_text: "What is buyer 2’s nationality?" nationality_all_buyer2: page_header: "" check_answer_label: "Buyer 2’s nationality" + check_answer_prompt: "" hint_text: "" question_text: "Enter a nationality" @@ -172,17 +201,20 @@ en: buyer: page_header: "" 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?" person: page_header: "" check_answer_label: "Person 2’s working situation" + check_answer_prompt: "" hint_text: "" 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?" + check_answer_label: "Buyer 2 lives in the property" + check_answer_prompt: "Tell us if buyer 2 lives in the property" hint_text: "" question_text: "Will buyer 2 live in the property?" @@ -190,156 +222,183 @@ en: joint_purchase: page_header: "" check_answer_label: "Number of other people living in the property" + check_answer_prompt: "" hint_text: "You can provide details for a maximum of 4 other people for a joint purchase." question_text: "Besides the buyers, how many other people live or will live in the property?" not_joint_purchase: page_header: "" check_answer_label: "Number of other people living in the property" + check_answer_prompt: "" hint_text: "You can provide details for a maximum of 5 other people if there is only one buyer." question_text: "Besides the buyer, how many other people live or will live in the property?" 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" 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" hint_text: "" question_text: "Do you know the details for person 3?" relat3: page_header: "" check_answer_label: "Person 3’s relationship to buyer 1" + check_answer_prompt: "" hint_text: "" question_text: "What is person 3’s relationship to buyer 1?" age3: page_header: "" age3_known: - check_answer_label: "Person 3’s age known?" + check_answer_label: "Person 3’s age" + 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" hint_text: "" question_text: "Age" sex3: page_header: "" check_answer_label: "Person 3’s gender identity" + check_answer_prompt: "" 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?" ecstat3: page_header: "" check_answer_label: "Person 3’s working situation" + check_answer_prompt: "" hint_text: "" question_text: "Which of these best describes person 3’s working situation?" 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" hint_text: "" question_text: "Do you know the details for person 4?" relat4: page_header: "" check_answer_label: "Person 4’s relationship to buyer 1" + check_answer_prompt: "" hint_text: "" question_text: "What is person 4’s relationship to buyer 1?" age4: page_header: "" age4_known: - check_answer_label: "Person 4’s age known?" + check_answer_label: "Person 4’s age" + 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" hint_text: "" question_text: "Age" sex4: page_header: "" check_answer_label: "Person 4’s gender identity" + check_answer_prompt: "" 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?" ecstat4: page_header: "" check_answer_label: "Person 4’s working situation" + check_answer_prompt: "" hint_text: "" question_text: "Which of these best describes person 4’s working situation?" 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" hint_text: "" question_text: "Do you know the details for person 5?" relat5: page_header: "" check_answer_label: "Person 5’s relationship to buyer 1" + check_answer_prompt: "" hint_text: "" question_text: "What is person 5’s relationship to buyer 1?" age5: page_header: "" age5_known: - check_answer_label: "Person 5’s age known?" + check_answer_label: "Person 5’s age" + 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" hint_text: "" question_text: "Age" sex5: page_header: "" check_answer_label: "Person 5’s gender identity" + check_answer_prompt: "" 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?" ecstat5: page_header: "" check_answer_label: "Person 5’s working situation" + check_answer_prompt: "" hint_text: "" question_text: "Which of these best describes person 5’s working situation?" 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" hint_text: "" question_text: "Do you know the details for person 6?" relat6: page_header: "" check_answer_label: "Person 6’s relationship to buyer 1" + check_answer_prompt: "" hint_text: "" question_text: "What is person 6’s relationship to buyer 1?" age6: page_header: "" age6_known: - check_answer_label: "Person 6’s age known?" + check_answer_label: "Person 6’s age" + 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" hint_text: "" question_text: "Age" sex6: page_header: "" check_answer_label: "Person 6’s gender identity" + check_answer_prompt: "" 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?" ecstat6: page_header: "" check_answer_label: "Person 6’s working situation" + check_answer_prompt: "" hint_text: "" question_text: "Which of these best describes person 6’s working situation?" diff --git a/config/locales/forms/2024/sales/household_situation.en.yml b/config/locales/forms/2024/sales/household_situation.en.yml index 1ab6d540e..72f68694a 100644 --- a/config/locales/forms/2024/sales/household_situation.en.yml +++ b/config/locales/forms/2024/sales/household_situation.en.yml @@ -6,17 +6,20 @@ en: prevten: page_header: "" check_answer_label: "Buyer 1’s previous tenure" + check_answer_prompt: "" hint_text: "" question_text: "What was buyer 1’s previous tenure?" last_accommodation: page_header: "" ppcodenk: - check_answer_label: "Buyer 1’s last settled accommodation" + check_answer_label: "Postcode of buyer 1’s last settled accommodation" + check_answer_prompt: "Enter the postcode 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 postcode of buyer 1’s last settled accommodation?" ppostcode_full: check_answer_label: "Postcode of buyer 1’s last settled accommodation" + check_answer_prompt: "" hint_text: "" question_text: "Postcode" @@ -24,27 +27,32 @@ 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" 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: check_answer_label: "Local authority of buyer 1’s last settled accommodation" + check_answer_prompt: "" hint_text: "" question_text: "Select a local authority" buyers_organisations: page_header: "" check_answer_label: "Organisations buyers were registered with" + check_answer_prompt: "" hint_text: "Select all that apply. This question is optional. If no options are applicable, leave the options blank, and select save and continue." question_text: "What organisations were the buyers registered with?" buy2living: page_header: "" check_answer_label: "Buyer 2 living at the same address" + check_answer_prompt: "" hint_text: "" question_text: "At the time of purchase, was buyer 2 living at the same address as buyer 1?" prevtenbuy2: page_header: "" check_answer_label: "Buyer 2’s previous tenure" + check_answer_prompt: "" hint_text: "" question_text: "What was buyer 2’s previous tenure?" 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 8d5ec0772..86fa347fc 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 @@ -6,68 +6,80 @@ en: buyer_1_income: page_header: "" income1nk: - check_answer_label: "Buyer 1’s gross annual income known?" + check_answer_label: "Buyer 1’s gross annual income 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: check_answer_label: "Buyer 1’s gross annual income" + check_answer_prompt: "" 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" + check_answer_prompt: "Tell us if buyer 1’s income used for a mortgage application" hint_text: "" question_text: "Was buyer 1’s income used for a mortgage application?" buyer_2_income: page_header: "" income2nk: - check_answer_label: "Buyer 2’s gross annual income known?" + check_answer_label: "Buyer 2’s gross annual income 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: check_answer_label: "Buyer 2’s gross annual income" + check_answer_prompt: "Tell us if buyer 2’s income used for mortgage application" 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 2’s gross annual income" inc2mort: page_header: "" check_answer_label: "Buyer 2’s income used for mortgage application" + check_answer_prompt: "" hint_text: "" question_text: "Was buyer 2’s income used for a mortgage application?" housing_benefits: joint_purchase: page_header: "" - check_answer_label: "Housing-related benefits buyers received before buying this property" + check_answer_label: "Housing related benefits buyers received before buying this property" + check_answer_prompt: "" hint_text: "" - question_text: "Were the buyers receiving any of these housing-related benefits immediately before buying this property?" + question_text: "Were the buyers receiving any of these housing related benefits immediately before buying this property?" not_joint_purchase: page_header: "" - check_answer_label: "Housing-related benefits buyer received before buying this property" + check_answer_label: "Housing related benefits buyer received before buying this property" + check_answer_prompt: "" hint_text: "" - question_text: "Was the buyer receiving any of these housing-related benefits immediately before buying this property?" + 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" + 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: check_answer_label: "Buyers’ total savings before any deposit paid" + check_answer_prompt: "" hint_text: "Include any savings, investments, ISAs, premium bonds, shares, or money held in a bank or building society account." question_text: "Enter their total savings to the nearest £10" not_joint_purchase: page_header: "" savingsnk: - check_answer_label: "Buyer’s total savings known?" + check_answer_label: "Buyer’s total savings" + 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: check_answer_label: "Buyer’s total savings before any deposit paid" + check_answer_prompt: "" hint_text: "Include any savings, investments, ISAs, premium bonds, shares, or money held in a bank or building society account." question_text: "Enter their total savings to the nearest £10" @@ -75,16 +87,19 @@ en: joint_purchase: page_header: "" check_answer_label: "Buyers previously owned a property." + check_answer_prompt: "" hint_text: "" question_text: "Have any of the buyers previously owned a property?" not_joint_purchase: page_header: "" - check_answer_label: "Buyer previously owned a property." + check_answer_label: "Buyer previously owned a property" + check_answer_prompt: "Tell us if the buyer previously owned a property" hint_text: "" question_text: "Has the buyer previously owned a property?" prevshared: page_header: "" - check_answer_label: "Previous property shared ownership?" + check_answer_label: "Previous property shared ownership" + check_answer_prompt: "Tell us if the previous property was shared ownership" hint_text: "For any buyer" question_text: "Was the previous property under shared ownership?" diff --git a/config/locales/forms/2024/sales/other_household_information.en.yml b/config/locales/forms/2024/sales/other_household_information.en.yml index 8363c5108..0e6a4e31c 100644 --- a/config/locales/forms/2024/sales/other_household_information.en.yml +++ b/config/locales/forms/2024/sales/other_household_information.en.yml @@ -5,30 +5,35 @@ en: other_household_information: hhregres: page_header: "" - check_answer_label: "Have any of the buyers ever served as a regular in the UK armed forces?" + check_answer_label: "Any buyer has served as regulars in the UK armed forces" + check_answer_prompt: "Tell us if any buyer has ever served as a regular in the UK armed forces" hint_text: "A regular is somebody who has served in the Royal Navy, the Royal Marines, the Royal Airforce or Army full time and does not include reserve forces" question_text: "Have any of the buyers ever served as a regular in the UK armed forces?" hhregresstill: page_header: "" - check_answer_label: "Are they still serving in the UK armed forces?" + check_answer_label: "Buyer still serving in the UK armed forces" + check_answer_prompt: "Tell us if the buyer is still serving in the UK armed forces" hint_text: "" question_text: "Is the buyer still serving in the UK armed forces?" armedforcesspouse: page_header: "" - check_answer_label: "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?" + check_answer_label: "Any buyer is a spouse or civil partner of a UK armed forces regular who died in service within the last 2 years" + check_answer_prompt: "Tell us if any buyers are a spouse or civil partner of a UK armed forces regular who died in service within the last 2 years" hint_text: "" question_text: "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?" disabled: page_header: "" - check_answer_label: "Does anyone in the household have a disability?" + 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" question_text: "Does anyone in the household consider themselves to have a disability?" wheel: page_header: "" - check_answer_label: "Does anyone in the household use a wheelchair?" + check_answer_label: "Household member uses a wheelchair" + check_answer_prompt: "Tell us if someone uses a wheelchair" hint_text: "This can be inside or outside the home" question_text: "Does anyone in the household use a wheelchair?" diff --git a/config/locales/forms/2024/sales/property_information.en.yml b/config/locales/forms/2024/sales/property_information.en.yml index 269f4fdca..dd9a04240 100644 --- a/config/locales/forms/2024/sales/property_information.en.yml +++ b/config/locales/forms/2024/sales/property_information.en.yml @@ -6,17 +6,20 @@ en: uprn: page_header: "" uprn_known: - check_answer_label: "UPRN known?" + 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?" uprn: check_answer_label: "UPRN" + check_answer_prompt: "" hint_text: "" question_text: "What is the property's UPRN?" uprn_confirmed: page_header: "We found an address that might be this property" check_answer_label: "Is this the right address?" + check_answer_prompt: "Tell us if this is the right address" hint_text: "" question_text: "Is this the property address?" @@ -24,16 +27,19 @@ en: page_header: "Find an address" address_line1_input: check_answer_label: "Find address" + check_answer_prompt: "Try find address" hint_text: "" question_text: "Address line 1" postcode_full_input: check_answer_label: "" + check_answer_prompt: "" hint_text: "" question_text: "Postcode" uprn_selection: page_header: "We found an address that might be this property" - check_answer_label: "Select the correct address" + check_answer_label: "Select correct address" + check_answer_prompt: "Select correct address" hint_text: "" question_text: "Select the correct address" @@ -41,51 +47,61 @@ en: 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" hint_text: "" question_text: "Address line 1" address_line2: check_answer_label: "" + check_answer_prompt: "" hint_text: "" question_text: "Address line 2 (optional)" town_or_city: check_answer_label: "Town or city" + check_answer_prompt: "" hint_text: "" question_text: "Town or city" county: check_answer_label: "County" + check_answer_prompt: "" hint_text: "" question_text: "County (optional)" postcode_full: check_answer_label: "Postcode" + check_answer_prompt: "" hint_text: "" question_text: "Postcode" la: page_header: "" check_answer_label: "Local authority" + check_answer_prompt: "" hint_text: "" question_text: "What is the property’s local authority?" beds: page_header: "" check_answer_label: "Number of bedrooms" + check_answer_prompt: "" hint_text: "A bedsit has 1 bedroom." question_text: "How many bedrooms does the property have?" proptype: page_header: "" check_answer_label: "Type of unit" + check_answer_prompt: "" hint_text: "" question_text: "What type of unit is the property?" builtype: page_header: "" check_answer_label: "Type of building" + check_answer_prompt: "" hint_text: "" question_text: "What type of building is the property?" wchair: page_header: "" check_answer_label: "Property built or adapted to wheelchair-user standards" + check_answer_prompt: "Tell us if the property is built or adapted to wheelchair-user standards" hint_text: "This is whether someone who uses a wheelchair is able to make full use of all of the property’s rooms and facilities, including use of both inside and outside space, and entering and exiting the property." question_text: "Is the property built or adapted to wheelchair-user standards?" diff --git a/config/locales/forms/2024/sales/sale_information.en.yml b/config/locales/forms/2024/sales/sale_information.en.yml index 92acca9cd..d03d712a9 100644 --- a/config/locales/forms/2024/sales/sale_information.en.yml +++ b/config/locales/forms/2024/sales/sale_information.en.yml @@ -8,176 +8,207 @@ en: page_header: "" proplen: check_answer_label: "Number of years living in the property before purchase" + check_answer_prompt: "" hint_text: "You should round up to the nearest year" question_text: "How long did they live there?" proplen_asked: check_answer_label: "Buyers lived in the property before purchasing" + check_answer_prompt: "Tell us if buyers lived in the property before purchase" hint_text: "" question_text: "Did the buyers live in the property before purchasing it?" not_joint_purchase: page_header: "" proplen: check_answer_label: "Number of years living in the property before purchase" + check_answer_prompt: "" hint_text: "You should round up to the nearest year" question_text: "How long did they live there?" proplen_asked: check_answer_label: "Buyer lived in the property before purchasing" + check_answer_prompt: "Tell us if the buyer lived in the property before purchasing" hint_text: "" question_text: "Did the buyer live in the property before purchasing it?" staircasing: page_header: "" check_answer_label: "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: - page_header: "About the staircasing transaction" - stairbought: - check_answer_label: "Percentage bought in this staircasing transaction" + page_header: "About the staircasing transaction" + stairbought: + check_answer_label: "Percentage bought in this staircasing transaction" + check_answer_prompt: "" + hint_text: "" + question_text: "What percentage of the property has been bought in this staircasing transaction?" + stairowned: + joint_purchase: + check_answer_label: "Percentage the buyers now own in total" + check_answer_prompt: "" hint_text: "" - question_text: "What percentage of the property has been bought in this staircasing transaction?" - stairowned: - joint_purchase: - check_answer_label: "Percentage the buyers now own in total" - hint_text: "" - question_text: "What percentage of the property do the buyers now own in total?" - not_joint_purchase: - check_answer_label: "Percentage the buyer now owns in total" - hint_text: "" - question_text: "What percentage of the property does the buyer now own in total?" - staircasesale: - check_answer_label: "Part of a back-to-back staircasing transaction" + question_text: "What percentage of the property do the buyers now own in total?" + not_joint_purchase: + check_answer_label: "Percentage the buyer now owns in total" + check_answer_prompt: "" hint_text: "" - question_text: "Is this transaction part of a back-to-back staircasing transaction to facilitate sale of the home on the open market?" + question_text: "What percentage of the property does the buyer now own in total?" + staircasesale: + check_answer_label: "Part of a back-to-back staircasing transaction" + check_answer_prompt: "Tell us if this is part of a back-to-back staircasing transaction" + hint_text: "" + question_text: "Is this transaction part of a back-to-back staircasing transaction to facilitate sale of the home on the open market?" resale: page_header: "" - check_answer_label: "Is this a resale?" + check_answer_label: "Resale" + check_answer_prompt: "Tell us if this is a resale" hint_text: "If the social landlord has previously sold the property to another buyer and is now reselling the property, select 'yes'. If this is the first time the property has been sold, select 'no'." question_text: "Is this a resale?" exchange_date: page_header: "" check_answer_label: "Exchange of contracts date" + check_answer_prompt: "" hint_text: "" question_text: "What is the exchange of contracts date?" handover_date: page_header: "" check_answer_label: "Practical completion or handover date" + check_answer_prompt: "" hint_text: "This is the date on which the building contractor hands over responsibility for the completed property to the private registered provider (PRP)" question_text: "What is the practical completion or handover date?" la_nominations: page_header: "" - check_answer_label: "Household rehoused under a local authority nominations agreement?" + check_answer_label: "Household rehoused under a local authority nominations agreement" + check_answer_prompt: "Tell us if 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: "" - check_answer_label: "Any buyers were registered providers, housing association or local authority tenants immediately before this sale?" + check_answer_label: "Buyers were registered providers, housing association or local authority tenants immediately before this sale" + check_answer_prompt: "Tell us if buyers were registered providers, housing association or local authority tenants" hint_text: "" question_text: "Were any of the buyers private registered providers, housing association or local authority tenants immediately before this sale?" not_joint_purchase: page_header: "" - check_answer_label: "Buyer was a registered provider, housing association or local authority tenant immediately before this sale?" + check_answer_label: "Buyer was a registered provider, housing association or local authority tenant immediately before this sale" + check_answer_prompt: "Tell us if buyer was a registered provider, housing association or local authority tenant" hint_text: "" question_text: "Was the buyer a private registered provider, housing association or local authority tenant immediately before this sale?" frombeds: page_header: "" check_answer_label: "Number of bedrooms in previous property" + check_answer_prompt: "" hint_text: "A bedsit has 1 bedroom." question_text: "How many bedrooms did the property have?" fromprop: page_header: "" check_answer_label: "Previous property type" + check_answer_prompt: "" hint_text: "" question_text: "What was the previous property type?" socprevten: page_header: "" check_answer_label: "Previous property tenure" + check_answer_prompt: "" hint_text: "" question_text: "What was the previous tenure of the buyer?" value: page_header: "About the price of the property" check_answer_label: "Full purchase price" + check_answer_prompt: "" hint_text: "Enter the full purchase price of the property before any discounts are applied. For shared ownership, enter the full purchase price paid for 100% equity (this is equal to the value of the share owned by the PRP plus the value bought by the purchaser)" question_text: "What was the full purchase price?" equity: page_header: "About the price of the property" check_answer_label: "Initial percentage equity stake" + check_answer_prompt: "" hint_text: "Enter the amount of initial equity held by the purchaser (for example, 25% or 50%)" question_text: "What was the initial percentage equity stake purchased?" mortgageused: page_header: "" check_answer_label: "Mortgage used" + check_answer_prompt: "Tell us if a mortgage was used" hint_text: "" question_text: "Was a mortgage used for the purchase of this property?" mortgage: page_header: "" check_answer_label: "Mortgage amount" + check_answer_prompt: "" 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?" mortgagelender: page_header: "" check_answer_label: "Mortgage lender" + check_answer_prompt: "" hint_text: "" question_text: "What is the name of the mortgage lender?" mortgagelenderother: page_header: "" check_answer_label: "Other Mortgage Lender" + check_answer_prompt: "" hint_text: "" question_text: "What is the other mortgage lender?" mortlen: page_header: "" check_answer_label: "Length of mortgage" + check_answer_prompt: "" hint_text: "You should round up to the nearest year. Value should not exceed 60 years." question_text: "What is the length of the mortgage?" extrabor: page_header: "" - check_answer_label: "Any other borrowing?" + check_answer_label: "Any other borrowing" + check_answer_prompt: "Tell us if there is any other borrowing" hint_text: "" question_text: "Does this include any extra borrowing?" deposit: page_header: "About the deposit" check_answer_label: "Deposit amount" + check_answer_prompt: "" hint_text: "Enter the total cash sum paid by the buyer towards the property that was not funded by the mortgage. This excludes any grant or loan. As this is a fully staircased sale this question is optional. If you do not have the information available click save and continue" question_text: "How much cash deposit was paid on the property?" cashdis: page_header: "About the deposit" check_answer_label: "Cash discount through SocialHomeBuy" + check_answer_prompt: "" hint_text: "Enter the total cash discount given on the property being purchased through the Social HomeBuy scheme" question_text: "How much cash discount was given through Social HomeBuy?" mrent: page_header: "" check_answer_label: "Monthly rent" + check_answer_prompt: "" hint_text: "Amount paid before any charges" question_text: "What is the basic monthly rent?" leaseholdcharges: page_header: "" has_mscharge: - check_answer_label: "Does the property have any monthly leasehold charges?" + check_answer_label: "Property has monthly leasehold charges" + check_answer_prompt: "Tell us if the property has any monthly leasehold charges" hint_text: "For example, service and management charges" question_text: "Does the property have any monthly leasehold charges?" mscharge: check_answer_label: "Monthly leasehold charges" + check_answer_prompt: "" hint_text: "" question_text: "Enter the total monthly charge" @@ -185,23 +216,26 @@ en: discounted_ownership: page_header: "About the price of the property" check_answer_label: "Purchase price" + check_answer_prompt: "" hint_text: "For all schemes, including Right to Acquire (RTA), Right to Buy (RTB), Voluntary Right to Buy (VRTB) or Preserved Right to Buy (PRTB) sales, enter the full price of the property without any discount" question_text: "What is the full purchase price?" outright_sale: page_header: "About the price of the property" check_answer_label: "Purchase price" + check_answer_prompt: "" hint_text: "" question_text: "What is the full purchase price?" discount: page_header: "About the price of the property" check_answer_label: "Percentage discount" + check_answer_prompt: "" 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" + check_answer_prompt: "" 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?" - diff --git a/config/locales/forms/2024/sales/setup.en.yml b/config/locales/forms/2024/sales/setup.en.yml index e5fc49b82..5dcf55984 100644 --- a/config/locales/forms/2024/sales/setup.en.yml +++ b/config/locales/forms/2024/sales/setup.en.yml @@ -6,36 +6,42 @@ en: owning_organisation_id: page_header: "" check_answer_label: "Owning organisation" + check_answer_prompt: "" hint_text: "" question_text: "Which organisation owns this log?" managing_organisation_id: page_header: "" check_answer_label: "Reported by" + check_answer_prompt: "Select reporting organisation" hint_text: "" question_text: "Which organisation is reporting this sale?" assigned_to_id: page_header: "" check_answer_label: "Log owner" + check_answer_prompt: "Select user" hint_text: "" question_text: "Which user are you creating this log for?" saledate: page_header: "" check_answer_label: "Sale completion date" + check_answer_prompt: "" hint_text: "" question_text: "What is the sale completion date?" purchid: page_header: "" check_answer_label: "Purchaser code" + check_answer_prompt: "" hint_text: "This is how you usually refer to the purchaser on your own systems." question_text: "What is the purchaser code?" ownershipsch: page_header: "" check_answer_label: "Purchase made under ownership scheme" + check_answer_prompt: "Tell us if purchase made under ownership scheme" hint_text: "" question_text: "Was this purchase made through an ownership scheme?" @@ -43,68 +49,80 @@ en: shared_ownership: page_header: "Type of shared ownership sale" check_answer_label: "Type of shared ownership sale" + check_answer_prompt: "" hint_text: "When the purchaser buys an initial share of up to 75% of the property value and pays rent to the Private Registered Provider (PRP) on the remaining portion, or a subsequent staircasing transaction" question_text: "What is the type of shared ownership sale?" discounted_ownership: page_header: "Type of discounted ownership sale" check_answer_label: "Type of discounted ownership sale" + check_answer_prompt: "" hint_text: "" question_text: "What is the type of discounted ownership sale?" outright_ownership: page_header: "Type of outright sale" type: check_answer_label: "Type of outright sale" + check_answer_prompt: "" hint_text: "" question_text: "What is the type of outright sale?" othtype: check_answer_label: "Type of other sale" + check_answer_prompt: "" hint_text: "" question_text: "What type of sale is it?" companybuy: page_header: "" check_answer_label: "Company buyer" + check_answer_prompt: "" hint_text: "" question_text: "Is the buyer a company?" buylivein: page_header: "" check_answer_label: "Buyers living in property" + check_answer_prompt: "Tell us if buyers live in the property" hint_text: "" question_text: "Will any buyers live in the property?" jointpur: page_header: "" check_answer_label: "Joint purchase" + check_answer_prompt: "Tell us if joint purchase" hint_text: "This is where two or more people are named as legal owners of the property after the purchase" question_text: "Is this a joint purchase?" jointmore: page_header: "" check_answer_label: "More than 2 joint buyers" + check_answer_prompt: "Tell us if there are more than 2 joint buyers" hint_text: "" question_text: "Are there more than 2 joint buyers of this property?" noint: joint_purchase: page_header: "" - check_answer_label: "Buyers interviewed in person?" + check_answer_label: "Buyers interviewed in person" + check_answer_prompt: "Tell us if buyers interviewed in person" hint_text: "You should still try to answer all questions even if the buyers weren’t interviewed in person" question_text: "Were the buyers interviewed for any of the answers you will provide on this log?" not_joint_purchase: page_header: "" - check_answer_label: "Buyer interviewed in person?" + check_answer_label: "Buyer interviewed in person" + check_answer_prompt: "Tell us if buyer interviewed in person" hint_text: "You should still try to answer all questions even if the buyer wasn’t interviewed in person" question_text: "Was the buyer interviewed for any of the answers you will provide on this log?" privacynotice: joint_purchase: page_header: "Ministry of Housing, Communities and Local Government privacy notice" - check_answer_label: "Buyers have seen the privacy notice?" + check_answer_label: "Buyers have seen the privacy notice" + check_answer_prompt: "Tell us if buyers have seen the privacy notice" hint_text: "" question_text: "Declaration" not_joint_purchase: page_header: "Ministry of Housing, Communities and Local Government privacy notice" - check_answer_label: "Buyer has seen the privacy notice?" + check_answer_label: "Buyer has seen the privacy notice" + check_answer_prompt: "Tell us if buyer has seen the privacy notice" hint_text: "" question_text: "Declaration" diff --git a/config/locales/forms/2024/sales/soft_validations.en.yml b/config/locales/forms/2024/sales/soft_validations.en.yml index fa5434311..1a73f1fd7 100644 --- a/config/locales/forms/2024/sales/soft_validations.en.yml +++ b/config/locales/forms/2024/sales/soft_validations.en.yml @@ -7,6 +7,7 @@ en: max: page_header: "" check_answer_label: "Retirement confirmation" + check_answer_prompt: "" hint_text: "" question_text: "Are you sure this person isn't retired?" title_text: "You told us this person is over 66 and not retired." @@ -14,6 +15,7 @@ en: min: page_header: "" check_answer_label: "Retirement confirmation" + check_answer_prompt: "" hint_text: "" question_text: "Are you sure this person is retired?" title_text: "You told us this person is aged %{age} years and retired." @@ -21,6 +23,7 @@ en: old_persons_shared_ownership_value_check: page_header: "" check_answer_label: "Shared ownership confirmation" + check_answer_prompt: "" hint_text: "" question_text: "Are you sure this is correct?" title_text: @@ -29,6 +32,7 @@ en: informative_text: "At least one buyer must be aged 65 years and over to use this scheme." income1_value_check: check_answer_label: "Buyer 1 income confirmation" + check_answer_prompt: "" hint_text: "" question_text: "Are you sure this is correct?" ecstat: @@ -41,6 +45,7 @@ en: income2_value_check: check_answer_label: "Buyer 2 income confirmation" + check_answer_prompt: "" hint_text: "" question_text: "Are you sure this is correct?" ecstat: @@ -54,6 +59,7 @@ en: combined_income_value_check: page_header: "" check_answer_label: "Combined income confirmation" + check_answer_prompt: "" hint_text: "" question_text: "Are you sure this is correct?" title_text: "You told us the combined income of this household is %{combined_income}. This seems high. Are you sure this is correct?" @@ -61,6 +67,7 @@ en: mortgage_value_check: page_header: "" check_answer_label: "Mortgage confirmation" + check_answer_prompt: "" hint_text: "" question_text: "Are you sure that the mortgage is more than 5 times the income used for the mortgage application?" title_text: "You told us that the mortgage amount is %{mortgage}." @@ -69,6 +76,7 @@ en: savings_value_check: page_header: "" check_answer_label: "Savings confirmation" + check_answer_prompt: "" hint_text: "" question_text: "Are you sure the savings are higher than £100,000?" joint_purchase: @@ -81,6 +89,7 @@ en: staircase_bought_value_check: page_header: "" check_answer_label: "Percentage bought confirmation" + check_answer_prompt: "" hint_text: "" question_text: "Are you sure this is correct?" title_text: "You told us that %{percentage}% was bought in this staircasing transaction." @@ -90,6 +99,7 @@ en: joint_purchase: page_header: "" check_answer_label: "Percentage owned confirmation" + check_answer_prompt: "" hint_text: "" question_text: "Are you sure?" title_text: "You told us that the buyers now own %{stairowned} of the property." @@ -97,6 +107,7 @@ en: not_joint_purchase: page_header: "" check_answer_label: "Percentage owned confirmation" + check_answer_prompt: "" hint_text: "" question_text: "Are you sure?" title_text: "You told us that the buyer now owns %{stairowned} of the property." @@ -105,6 +116,7 @@ en: hodate_check: page_header: "" check_answer_label: "Practical completion or handover date check" + check_answer_prompt: "" hint_text: "" question_text: "Are you sure?" title_text: "You told us practical completion or handover date is more than 3 years before sale completion date." @@ -112,6 +124,7 @@ en: value_value_check: page_header: "" check_answer_label: "Purchase price confirmation" + check_answer_prompt: "" hint_text: "" question_text: "Are you sure?" title_text: "You told us the purchase price is %{value}." @@ -120,6 +133,7 @@ en: shared_ownership_deposit_value_check: page_header: "" check_answer_label: "Shared ownership deposit confirmation" + check_answer_prompt: "" hint_text: "" question_text: "Are you sure this is correct?" title_text: "You told us that the %{mortgage_deposit_and_discount_error_fields} add up to %{mortgage_deposit_and_discount_total}." @@ -128,6 +142,7 @@ en: joint_purchase: page_header: "" check_answer_label: "Deposit confirmation" + check_answer_prompt: "" hint_text: "" 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}." @@ -135,6 +150,7 @@ en: not_joint_purchase: page_header: "" check_answer_label: "Deposit confirmation" + check_answer_prompt: "" hint_text: "" 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}." @@ -143,6 +159,7 @@ en: address_search_value_check: page_header: "" check_answer_label: "" + check_answer_prompt: "" hint_text: "" question_text: "" title_text: "No address found." @@ -150,7 +167,8 @@ en: wheel_value_check: page_header: "" - check_answer_label: "Does anyone in the household use a wheelchair?" + check_answer_label: "Household member uses a wheelchair" + check_answer_prompt: "Tell us if someone uses a wheelchair" hint_text: "" question_text: "You told us that someone in the household uses a wheelchair." title_text: "You told us that someone in the household uses a wheelchair." @@ -159,6 +177,7 @@ en: buyer1: page_header: "" check_answer_label: "Buyer live in confirmation" + check_answer_prompt: "" hint_text: "" question_text: "Are you sure this is correct?" title_text: "You told us that buyer 1 will not live in the property." @@ -166,6 +185,7 @@ en: buyer2: page_header: "" check_answer_label: "Buyer live in confirmation" + check_answer_prompt: "" hint_text: "" question_text: "Are you sure this is correct?" title_text: "You told us that buyer 2 will not live in the property." @@ -174,6 +194,7 @@ en: student_not_child_value_check: page_header: "" check_answer_label: "Student not a child confirmation" + check_answer_prompt: "" hint_text: "" question_text: "Are you sure this person is not a child?" title_text: "You told us this person is a student aged between 16 and 19." @@ -182,6 +203,7 @@ en: partner_under_16_value_check: page_header: "" check_answer_label: "Partner under 16 confirmation" + check_answer_prompt: "" 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." @@ -190,6 +212,7 @@ en: multiple_partners_value_check: page_header: "" check_answer_label: "Multiple partners confirmation" + check_answer_prompt: "" hint_text: "" question_text: "Are you sure this is correct?" title_text: "You told us there are more than 1 persons with 'Partner' relationship to buyer 1." @@ -198,6 +221,7 @@ en: monthly_charges_value_check: page_header: "" check_answer_label: "Monthly charges confirmation" + check_answer_prompt: "" hint_text: "" question_text: "Are you sure this is correct?" title_text: "You told us that the monthly charges were %{mscharge}." @@ -206,6 +230,7 @@ en: extra_borrowing_value_check: page_header: "" check_answer_label: "Extra borrowing confirmation" + check_answer_prompt: "" hint_text: "" question_text: "Are you sure there is no extra borrowing?" title_text: "You told us that the mortgage and deposit total is %{mortgage_and_deposit_total}." @@ -214,6 +239,7 @@ en: percentage_discount_value_check: page_header: "" check_answer_label: "Percentage discount confirmation" + check_answer_prompt: "" hint_text: "" question_text: "Are you sure this is correct?" title_text: "You told us that the percentage discount is %{discount}." @@ -222,6 +248,7 @@ en: grant_value_check: page_header: "" check_answer_label: "Grant value confirmation" + check_answer_prompt: "" hint_text: "" question_text: "Are you sure? Grants are usually £9,000 - £16,000" title_text: "You told us that the grant amount is %{grant}." @@ -230,6 +257,7 @@ en: discounted_sale_value_check: page_header: "" check_answer_label: "Discounted sale value confirmation" + check_answer_prompt: "" hint_text: "" question_text: "Are you sure this is correct?" title_text: "Mortgage, deposit, and grant total must equal %{value_with_discount}." @@ -238,6 +266,7 @@ en: deposit_and_mortgage_value_check: page_header: "" check_answer_label: "Deposit and mortgage against discount confirmation" + check_answer_prompt: "" hint_text: "" question_text: "Are you sure? Mortgage and deposit usually equal or are more than (value - discount)" title_text: "You told us the mortgage amount was %{mortgage}, the cash deposit was %{deposit} and the discount was %{discount}." diff --git a/config/locales/forms/2025/lettings/household_characteristics.en.yml b/config/locales/forms/2025/lettings/household_characteristics.en.yml index 79646b32b..c54048973 100644 --- a/config/locales/forms/2025/lettings/household_characteristics.en.yml +++ b/config/locales/forms/2025/lettings/household_characteristics.en.yml @@ -6,29 +6,34 @@ en: hhmemb: page_header: "" check_answer_label: "Number of household members" + check_answer_prompt: "Enter total number of household members" hint_text: "You can provide details for a maximum of 8 people." question_text: "How many people live in the household for this letting?" age1: page_header: "" age1_known: - check_answer_label: "" + 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: check_answer_label: "Lead tenant’s age" + check_answer_prompt: "" hint_text: "" question_text: "Age" sex1: page_header: "" check_answer_label: "Lead tenant’s gender identity" + check_answer_prompt: "" 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" + check_answer_prompt: "" hint_text: "" question_text: "What is the lead tenant’s ethnic group?" @@ -36,26 +41,31 @@ en: ethnic_background_black: page_header: "" check_answer_label: "Lead tenant’s ethnic background" + check_answer_prompt: "" hint_text: "" question_text: "Which of the following best describes lead tenant’s Black, African, Caribbean or Black British background?" ethnic_background_asian: page_header: "" check_answer_label: "Lead tenant’s ethnic background" + check_answer_prompt: "" hint_text: "" question_text: "Which of the following best describes lead tenant’s Asian or Asian British background?" ethnic_background_arab: page_header: "" check_answer_label: "Lead tenant’s ethnic background" + check_answer_prompt: "" hint_text: "" question_text: "Which of the following best describes the lead tenant’s Arab background?" ethnic_background_mixed: page_header: "" check_answer_label: "Lead tenant’s ethnic background" + check_answer_prompt: "" hint_text: "" question_text: "Which of the following best describes lead tenant’s Mixed or Multiple ethnic groups background?" ethnic_background_white: page_header: "" check_answer_label: "Lead tenant’s ethnic background" + check_answer_prompt: "" hint_text: "" question_text: "Which of the following best describes lead tenant’s White background?" @@ -63,260 +73,305 @@ en: page_header: "" nationality_all: check_answer_label: "Lead tenant’s nationality" + check_answer_prompt: "" hint_text: "" question_text: "Enter a nationality" nationality_all_group: check_answer_label: "Lead tenant’s nationality" + check_answer_prompt: "" hint_text: "If the lead tenant is a dual national of the United Kingdom and another country, enter United Kingdom. If they are a dual national of two other countries, the tenant should decide which country to enter." question_text: "What is the nationality of the lead tenant?" ecstat1: page_header: "" check_answer_label: "Lead tenant’s working situation" + check_answer_prompt: "" hint_text: "" question_text: "Which of these best describes the lead tenant’s working situation?" 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" hint_text: "You must provide details for everyone in the household if you know them." question_text: "Do you know details for person 2?" relat2: page_header: "" check_answer_label: "Person 2 lead tenant’s partner" + check_answer_prompt: "Tell us if person 2 is the lead tenant’s partner" hint_text: "" question_text: "Is tenant 2 the partner of tenant 1?" age2: page_header: "" age2_known: - check_answer_label: "" + check_answer_label: "Person 2’s age" + 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: "" hint_text: "Answer 1 for children aged under 1 year old" question_text: "Age" sex2: page_header: "" check_answer_label: "Person 2’s gender identity" + check_answer_prompt: "" 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?" ecstat2: page_header: "" check_answer_label: "Person 2’s working situation" + check_answer_prompt: "" hint_text: "" question_text: "Which of these best describes person 2’s working situation?" 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" hint_text: "You must provide details for everyone in the household if you know them." question_text: "Do you know details for person 3?" relat3: page_header: "" check_answer_label: "Person 3 lead tenant’s partner" + check_answer_prompt: "Tell us if person 3 is the lead tenant’s partner" hint_text: "" question_text: "Is tenant 3 the partner of tenant 1?" age3: page_header: "" age3_known: - check_answer_label: "" + check_answer_label: "Person 3’s age" + 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: "" hint_text: "Answer 1 for children aged under 1 year old" question_text: "Age" sex3: page_header: "" check_answer_label: "Person 3’s gender identity" + check_answer_prompt: "" 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?" ecstat3: page_header: "" check_answer_label: "Person 3’s working situation" + check_answer_prompt: "" hint_text: "" question_text: "Which of these best describes person 3’s working situation?" 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" hint_text: "You must provide details for everyone in the household if you know them." question_text: "Do you know details for person 4?" relat4: page_header: "" check_answer_label: "Person 4 lead tenant’s partner" + check_answer_prompt: "Tell us if person 4 is the lead tenant’s partner" hint_text: "" question_text: "Is tenant 4 the partner of tenant 1?" age4: page_header: "" age4_known: - check_answer_label: "" + check_answer_label: "Person 4’s age" + 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: "" hint_text: "Answer 1 for children aged under 1 year old" question_text: "Age" sex4: page_header: "" check_answer_label: "Person 4’s gender identity" + check_answer_prompt: "" 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?" ecstat4: page_header: "" check_answer_label: "Person 4’s working situation" + check_answer_prompt: "" hint_text: "" question_text: "Which of these best describes person 4’s working situation?" 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" hint_text: "You must provide details for everyone in the household if you know them." question_text: "Do you know details for person 5?" relat5: page_header: "" check_answer_label: "Person 5 lead tenant’s partner" + check_answer_prompt: "Tell us if person 5 is the lead tenant’s partner" hint_text: "" question_text: "Is tenant 5 the partner of tenant 1?" age5: page_header: "" age5_known: - check_answer_label: "" + check_answer_label: "Person 5’s age" + 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: "" hint_text: "Answer 1 for children aged under 1 year old" question_text: "Age" sex5: page_header: "" check_answer_label: "Person 5’s gender identity" + check_answer_prompt: "" 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?" ecstat5: page_header: "" check_answer_label: "Person 5’s working situation" + check_answer_prompt: "" hint_text: "" question_text: "Which of these best describes person 5’s working situation?" 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" hint_text: "You must provide details for everyone in the household if you know them." question_text: "Do you know details for person 6?" relat6: page_header: "" check_answer_label: "Person 6 lead tenant’s partner" + check_answer_prompt: "Tell us if person 6 is the lead tenant’s partner" hint_text: "" question_text: "Is tenant 6 the partner of tenant 1?" age6: page_header: "" age6_known: - check_answer_label: "" + check_answer_label: "Person 6’s age" + 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: "" hint_text: "Answer 1 for children aged under 1 year old" question_text: "Age" sex6: page_header: "" check_answer_label: "Person 6’s gender identity" + check_answer_prompt: "" 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?" ecstat6: page_header: "" check_answer_label: "Person 6’s working situation" + check_answer_prompt: "" hint_text: "" question_text: "Which of these best describes person 6’s working situation?" 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" hint_text: "You must provide details for everyone in the household if you know them." question_text: "Do you know details for person 7?" relat7: page_header: "" check_answer_label: "Person 7 lead tenant’s partner" + check_answer_prompt: "Tell us if person 7 is the lead tenant’s partner" hint_text: "" question_text: "Is tenant 7 the partner of tenant 1?" age7: page_header: "" age7_known: - check_answer_label: "" + check_answer_label: "Person 7’s age" + check_answer_prompt: "Enter person 7's age if known" hint_text: "" question_text: "Do you know person 7’s age?" age7: check_answer_label: "Person 7’s age" + check_answer_prompt: "" hint_text: "Answer 1 for children aged under 1 year old" question_text: "Age" sex7: page_header: "" check_answer_label: "Person 7’s gender identity" + check_answer_prompt: "" 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 7’s gender identity?" ecstat7: page_header: "" check_answer_label: "Person 7’s working situation" + check_answer_prompt: "" hint_text: "" question_text: "Which of these best describes person 7’s working situation?" 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" hint_text: "You must provide details for everyone in the household if you know them." question_text: "Do you know details for person 8?" relat8: page_header: "" check_answer_label: "Person 8 lead tenant’s partner" + check_answer_prompt: "Tell us if person 8 is the lead tenant’s partner" hint_text: "" question_text: "Is tenant 8 the partner of tenant 1?" age8: page_header: "" age8_known: - check_answer_label: "" + check_answer_label: "Person 8’s age" + check_answer_prompt: "Enter person 8's age if known" hint_text: "" question_text: "Do you know person 8’s age?" age8: check_answer_label: "Person 8’s age" + check_answer_prompt: "" hint_text: "Answer 1 for children aged under 1 year old" question_text: "Age" sex8: page_header: "" check_answer_label: "Person 8’s gender identity" + check_answer_prompt: "" 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 8’s gender identity?" ecstat8: page_header: "" check_answer_label: "Person 8’s working situation" + check_answer_prompt: "" hint_text: "" question_text: "Which of these best describes person 8’s working situation?" diff --git a/config/locales/forms/2025/lettings/household_needs.en.yml b/config/locales/forms/2025/lettings/household_needs.en.yml index ba63f2031..db3135e22 100644 --- a/config/locales/forms/2025/lettings/household_needs.en.yml +++ b/config/locales/forms/2025/lettings/household_needs.en.yml @@ -6,30 +6,35 @@ en: armedforces: page_header: "" check_answer_label: "Household links to UK armed forces" + check_answer_prompt: "Tell us if there are any household links to UK armed forces" hint_text: "This excludes national service.

    If there are several people in the household with links to the UK armed forces, you should answer for the regular. If there’s no regular, answer for the reserve. If there’s no reserve, answer for the spouse or civil partner." question_text: "Does anybody in the household have any links to the UK armed forces?" leftreg: page_header: "" check_answer_label: "Person still serving in UK armed forces" + check_answer_prompt: "Tell us if the person is still serving in UK armed forces" hint_text: "" question_text: "Is the person still serving in the UK armed forces?" reservist: page_header: "" check_answer_label: "Person seriously injured or ill as result of serving in UK armed forces" + check_answer_prompt: "Tell us if the person is seriously injured or ill as result of serving in UK armed forces" hint_text: "" question_text: "Was the person seriously injured or ill as a result of serving in the UK armed forces?" preg_occ: page_header: "" check_answer_label: "Anybody in household pregnant" + check_answer_prompt: "Tell us if anybody in the household is pregnant" hint_text: "" question_text: "Is anybody in the household pregnant?" housingneeds: page_header: "" check_answer_label: "Anybody with disabled access needs" + check_answer_prompt: "Tell us if there is anybody with disabled access needs" hint_text: "" question_text: "Does anybody in the household have any disabled access needs?" @@ -37,21 +42,25 @@ en: page_header: "Disabled access needs" housingneeds_type: check_answer_label: "Disabled access needs" + check_answer_prompt: "" hint_text: "" question_text: "What type of access needs do they have?" housingneeds_other: check_answer_label: "Other disabled access needs" + check_answer_prompt: "Tell us if they have any other disabled access needs" hint_text: "" question_text: "Do they have any other disabled access needs?" illness: page_header: "" check_answer_label: "Anybody in household with physical or mental health condition" + check_answer_prompt: "Tell us if anybody in the household has a physical or mental health condition" hint_text: "" question_text: "Does anybody in the household have a physical or mental health condition (or other illness) expected to last 12 months or more?" condition_effects: page_header: "" check_answer_label: "How is person affected by condition or illness" + check_answer_prompt: "Select how the person is affected by their condition or illness" hint_text: "Select all that apply." question_text: "How is the person affected by their condition or illness?" diff --git a/config/locales/forms/2025/lettings/household_situation.en.yml b/config/locales/forms/2025/lettings/household_situation.en.yml index 2b72c45d0..17c90aaba 100644 --- a/config/locales/forms/2025/lettings/household_situation.en.yml +++ b/config/locales/forms/2025/lettings/household_situation.en.yml @@ -6,12 +6,14 @@ en: layear: page_header: "" check_answer_label: "Length of time in local authority area" + check_answer_prompt: "" hint_text: "" question_text: "How long has the household continuously lived in the local authority area of the new letting?" waityear: page_header: "" check_answer_label: "Length of time on local authority waiting list" + check_answer_prompt: "" hint_text: "" question_text: "How long has the household been on the local authority waiting list for the area of the new letting?" @@ -20,78 +22,92 @@ en: page_header: "" reason: check_answer_label: "Reason for leaving last settled home" + check_answer_prompt: "" hint_text: "You told us this letting is a renewal. We have removed some options because of this." question_text: "What is the tenant’s main reason for the household leaving their last settled home?" reasonother: check_answer_label: "Length of time on local authority waiting list" + check_answer_prompt: "" hint_text: "" question_text: "How long has the household been on the local authority waiting list for the area of the new letting?" reason_for_leaving_last_settled_home: page_header: "" reason: check_answer_label: "Reason for leaving last settled home" + check_answer_prompt: "" hint_text: "The tenant’s ‘last settled home’ is their last long-standing home. For tenants who were in temporary accommodation, sleeping rough or otherwise homeless, their last settled home is where they were living previously." question_text: "What is the tenant’s main reason for the household leaving their last settled home?" reasonother: check_answer_label: "" + check_answer_prompt: "" hint_text: "" question_text: "What is the reason?" prevten: renewal: page_header: "" - check_answer_label: "Where was the household immediately before this letting?" + check_answer_label: "Where household was immediately before this letting" + check_answer_prompt: "" hint_text: "You told us this letting is a renewal. We have removed some options because of this.

    This is where the household was the night before they moved into this new let." question_text: "Where was the household immediately before this letting?" not_renewal: page_header: "" - check_answer_label: "Where was the household immediately before this letting?" + check_answer_label: "Where household was immediately before this letting" + check_answer_prompt: "" hint_text: "This is where the household was the night before they moved into this new let." question_text: "Where was the household immediately before this letting?" homeless: page_header: "" check_answer_label: "Household homeless immediately before letting" + check_answer_prompt: "Tell us if household homeless immediately before letting" hint_text: "" question_text: "Did the household experience homelessness immediately before this letting?" previous_postcode: page_header: "" ppcodenk: - check_answer_label: "" + check_answer_label: "Postcode of the household’s last settled accommodation" + check_answer_prompt: "Enter the postcode of the household’s last settled accommodation if known" hint_text: "This is the tenant’s last long-standing home. It is where the tenant was living before any period in temporary accommodation, sleeping rough or otherwise homeless." question_text: "Do you know the postcode of the household’s last settled accommodation?" ppostcode_full: check_answer_label: "Postcode of household’s last settled accommodation" + check_answer_prompt: "" hint_text: "" question_text: "Postcode for the previous accommodation" previous_local_authority: page_header: "" previous_la_known: - check_answer_label: "" + 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 the tenant’s last long-standing home. It is where the tenant was living before any period in temporary accommodation, sleeping rough or otherwise homeless." question_text: "Do you know the local authority of the household’s last settled accommodation?" prevloc: check_answer_label: "Location of household’s last settled accommodation" + check_answer_prompt: "" hint_text: "Select ‘Northern Ireland’, ‘Scotland’, ‘Wales’ or ‘Outside the UK’ if the household’s last settled home was outside England." question_text: "Select a local authority" reasonpref: page_header: "" check_answer_label: "Household given reasonable preference" + check_answer_prompt: "Tell us if the household was given reasonable preference" hint_text: "Households may be given ‘reasonable preference’ for social housing under one or more specific categories by the local authority. This is also known as ‘priority need’." question_text: "Was the household given ‘reasonable preference’ by the local authority?" reasonable_preference_reason: page_header: "" check_answer_label: "Reason for reasonable preference" + check_answer_prompt: "" hint_text: "Select all that apply." question_text: "Why was the household given ‘reasonable preference’?" letting_allocation: page_header: "" check_answer_label: "Allocation system" + check_answer_prompt: "" hint_text: "Select all that apply." question_text: "How was this letting allocated?" @@ -100,21 +116,25 @@ en: prp: page_header: "" check_answer_label: "Source of referral for letting" + check_answer_prompt: "" hint_text: "" question_text: "What was the source of referral for this letting?" la: page_header: "" check_answer_label: "Source of referral for letting" + check_answer_prompt: "" hint_text: "You told us that you are a local authority. We have removed some options because of this." question_text: "What was the source of referral for this letting?" general_needs: prp: page_header: "" check_answer_label: "Source of referral for letting" + check_answer_prompt: "" hint_text: "You told us that the needs type is general needs. We have removed some options because of this." question_text: "What was the source of referral for this letting?" la: page_header: "" check_answer_label: "Source of referral for letting" + check_answer_prompt: "" hint_text: "You told us that you are a local authority and that the needs type is general needs. We have removed some options because of this." question_text: "What was the source of referral for this letting?" 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 5b8ed26c0..831d1021e 100644 --- a/config/locales/forms/2025/lettings/income_and_benefits.en.yml +++ b/config/locales/forms/2025/lettings/income_and_benefits.en.yml @@ -5,42 +5,49 @@ en: income_and_benefits: net_income_known: page_header: "Household’s combined income after tax" - check_answer_label: "Do you know the household’s combined total income after tax?" + check_answer_label: "Household’s combined total income after tax" + check_answer_prompt: "Tell us if you know the household’s combined total income after tax" hint_text: "" question_text: "Do you know the household’s combined income after tax?" income_amount: page_header: "Total household income" incfreq: - check_answer_label: "How often does the household receive this amount?" + check_answer_label: "How often the household receives this amount" + check_answer_prompt: "Tell us how often does the household receives this amount" hint_text: "" question_text: "How often does the household receive this amount?" earnings: check_answer_label: "Total household income" + check_answer_prompt: "" hint_text: "" question_text: "How much income does the household have in total?" hb: page_header: "" - check_answer_label: "Housing-related benefits received" - hint_text: "This is about when the tenant is in their new let. If they are unsure about the situation for their new let and their financial and working situation hasn’t changed significantly, answer based on what housing-related benefits they currently receive." - question_text: "Is the household likely to be receiving any of these housing-related benefits?" + check_answer_label: "Housing related benefits received" + check_answer_prompt: "Tell us if household receives housing related benefits" + hint_text: "This is about when the tenant is in their new let. If they are unsure about the situation for their new let and their financial and working situation hasn’t changed significantly, answer based on what housing related benefits they currently receive." + question_text: "Is the household likely to be receiving any of these housing related benefits?" benefits: page_header: "" check_answer_label: "Household income from Universal Credit, state pension or benefit" + check_answer_prompt: "Tell us if household income is from Universal Credit, state pension or benefit" hint_text: "This excludes child and housing benefit, council tax support and tax credits." question_text: "How much of the household’s income is from Universal Credit, state pensions or benefits?" household_charge: page_header: "" check_answer_label: "Does the household pay rent or charges" + check_answer_prompt: "Tell us if the household pay rent or charges" hint_text: "If rent is charged on the property then answer Yes to this question, even if the tenants do not pay it themselves." question_text: "Does the household pay rent or other charges for the accommodation?" period: page_header: "" check_answer_label: "Frequency of household rent and charges" + check_answer_prompt: "" hint_text: "Select how often the household is charged. This may be different to how often they pay." question_text: "How often does the household pay rent and other charges?" @@ -48,22 +55,27 @@ en: page_header: "" is_carehome: check_answer_label: "Care home accommodation" + check_answer_prompt: "Tell us if care home accommodation" hint_text: "" question_text: "Is this accommodation a care home?" chcharge_weekly: check_answer_label: "Care home charges" + check_answer_prompt: "" hint_text: "" question_text: "How much does the household pay every week?" chcharge_bi_weekly: check_answer_label: "Care home charges" + check_answer_prompt: "" hint_text: "" question_text: "How much does the household pay every 2 weeks?" chcharge_4_weekly: check_answer_label: "Care home charges" + check_answer_prompt: "" hint_text: "" question_text: "How much does the household pay every 4 weeks?" chcharge_monthly: check_answer_label: "Care home charges" + check_answer_prompt: "" hint_text: "" question_text: "How much does the household pay every month?" @@ -71,38 +83,46 @@ en: page_header: "Household rent and charges" brent: check_answer_label: "Basic rent" + check_answer_prompt: "" hint_text: "This is the amount paid before any charges are added for services (for example, hot water or cleaning). Households may receive housing benefit or Universal Credit towards basic rent." question_text: "What is the basic rent?" scharge: check_answer_label: "Service charge" + check_answer_prompt: "" hint_text: "For example, for cleaning. Households may receive housing benefit or Universal Credit towards the service charge." question_text: "What is the service charge?" pscharge: check_answer_label: "Personal service charge" + check_answer_prompt: "" hint_text: "For example, for heating or hot water. This doesn’t include housing benefit or Universal Credit." question_text: "What is the personal service charge?" supcharg: check_answer_label: "Support charge" + check_answer_prompt: "" hint_text: "Any charges made to fund support services included in tenancy agreement." question_text: "What is the support charge?" tcharge: check_answer_label: "Household rent and charges" + check_answer_prompt: "" hint_text: "This is the total for rent and all charges." question_text: "Total charge" hbrentshortfall: page_header: "" check_answer_label: "Any outstanding amount for basic rent and charges" + check_answer_prompt: "Tell us if any outstanding amount for basic rent and charges" hint_text: "Also known as the ‘outstanding amount’." - question_text: "After the household has received any housing-related benefits, will they still need to pay for rent and charges?" + question_text: "After the household has received any housing related benefits, will they still need to pay for rent and charges?" outstanding_amount: page_header: "" tshortfall_known: - check_answer_label: "Do you know the outstanding amount?" + check_answer_label: "Outstanding amount known" + check_answer_prompt: "Tell us if you know the outstanding amount" hint_text: "You only need to give an approximate figure." question_text: "Can you estimate the outstanding amount?" tshortfall: check_answer_label: "Estimated outstanding amount" + check_answer_prompt: "" hint_text: "Also known as the ‘outstanding amount’." question_text: "Estimated outstanding amount" diff --git a/config/locales/forms/2025/lettings/property_information.en.yml b/config/locales/forms/2025/lettings/property_information.en.yml index d32f1e0de..71a2b6124 100644 --- a/config/locales/forms/2025/lettings/property_information.en.yml +++ b/config/locales/forms/2025/lettings/property_information.en.yml @@ -5,24 +5,28 @@ en: property_information: first_time_property_let_as_social_housing: page_header: "" - check_answer_label: "First time being let as social-housing?" + 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" hint_text: "" question_text: "Is this the first time the property has been let as social housing?" uprn: page_header: "" uprn_known: - check_answer_label: "UPRN known?" + 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?" uprn: check_answer_label: "UPRN" + check_answer_prompt: "" hint_text: "" question_text: "What is the property's UPRN?" uprn_confirmed: page_header: "We found an address that might be this property" check_answer_label: "Is this the right address?" + check_answer_prompt: "Tell us if this is the right address" hint_text: "" question_text: "Is this the property address?" @@ -30,16 +34,19 @@ en: page_header: "Find an address" address_line1_input: check_answer_label: "Find address" + check_answer_prompt: "Try find address" hint_text: "" question_text: "Address line 1" postcode_full_input: check_answer_label: "" + check_answer_prompt: "" hint_text: "" question_text: "Postcode" uprn_selection: page_header: "We found an address that might be this property" - check_answer_label: "Select the correct address" + check_answer_label: "Select correct address" + check_answer_prompt: "Select correct address" hint_text: "" question_text: "Select the correct address" @@ -47,71 +54,83 @@ en: 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" hint_text: "" question_text: "Address line 1" address_line2: check_answer_label: "" + check_answer_prompt: "" hint_text: "" question_text: "Address line 2 (optional)" town_or_city: check_answer_label: "Town or city" + check_answer_prompt: "" hint_text: "" question_text: "Town or city" county: check_answer_label: "County" + check_answer_prompt: "" hint_text: "" question_text: "County (optional)" postcode_full: check_answer_label: "Postcode" + check_answer_prompt: "" hint_text: "" question_text: "Postcode" la: page_header: "" check_answer_label: "Local authority" + check_answer_prompt: "" hint_text: "" question_text: "What is the property’s local authority?" - unitletas: page_header: "" check_answer_label: "Most recent let type" + check_answer_prompt: "" hint_text: "This is the rent type of the previous tenancy in this property." question_text: "What type was the property most recently let as?" rsnvac: page_header: "" check_answer_label: "Vacancy reason" + check_answer_prompt: "" hint_text: "" question_text: "What is the reason for the property being vacant?" unittype_gn: page_header: "" check_answer_label: "Type of unit" + check_answer_prompt: "" hint_text: "" question_text: "What type of unit is the property?" builtype: page_header: "" check_answer_label: "Type of building" + check_answer_prompt: "" hint_text: "" question_text: "What type of building is the property?" wchair: page_header: "" check_answer_label: "Property built or adapted to wheelchair-user standards" + check_answer_prompt: "Tell us if the property is built or adapted to wheelchair-user standards" hint_text: "This is whether someone who uses a wheelchair is able to make full use of all of the property’s rooms and facilities, including use of both inside and outside space, and entering and exiting the property." question_text: "Is the property built or adapted to wheelchair-user standards?" beds: page_header: "" check_answer_label: "Number of bedrooms" + check_answer_prompt: "" hint_text: "If shared accommodation, enter the number of bedrooms occupied by this household." question_text: "How many bedrooms does the property have?" voiddate: page_header: "Void date" check_answer_label: "Void date" + check_answer_prompt: "" hint_text: "" question_text: "What is the void date?" @@ -119,15 +138,18 @@ en: page_header: "" majorrepairs: check_answer_label: "Major repairs carried out during void period" + check_answer_prompt: "" hint_text: "Major repairs are works that could not be reasonably carried out with a tenant living at the property. For example, structural repairs." question_text: "Were any major repairs carried out during the void period?" mrcdate: check_answer_label: "Completion date of repairs" + check_answer_prompt: "" hint_text: "" question_text: "When were the repairs completed?" - + sheltered: page_header: "" - check_answer_label: "Is this letting in sheltered accommodation?" + check_answer_label: "Letting in sheltered accommodation" + check_answer_prompt: "Tell us if letting is in sheltered accommodation" hint_text: "Sheltered housing and special retirement housing are for tenants with low-level care and support needs. This typically provides some limited support to enable independent living, such as alarm-based assistance or a scheme manager.

    Extra care housing is for tenants with medium to high care and support needs, often with 24 hour access to support staff provided by an agency registered with the Care Quality Commission." question_text: "Is this letting in sheltered accommodation?" diff --git a/config/locales/forms/2025/lettings/setup.en.yml b/config/locales/forms/2025/lettings/setup.en.yml index 029b5e91e..bf228f9c9 100644 --- a/config/locales/forms/2025/lettings/setup.en.yml +++ b/config/locales/forms/2025/lettings/setup.en.yml @@ -6,30 +6,35 @@ en: owning_organisation_id: page_header: "" check_answer_label: "Stock owner" + check_answer_prompt: "" hint_text: "" question_text: "Which organisation owns this property?" managing_organisation_id: page_header: "" check_answer_label: "Managing agent" + check_answer_prompt: "" hint_text: "" question_text: "Which organisation manages this letting?" assigned_to_id: page_header: "" check_answer_label: "Log owner" + check_answer_prompt: "Select user" hint_text: "" question_text: "Which user are you creating this log for?" needstype: page_header: "" check_answer_label: "Needs type" + check_answer_prompt: "" hint_text: "General needs housing includes both self-contained and shared housing without support or specific adaptations. Supported housing can include direct access hostels, group homes, residential care and nursing homes." question_text: "What is the needs type?" scheme_id: page_header: "Scheme" check_answer_label: "Scheme name" + check_answer_prompt: "" hint_text: "Enter postcode or scheme name.

    A supported housing scheme provides shared or self-contained housing for a particular client group, for example younger or vulnerable people." question_text: "What scheme is this log for?" @@ -37,23 +42,27 @@ en: less_than_twenty: page_header: "Location" check_answer_label: "Location" + check_answer_prompt: "" hint_text: "" question_text: "Which location is this letting for?" twenty_or_more: page_header: "Location" check_answer_label: "Location" + check_answer_prompt: "" hint_text: '
    This scheme has 20 or more locations.
    Enter postcode or address.' question_text: "Which location is this letting for?" renewal: page_header: "" check_answer_label: "Property renewal" + check_answer_prompt: "Tell us if it's a property renewal" hint_text: "If the property was previously being used as temporary accommodation, then answer 'no'." question_text: "Is this letting a renewal of social housing to the same tenant in the same property?" startdate: page_header: "" check_answer_label: "Tenancy start date" + check_answer_prompt: "" hint_text: "" question_text: "What is the tenancy start date?" @@ -61,27 +70,32 @@ en: page_header: "Rent Type" rent_type: check_answer_label: "Rent type" + check_answer_prompt: "" hint_text: "" question_text: "What is the rent type?" irproduct_other: check_answer_label: "Product name" + check_answer_prompt: "" hint_text: "" question_text: "Name of rent product" tenancycode: page_header: "" check_answer_label: "Tenant code" + check_answer_prompt: "" hint_text: "This is how you usually refer to this tenancy on your own systems." question_text: "What is the tenant code?" propcode: page_header: "" check_answer_label: "Property reference" + check_answer_prompt: "" hint_text: "This is how you usually refer to this property on your own systems." question_text: "What is the property reference?" declaration: page_header: "Ministry of Housing, Communities and Local Government privacy notice" check_answer_label: "Tenant has seen the privacy notice" + check_answer_prompt: "Tell us if tenant has seen the privacy notice" hint_text: "" question_text: "Declaration" diff --git a/config/locales/forms/2025/lettings/soft_validations.en.yml b/config/locales/forms/2025/lettings/soft_validations.en.yml index 42292bd9e..8e018b315 100644 --- a/config/locales/forms/2025/lettings/soft_validations.en.yml +++ b/config/locales/forms/2025/lettings/soft_validations.en.yml @@ -7,6 +7,7 @@ en: no_females_pregnant_household_value_check: page_header: "" check_answer_label: "Pregnancy confirmation" + check_answer_prompt: "Confirm pregnancy answer" hint_text: "" question_text: "Are you sure this is correct?" title_text: "You told us somebody in the household is pregnant." @@ -14,127 +15,143 @@ en: females_in_soft_age_range_in_pregnant_household_value_check: page_header: "" check_answer_label: "Pregnancy confirmation" + check_answer_prompt: "Confirm pregnancy status" hint_text: "" question_text: "Are you sure this is correct?" title_text: "You told us somebody in the household is pregnant." informative_text: "You also told us that any female tenants living at the property are in the following age ranges:" no_retirement_value_check: - page_header: "" - check_answer_label: "Retirement confirmation" - hint_text: "" - question_text: "Are you sure this person is retired?" - title_text: "You told us this person is aged %{age} years and retired." - informative_text: "The minimum expected retirement age in England is 66." + page_header: "" + check_answer_label: "Retirement confirmation" + check_answer_prompt: "Confirm retirement status" + hint_text: "" + question_text: "Are you sure this person is retired?" + title_text: "You told us this person is aged %{age} years and retired." + informative_text: "The minimum expected retirement age in England is 66." retirement_value_check: - page_header: "" - check_answer_label: "Retirement confirmation" - hint_text: "" - 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: "Are you sure this person isn’t retired?" + page_header: "" + check_answer_label: "Retirement confirmation" + check_answer_prompt: "Confirm retirement status" + hint_text: "" + 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: "Are you sure this person isn’t retired?" partner_under_16_value_check: - page_header: "" - check_answer_label: "Partner under 16 confirmation" - 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." - informative_text: "Are you sure this is correct?" + page_header: "" + check_answer_label: "Partner under 16 confirmation" + 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." + informative_text: "Are you sure this is correct?" multiple_partners_value_check: - page_header: "" - check_answer_label: "Multiple partners confirmation" - hint_text: "" - question_text: "Are you sure this is correct?" - title_text: "You told us there are more than 1 persons with 'Partner' relationship to the lead tenant." - informative_text: "Are you sure this is correct?" + page_header: "" + check_answer_label: "Multiple partners confirmation" + check_answer_prompt: "Confirm multiple partners" + hint_text: "" + question_text: "Are you sure this is correct?" + title_text: "You told us there are more than 1 persons with 'Partner' relationship to the lead tenant." + informative_text: "Are you sure this is correct?" reasonother_value_check: - page_header: "" - check_answer_label: "Reason other confirmation" - hint_text: "" - question_text: "Are you sure this doesn’t fit an existing category?" - title_text: "You told us that the tenant’s main reason for leaving their last settled home was %{reasonother}." - informative_text: "The reason you have entered looks very similar to one of the existing response categories. Please check the categories and select the appropriate one. If the existing categories are not suitable, please confirm here to move onto the next question." + page_header: "" + check_answer_label: "Reason other confirmation" + check_answer_prompt: "Confirm reason for leaving" + hint_text: "" + question_text: "Are you sure this doesn’t fit an existing category?" + title_text: "You told us that the tenant’s main reason for leaving their last settled home was %{reasonother}." + informative_text: "The reason you have entered looks very similar to one of the existing response categories. Please check the categories and select the appropriate one. If the existing categories are not suitable, please confirm here to move onto the next question." referral_value_check: - page_header: "" - check_answer_label: "Referral confirmation" - hint_text: "" - question_text: "Are you sure?" - title_text: "Are you sure?" - informative_text: "This is a general needs log, and this referral type is for supported housing." + page_header: "" + check_answer_label: "Referral confirmation" + check_answer_prompt: "Confirm referral type" + hint_text: "" + question_text: "Are you sure?" + title_text: "Are you sure?" + informative_text: "This is a general needs log, and this referral type is for supported housing." net_income_value_check: - page_header: "" - check_answer_label: "Net income confirmation" - hint_text: "" - question_text: "Are you sure this is correct?" - title_text: "You told us that the household’s income is %{earnings} %{incfreq}." - informative_text: "This is %{net_income_higher_or_lower_text} than we would expect for the household’s working situation." + page_header: "" + check_answer_label: "Net income confirmation" + check_answer_prompt: "Confirm net income" + hint_text: "" + question_text: "Are you sure this is correct?" + title_text: "You told us that the household’s income is %{earnings} %{incfreq}." + informative_text: "This is %{net_income_higher_or_lower_text} than we would expect for the household’s working situation." care_home_charges_value_check: - page_header: "" - check_answer_label: "Care home charges confirmation" - hint_text: "" - question_text: "Are you sure there are no care home charges?" - title_text: "Care home charges should be provided if this is a care home accommodation." - informative_text: "Are you sure there are no care home charges?" + page_header: "" + check_answer_label: "Care home charges confirmation" + check_answer_prompt: "Confirm care home charges" + hint_text: "" + question_text: "Are you sure there are no care home charges?" + title_text: "Care home charges should be provided if this is a care home accommodation." + informative_text: "Are you sure there are no care home charges?" rent_value_check: - page_header: "" - check_answer_label: "Total rent confirmation" - hint_text: "Check the following:" - question_text: "Are you sure this is correct?" - title_text: "You told us the rent is %{brent}." - informative_text: "This is %{higher_or_lower} than we would expect." + page_header: "" + check_answer_label: "Total rent confirmation" + check_answer_prompt: "Confirm total rent" + hint_text: "Check the following:" + question_text: "Are you sure this is correct?" + title_text: "You told us the rent is %{brent}." + informative_text: "This is %{higher_or_lower} than we would expect." scharge_value_check: - page_header: "" - check_answer_label: "Service charge confirmation" - hint_text: "Check the following:" - question_text: "Are you sure?" - title_text: "You told us the service charge is %{scharge}." - informative_text: "This is higher than we would expect." + page_header: "" + check_answer_label: "Service charge confirmation" + check_answer_prompt: "Confirm service charge" + hint_text: "Check the following:" + question_text: "Are you sure?" + title_text: "You told us the service charge is %{scharge}." + informative_text: "This is higher than we would expect." pscharge_value_check: - page_header: "" - check_answer_label: "Personal service charge confirmation" - hint_text: "Check the following:" - question_text: "Are you sure?" - title_text: "You told us the personal service charge is %{pscharge}." - informative_text: "This is higher than we would expect." + page_header: "" + check_answer_label: "Personal service charge confirmation" + check_answer_prompt: "Confirm personal service charge" + hint_text: "Check the following:" + question_text: "Are you sure?" + title_text: "You told us the personal service charge is %{pscharge}." + informative_text: "This is higher than we would expect." supcharg_value_check: - page_header: "" - check_answer_label: "Support charge confirmation" - hint_text: "Check the following:" - question_text: "Are you sure?" - title_text: "You told us the support charge is %{supcharg}." - informative_text: "This is higher than we would expect." + page_header: "" + check_answer_label: "Support charge confirmation" + check_answer_prompt: "Confirm support charge" + hint_text: "Check the following:" + question_text: "Are you sure?" + title_text: "You told us the support charge is %{supcharg}." + informative_text: "This is higher than we would expect." void_date_value_check: - page_header: "" - check_answer_label: "Void date confirmation" - hint_text: "" - question_text: "Are you sure the property has been vacant for this long?" - title_text: "You told us that the property has been vacant for more than 2 years." - informative_text: "This is longer than we would expect." + page_header: "" + check_answer_label: "Void date confirmation" + check_answer_prompt: "Confirm void date" + hint_text: "" + question_text: "Are you sure the property has been vacant for this long?" + title_text: "You told us that the property has been vacant for more than 2 years." + informative_text: "This is longer than we would expect." major_repairs_date_value_check: - page_header: "" - check_answer_label: "Major repairs date confirmation" - hint_text: "" - question_text: "Are you sure the property has been vacant for this long?" - title_text: "You told us the property has been vacant for 2 years." - informative_text: "This is longer than we would expect." - + page_header: "" + check_answer_label: "Major repairs date confirmation" + check_answer_prompt: "Confirm major repairs date" + hint_text: "" + question_text: "Are you sure the property has been vacant for this long?" + title_text: "You told us the property has been vacant for 2 years." + informative_text: "This is longer than we would expect." + no_address_found: - page_header: "" - check_answer_label: "No address found" - hint_text: "" - question_text: "We could not find an address that matches your search. You can search again or continue to enter the address manually." - title_text: "No address found" - informative_text: "We could not find an address that matches your search. You can search again or continue to enter the address manually." + page_header: "" + check_answer_label: "No address found" + check_answer_prompt: "Confirm no address found" + hint_text: "" + question_text: "We could not find an address that matches your search. You can search again or continue to enter the address manually." + title_text: "No address found" + informative_text: "We could not find an address that matches your search. You can search again or continue to enter the address manually." diff --git a/config/locales/forms/2025/lettings/tenancy_information.en.yml b/config/locales/forms/2025/lettings/tenancy_information.en.yml index 5d0c41dbb..2b3ef6b37 100644 --- a/config/locales/forms/2025/lettings/tenancy_information.en.yml +++ b/config/locales/forms/2025/lettings/tenancy_information.en.yml @@ -5,13 +5,15 @@ en: tenancy_information: joint: page_header: "" - check_answer_label: "Is this a joint tenancy?" + check_answer_label: "Joint tenancy" + check_answer_prompt: "Tell us if it's a joint tenancy" hint_text: "This is where two or more people are named on the tenancy agreement" question_text: "Is this a joint tenancy?" startertenancy: page_header: "" - check_answer_label: "Is this a starter or introductory tenancy?" + check_answer_label: "Starter or introductory tenancy" + check_answer_prompt: "Tell us if it's a starter or introductory tenancy" hint_text: "If the tenancy has an ‘introductory period’ answer ‘yes’.

    You should submit a CORE log at the beginning of the starter tenancy or introductory period, with the best information you have at the time. You do not need to submit a log when a tenant later rolls onto the main tenancy." question_text: "Is this a starter tenancy?" @@ -20,20 +22,24 @@ en: page_header: "" tenancy: check_answer_label: "Type of main tenancy" + check_answer_prompt: "" hint_text: "" question_text: "What is the type of tenancy?" tenancyother: check_answer_label: "" + check_answer_prompt: "" hint_text: "" question_text: "Please state the tenancy type" starter_tenancy_type: page_header: "" tenancy: check_answer_label: "Type of main tenancy after the starter or introductory period has ended" + check_answer_prompt: "" hint_text: "" question_text: "What is the type of tenancy after the starter or introductory period has ended?" tenancyother: check_answer_label: "" + check_answer_prompt: "" hint_text: "" question_text: "Please state the tenancy type" @@ -41,20 +47,31 @@ en: tenancy_length: page_header: "" check_answer_label: "Length of fixed-term tenancy" + check_answer_prompt: "" hint_text: "Do not include the starter or introductory period." question_text: "What is the length of the fixed-term tenancy to the nearest year?" tenancy_length_affordable_rent: page_header: "" check_answer_label: "Length of fixed-term tenancy" + check_answer_prompt: "" hint_text: "Do not include the starter or introductory period.
    The minimum period is 2 years for social or affordable rent general needs logs. You do not need to submit CORE logs for these types of tenancies if they are shorter than 2 years." question_text: "What is the length of the fixed-term tenancy to the nearest year?" tenancy_length_intermediate_rent: page_header: "" check_answer_label: "Length of fixed-term tenancy" + check_answer_prompt: "" hint_text: "Do not include the starter or introductory period.
    The minimum period is 1 year for intermediate rent general needs logs. You do not need to submit CORE logs for these types of tenancies if they are shorter than 1 year." question_text: "What is the length of the fixed-term tenancy to the nearest year?" tenancy_length_periodic: page_header: "" check_answer_label: "Length of periodic tenancy" + check_answer_prompt: "" hint_text: "As this is a periodic tenancy, this question is optional. If you do not have the information available click save and continue" question_text: "What is the length of the periodic tenancy to the nearest year?" + + sheltered: + page_header: "" + check_answer_label: "Letting in sheltered accommodation" + check_answer_prompt: "Tell us if letting is in sheltered accommodation" + hint_text: "Sheltered housing and special retirement housing are for tenants with low-level care and support needs. This typically provides some limited support to enable independent living, such as alarm-based assistance or a scheme manager.

    Extra care housing is for tenants with medium to high care and support needs, often with 24 hour access to support staff provided by an agency registered with the Care Quality Commission." + question_text: "Is this letting in sheltered accommodation?" diff --git a/config/locales/forms/2025/sales/household_characteristics.en.yml b/config/locales/forms/2025/sales/household_characteristics.en.yml index a217c578c..bde557cea 100644 --- a/config/locales/forms/2025/sales/household_characteristics.en.yml +++ b/config/locales/forms/2025/sales/household_characteristics.en.yml @@ -7,22 +7,26 @@ en: page_header: "" age1_known: check_answer_label: "Buyer 1’s age" + 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" hint_text: "" question_text: "Age" sex1: page_header: "" check_answer_label: "Buyer 1’s gender identity" + check_answer_prompt: "" 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 buyer 1’s gender identity?" ethnic_group: page_header: "" check_answer_label: "Buyer 1’s ethnic group" + check_answer_prompt: "" hint_text: "" question_text: "What is buyer 1’s ethnic group?" @@ -30,50 +34,59 @@ en: ethnic_background_black: page_header: "" check_answer_label: "Buyer 1’s ethnic background" + check_answer_prompt: "" hint_text: "" question_text: "Which of the following best describes buyer 1’s Black, African, Caribbean or Black British background?" ethnic_background_asian: page_header: "" check_answer_label: "Buyer 1’s ethnic background" + check_answer_prompt: "" hint_text: "" question_text: "Which of the following best describes buyer 1’s Asian or Asian British background?" ethnic_background_arab: page_header: "" check_answer_label: "Buyer 1’s ethnic background" + check_answer_prompt: "" hint_text: "" question_text: "Which of the following best describes buyer 1’s Arab background?" ethnic_background_mixed: page_header: "" check_answer_label: "Buyer 1’s ethnic background" + check_answer_prompt: "" hint_text: "" question_text: "Which of the following best describes buyer 1’s Mixed or Multiple ethnic groups background?" ethnic_background_white: page_header: "" check_answer_label: "Buyer 1’s ethnic background" + check_answer_prompt: "" hint_text: "" question_text: "Which of the following best describes buyer 1’s White background?" nationality_all_group: page_header: "" check_answer_label: "Buyer 1’s nationality" + check_answer_prompt: "" hint_text: "If buyer 1 is a dual national of the United Kingdom and another country, enter United Kingdom. If they are a dual national of two other countries, the buyer should decide which country to enter." question_text: "What is buyer 1’s nationality?" nationality_all: page_header: "" check_answer_label: "Buyer 1’s nationality" + check_answer_prompt: "" hint_text: "" question_text: "Enter a nationality" ecstat1: page_header: "" check_answer_label: "Buyer 1's working situation" + check_answer_prompt: "" hint_text: "" question_text: "Which of these best describes buyer 1's working situation?" buy1livein: page_header: "" - check_answer_label: "Will buyer 1 live in the property?" + check_answer_label: "Buyer 1 lives in the property" + check_answer_prompt: "Tell us if buyer 1 lives in the property" hint_text: "" question_text: "Will buyer 1 live in the property?" @@ -81,11 +94,13 @@ en: buyer: page_header: "" check_answer_label: "Buyer 2 is the partner of buyer 1" + check_answer_prompt: "Tell us if buyer 2 is the partner of buyer 1" hint_text: "" question_text: "Is buyer 2 the partner of buyer 1?" person: page_header: "" check_answer_label: "Person 2 is the partner of buyer 1" + check_answer_prompt: "Tell us if person 2 is the partner of buyer 1" hint_text: "" question_text: "Is person 2 the partner of buyer 1?" @@ -94,20 +109,24 @@ en: page_header: "" age2_known: check_answer_label: "Buyer 2’s age" + 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" hint_text: "" question_text: "Age" person: page_header: "" age2_known: - check_answer_label: "Person 2’s age known?" + check_answer_label: "Person 2’s age" + 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" hint_text: "" question_text: "Age" @@ -115,56 +134,66 @@ en: buyer: page_header: "" check_answer_label: "Buyer 2’s gender identity" + check_answer_prompt: "" 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 buyer 2’s gender identity?" person: page_header: "" check_answer_label: "Person 2’s gender identity" + check_answer_prompt: "" 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?" ethnic_group2: - page_header: "" - check_answer_label: "Buyer 2’s ethnic group" - hint_text: "" - question_text: "What is buyer 2’s ethnic group?" + page_header: "" + check_answer_label: "Buyer 2’s ethnic group" + check_answer_prompt: "" + hint_text: "" + question_text: "What is buyer 2’s ethnic group?" ethnicbuy2: ethnic_background_black: page_header: "" check_answer_label: "Buyer 2’s ethnic background" + check_answer_prompt: "" hint_text: "" question_text: "Which of the following best describes buyer 2’s Black, African, Caribbean or Black British background?" ethnic_background_asian: page_header: "" check_answer_label: "Buyer 2’s ethnic background" + check_answer_prompt: "" hint_text: "" question_text: "Which of the following best describes buyer 2’s Asian or Asian British background?" ethnic_background_arab: page_header: "" check_answer_label: "Buyer 2’s ethnic background" + check_answer_prompt: "" hint_text: "" question_text: "Which of the following best describes buyer 2’s Arab background?" ethnic_background_mixed: page_header: "" check_answer_label: "Buyer 2’s ethnic background" + check_answer_prompt: "" hint_text: "" question_text: "Which of the following best describes buyer 2’s Mixed or Multiple ethnic groups background?" ethnic_background_white: page_header: "" check_answer_label: "Buyer 2’s ethnic background" + check_answer_prompt: "" hint_text: "" question_text: "Which of the following best describes buyer 2’s White background?" nationality_all_buyer2_group: page_header: "" check_answer_label: "Buyer 2’s nationality" + check_answer_prompt: "" hint_text: "If buyer 1 is a dual national of the United Kingdom and another country, enter United Kingdom. If they are a dual national of two other countries, the buyer should decide which country to enter." question_text: "What is buyer 2’s nationality?" nationality_all_buyer2: page_header: "" check_answer_label: "Buyer 2’s nationality" + check_answer_prompt: "" hint_text: "" question_text: "Enter a nationality" @@ -172,17 +201,20 @@ en: buyer: page_header: "" 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?" person: page_header: "" check_answer_label: "Person 2’s working situation" + check_answer_prompt: "" hint_text: "" 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?" + check_answer_label: "Buyer 2 lives in the property" + check_answer_prompt: "Tell us if buyer 2 lives in the property" hint_text: "" question_text: "Will buyer 2 live in the property?" @@ -190,156 +222,183 @@ en: joint_purchase: page_header: "" check_answer_label: "Number of other people living in the property" + check_answer_prompt: "" hint_text: "You can provide details for a maximum of 4 other people for a joint purchase." question_text: "Besides the buyers, how many other people live or will live in the property?" not_joint_purchase: page_header: "" check_answer_label: "Number of other people living in the property" + check_answer_prompt: "" hint_text: "You can provide details for a maximum of 5 other people if there is only one buyer." question_text: "Besides the buyer, how many other people live or will live in the property?" 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" 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" hint_text: "" question_text: "Do you know the details for person 3?" relat3: page_header: "" check_answer_label: "Person 3 is the partner of buyer 1" + check_answer_prompt: "Tell us if person 3 is the partner of buyer 1" hint_text: "" question_text: "Is person 3 the partner of buyer 1?" age3: page_header: "" age3_known: - check_answer_label: "Person 3’s age known?" + check_answer_label: "Person 3’s age" + 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" hint_text: "" question_text: "Age" sex3: page_header: "" check_answer_label: "Person 3’s gender identity" + check_answer_prompt: "" 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?" ecstat3: page_header: "" check_answer_label: "Person 3’s working situation" + check_answer_prompt: "" hint_text: "" question_text: "Which of these best describes person 3’s working situation?" 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" hint_text: "" question_text: "Do you know the details for person 4?" relat4: page_header: "" check_answer_label: "Person 4 is the partner of buyer 1" + check_answer_prompt: "Tell us if person 4 is the partner of buyer 1" hint_text: "" question_text: "Is person 4 the partner of buyer 1?" age4: page_header: "" age4_known: - check_answer_label: "Person 4’s age known?" + check_answer_label: "Person 4’s age" + 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" hint_text: "" question_text: "Age" sex4: page_header: "" check_answer_label: "Person 4’s gender identity" + check_answer_prompt: "" 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?" ecstat4: page_header: "" check_answer_label: "Person 4’s working situation" + check_answer_prompt: "" hint_text: "" question_text: "Which of these best describes person 4’s working situation?" 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" hint_text: "" question_text: "Do you know the details for person 5?" relat5: page_header: "" check_answer_label: "Person 5 is the partner of buyer 1" + check_answer_prompt: "Tell us if person 5 is the partner of buyer 1" hint_text: "" question_text: "Is person 5 the partner of buyer 1?" age5: page_header: "" age5_known: - check_answer_label: "Person 5’s age known?" + check_answer_label: "Person 5’s age" + 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" hint_text: "" question_text: "Age" sex5: page_header: "" check_answer_label: "Person 5’s gender identity" + check_answer_prompt: "" 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?" ecstat5: page_header: "" check_answer_label: "Person 5’s working situation" + check_answer_prompt: "" hint_text: "" question_text: "Which of these best describes person 5’s working situation?" 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" hint_text: "" question_text: "Do you know the details for person 6?" relat6: page_header: "" check_answer_label: "Person 6 is the partner of buyer 1" + check_answer_prompt: "Tell us if person 6 is the partner of buyer 1" hint_text: "" question_text: "Is person 6 the partner of buyer 1?" age6: page_header: "" age6_known: - check_answer_label: "Person 6’s age known?" + check_answer_label: "Person 6’s age" + 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" hint_text: "" question_text: "Age" sex6: page_header: "" check_answer_label: "Person 6’s gender identity" + check_answer_prompt: "" 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?" ecstat6: page_header: "" check_answer_label: "Person 6’s working situation" + check_answer_prompt: "" hint_text: "" question_text: "Which of these best describes person 6’s working situation?" diff --git a/config/locales/forms/2025/sales/household_situation.en.yml b/config/locales/forms/2025/sales/household_situation.en.yml index 6b49a7d37..0888fc84c 100644 --- a/config/locales/forms/2025/sales/household_situation.en.yml +++ b/config/locales/forms/2025/sales/household_situation.en.yml @@ -6,17 +6,20 @@ en: prevten: page_header: "" check_answer_label: "Buyer 1’s previous tenure" + check_answer_prompt: "" hint_text: "" question_text: "What was buyer 1’s previous tenure?" last_accommodation: page_header: "" ppcodenk: - check_answer_label: "Buyer 1’s last settled accommodation" + check_answer_label: "Postcode of buyer 1’s last settled accommodation" + check_answer_prompt: "Enter the postcode 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 postcode of buyer 1’s last settled accommodation?" ppostcode_full: check_answer_label: "Postcode of buyer 1’s last settled accommodation" + check_answer_prompt: "" hint_text: "" question_text: "Postcode" @@ -24,21 +27,25 @@ 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" 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: check_answer_label: "Local authority of buyer 1’s last settled accommodation" + check_answer_prompt: "" hint_text: "" question_text: "Select a local authority" buy2living: page_header: "" check_answer_label: "Buyer 2 living at the same address" + check_answer_prompt: "" hint_text: "" question_text: "At the time of purchase, was buyer 2 living at the same address as buyer 1?" prevtenbuy2: page_header: "" check_answer_label: "Buyer 2’s previous tenure" + check_answer_prompt: "" hint_text: "" question_text: "What was buyer 2’s previous tenure?" 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 b38c203f7..eacbd1b33 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 @@ -6,68 +6,80 @@ en: buyer_1_income: page_header: "" income1nk: - check_answer_label: "Buyer 1’s gross annual income known?" + check_answer_label: "Buyer 1’s gross annual income 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: check_answer_label: "Buyer 1’s gross annual income" + check_answer_prompt: "" 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" + check_answer_prompt: "Tell us if buyer 1’s income used for a mortgage application" hint_text: "" question_text: "Was buyer 1’s income used for a mortgage application?" buyer_2_income: page_header: "" income2nk: - check_answer_label: "Buyer 2’s gross annual income known?" + check_answer_label: "Buyer 2’s gross annual income 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: check_answer_label: "Buyer 2’s gross annual income" + check_answer_prompt: "" 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 2’s gross annual income" inc2mort: page_header: "" check_answer_label: "Buyer 2’s income used for mortgage application" + check_answer_prompt: "" hint_text: "" question_text: "Was buyer 2’s income used for a mortgage application?" housing_benefits: joint_purchase: page_header: "" - check_answer_label: "Housing-related benefits buyers received before buying this property" + check_answer_label: "Housing related benefits buyers received before buying this property" + check_answer_prompt: "" hint_text: "" - question_text: "Were the buyers receiving any of these housing-related benefits immediately before buying this property?" + question_text: "Were the buyers receiving any of these housing related benefits immediately before buying this property?" not_joint_purchase: page_header: "" - check_answer_label: "Housing-related benefits buyer received before buying this property" + check_answer_label: "Housing related benefits buyer received before buying this property" + check_answer_prompt: "" hint_text: "" - question_text: "Was the buyer receiving any of these housing-related benefits immediately before buying this property?" + 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" + 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: check_answer_label: "Buyers’ total savings before any deposit paid" + check_answer_prompt: "" hint_text: "Include any savings, investments, ISAs, premium bonds, shares, or money held in a bank or building society account." question_text: "Enter their total savings to the nearest £10" not_joint_purchase: page_header: "" savingsnk: - check_answer_label: "Buyer’s total savings known?" + check_answer_label: "Buyer’s total savings" + 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: check_answer_label: "Buyer’s total savings before any deposit paid" + check_answer_prompt: "" hint_text: "Include any savings, investments, ISAs, premium bonds, shares, or money held in a bank or building society account." question_text: "Enter their total savings to the nearest £10" @@ -75,16 +87,19 @@ en: joint_purchase: page_header: "" check_answer_label: "Buyers previously owned a property." + check_answer_prompt: "" hint_text: "" question_text: "Have any of the buyers previously owned a property?" not_joint_purchase: page_header: "" - check_answer_label: "Buyer previously owned a property." + check_answer_label: "Buyer previously owned a property" + check_answer_prompt: "Tell us if the buyer previously owned a property" hint_text: "" question_text: "Has the buyer previously owned a property?" prevshared: page_header: "" - check_answer_label: "Previous property shared ownership?" + check_answer_label: "Previous property shared ownership" + check_answer_prompt: "Tell us if the previous property was shared ownership" hint_text: "For any buyer" question_text: "Was the previous property under shared ownership?" diff --git a/config/locales/forms/2025/sales/other_household_information.en.yml b/config/locales/forms/2025/sales/other_household_information.en.yml index ddae70ffa..b9f88ce7b 100644 --- a/config/locales/forms/2025/sales/other_household_information.en.yml +++ b/config/locales/forms/2025/sales/other_household_information.en.yml @@ -5,30 +5,35 @@ en: other_household_information: hhregres: page_header: "" - check_answer_label: "Have any of the buyers ever served as a regular in the UK armed forces?" + check_answer_label: "Any buyer has served as regulars in the UK armed forces" + check_answer_prompt: "Tell us if any buyer has ever served as a regular in the UK armed forces" hint_text: "A regular is somebody who has served in the Royal Navy, the Royal Marines, the Royal Airforce or Army full time and does not include reserve forces" question_text: "Have any of the buyers ever served as a regular in the UK armed forces?" hhregresstill: page_header: "" - check_answer_label: "Are they still serving in the UK armed forces?" + check_answer_label: "Buyer still serving in the UK armed forces" + check_answer_prompt: "Tell us if the buyer is still serving in the UK armed forces" hint_text: "" question_text: "Is the buyer still serving in the UK armed forces?" armedforcesspouse: page_header: "" - check_answer_label: "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?" + check_answer_label: "Any buyer is a spouse or civil partner of a UK armed forces regular who died in service within the last 2 years" + check_answer_prompt: "Tell us if any buyers are a spouse or civil partner of a UK armed forces regular who died in service within the last 2 years" hint_text: "" question_text: "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?" disabled: page_header: "" - check_answer_label: "Does anyone in the household have a disability?" + 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" question_text: "Does anyone in the household consider themselves to have a disability?" wheel: page_header: "" - check_answer_label: "Does anyone in the household use a wheelchair?" + check_answer_label: "Household member uses a wheelchair" + check_answer_prompt: "Tell us if someone uses a wheelchair" hint_text: "This can be inside or outside the home" question_text: "Does anyone in the household use a wheelchair?" diff --git a/config/locales/forms/2025/sales/property_information.en.yml b/config/locales/forms/2025/sales/property_information.en.yml index d658362ea..96c227b3c 100644 --- a/config/locales/forms/2025/sales/property_information.en.yml +++ b/config/locales/forms/2025/sales/property_information.en.yml @@ -6,17 +6,20 @@ en: uprn: page_header: "" uprn_known: - check_answer_label: "UPRN known?" + 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?" uprn: check_answer_label: "UPRN" + check_answer_prompt: "" hint_text: "" question_text: "What is the property's UPRN?" uprn_confirmed: page_header: "We found an address that might be this property" check_answer_label: "Is this the right address?" + check_answer_prompt: "Tell us if this is the right address" hint_text: "" question_text: "Is this the property address?" @@ -24,16 +27,19 @@ en: page_header: "Find an address" address_line1_input: check_answer_label: "Find address" + check_answer_prompt: "Try find address" hint_text: "" question_text: "Address line 1" postcode_full_input: check_answer_label: "" + check_answer_prompt: "" hint_text: "" question_text: "Postcode" uprn_selection: page_header: "We found an address that might be this property" - check_answer_label: "Select the correct address" + check_answer_label: "Select correct address" + check_answer_prompt: "Select correct address" hint_text: "" question_text: "Select the correct address" @@ -41,51 +47,61 @@ en: 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" hint_text: "" question_text: "Address line 1" address_line2: check_answer_label: "" + check_answer_prompt: "" hint_text: "" question_text: "Address line 2 (optional)" town_or_city: check_answer_label: "Town or city" + check_answer_prompt: "" hint_text: "" question_text: "Town or city" county: check_answer_label: "County" + check_answer_prompt: "" hint_text: "" question_text: "County (optional)" postcode_full: check_answer_label: "Postcode" + check_answer_prompt: "" hint_text: "" question_text: "Postcode" la: page_header: "" check_answer_label: "Local authority" + check_answer_prompt: "" hint_text: "" question_text: "What is the property’s local authority?" beds: page_header: "" check_answer_label: "Number of bedrooms" + check_answer_prompt: "" hint_text: "" question_text: "How many bedrooms does the property have?" proptype: page_header: "" check_answer_label: "Type of unit" + check_answer_prompt: "" hint_text: "" question_text: "What type of unit is the property?" builtype: page_header: "" check_answer_label: "Type of building" + check_answer_prompt: "" hint_text: "" question_text: "What type of building is the property?" wchair: page_header: "" check_answer_label: "Property built or adapted to wheelchair-user standards" + check_answer_prompt: "Tell us if the property is built or adapted to wheelchair-user standards" hint_text: "This is whether someone who uses a wheelchair is able to make full use of all of the property’s rooms and facilities, including use of both inside and outside space, and entering and exiting the property." question_text: "Is the property built or adapted to wheelchair-user standards?" diff --git a/config/locales/forms/2025/sales/sale_information.en.yml b/config/locales/forms/2025/sales/sale_information.en.yml index aedb1cc02..93f5226b5 100644 --- a/config/locales/forms/2025/sales/sale_information.en.yml +++ b/config/locales/forms/2025/sales/sale_information.en.yml @@ -8,20 +8,24 @@ en: page_header: "" proplen: check_answer_label: "Number of years living in the property before purchase" + check_answer_prompt: "" hint_text: "You should round up to the nearest year" question_text: "How long did they live there?" proplen_asked: check_answer_label: "Buyers lived in the property before purchasing" + check_answer_prompt: "Tell us if buyers lived in the property before purchase" hint_text: "" question_text: "Did the buyers live in the property before purchasing it?" not_joint_purchase: page_header: "" proplen: check_answer_label: "Number of years living in the property before purchase" + check_answer_prompt: "" hint_text: "You should round up to the nearest year" question_text: "How long did they live there?" proplen_asked: check_answer_label: "Buyer lived in the property before purchasing" + check_answer_prompt: "Tell us if the buyer lived in the property before purchasing" hint_text: "" question_text: "Did the buyer live in the property before purchasing it?" @@ -29,27 +33,32 @@ en: page_header: "About the staircasing transaction" stairbought: check_answer_label: "Percentage bought in this staircasing transaction" + check_answer_prompt: "" hint_text: "" question_text: "What percentage of the property has been bought in this staircasing transaction?" stairowned: joint_purchase: check_answer_label: "Percentage the buyers now own in total" + check_answer_prompt: "" hint_text: "" question_text: "What percentage of the property do the buyers now own in total?" not_joint_purchase: check_answer_label: "Percentage the buyer now owns in total" + check_answer_prompt: "" hint_text: "" question_text: "What percentage of the property does the buyer now own in total?" staircasesale: page_header: "" - check_answer_label: "Part of a back-to-back staircasing transaction?" + check_answer_label: "Part of a back-to-back staircasing transaction" + check_answer_prompt: "Tell us if this is part of a back-to-back staircasing transaction" hint_text: "Back-to-back staircasing transactions are used as a way for shared owners who own less than 100% of their property to sell on the open market. It involves the shared owner purchasing the remaining share from their landlord and immediately selling 100% of the property to a buyer on the open market. The landlord is then reimbursed for the staircasing transaction through the proceeds of sale to the buyer." question_text: "Is this transaction part of a back-to-back staircasing transaction to facilitate sale of the home on the open market?" firststair: page_header: "" - check_answer_label: "First time staircasing?" + check_answer_label: "First time staircasing" + check_answer_prompt: "Tell us if this is the first time staircasing" hint_text: "" question_text: "Is this the first time the shared owner has engaged in staircasing in the home?" @@ -57,68 +66,80 @@ en: page_header: "About previous staircasing transactions" numstair: check_answer_label: "Number of staircasing transactions" + check_answer_prompt: "" hint_text: "" question_text: "Including this time, how many times has the shared owner engaged in staircasing in the home?" initialpurchase: check_answer_label: "Initial staircasing transaction" + check_answer_prompt: "Enter initial staircasing transaction date" hint_text: "" question_text: "What was the date of the initial purchase of a share in the property?" lasttransaction: check_answer_label: "Last staircasing transaction" + check_answer_prompt: "Enter last staircasing transaction date" hint_text: "" question_text: "What was the date of the last staircasing transaction?" resale: page_header: "" - check_answer_label: "Is this a resale?" + check_answer_label: "Resale" + check_answer_prompt: "Tell us if this is a resale" hint_text: "If the social landlord has previously sold the property to another buyer and is now reselling the property, select 'yes'. If this is the first time the property has been sold, select 'no'." question_text: "Is this a resale?" exchange_date: page_header: "" check_answer_label: "Exchange of contracts date" + check_answer_prompt: "" hint_text: "" question_text: "What is the exchange of contracts date?" handover_date: page_header: "" check_answer_label: "Practical completion or handover date" + check_answer_prompt: "" hint_text: "This is the date on which the building contractor hands over responsibility for the completed property to the private registered provider (PRP)" question_text: "What is the practical completion or handover date?" la_nominations: page_header: "" - check_answer_label: "Household rehoused under a local authority nominations agreement?" + check_answer_label: "Household rehoused under a local authority nominations agreement" + check_answer_prompt: "Tell us if 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: "" - check_answer_label: "Any buyers were registered providers, housing association or local authority tenants immediately before this sale?" + check_answer_label: "Buyers were registered providers, housing association or local authority tenants immediately before this sale" + check_answer_prompt: "Tell us if buyers were registered providers, housing association or local authority tenants" hint_text: "" question_text: "Were any of the buyers private registered providers, housing association or local authority tenants immediately before this sale?" not_joint_purchase: page_header: "" - check_answer_label: "Buyer was a registered provider, housing association or local authority tenant immediately before this sale?" + check_answer_label: "Buyer was a registered provider, housing association or local authority tenant immediately before this sale" + check_answer_prompt: "Tell us if buyer was a registered provider, housing association or local authority tenant" hint_text: "" question_text: "Was the buyer a private registered provider, housing association or local authority tenant immediately before this sale?" frombeds: page_header: "" check_answer_label: "Number of bedrooms in previous property" + check_answer_prompt: "" hint_text: "A bedsit has 1 bedroom." question_text: "How many bedrooms did the property have?" fromprop: page_header: "" check_answer_label: "Previous property type" + check_answer_prompt: "" hint_text: "" question_text: "What was the previous property type?" socprevten: page_header: "" check_answer_label: "Previous property tenure" + check_answer_prompt: "" hint_text: "" question_text: "What was the previous tenure of the buyer?" @@ -126,10 +147,12 @@ en: page_header: "About the price of the property" value_shared_ownership: check_answer_label: "Full purchase price" + check_answer_prompt: "" hint_text: "Enter the full purchase price of the property before any discounts are applied. For shared ownership, enter the full purchase price paid for 100% equity (this is equal to the value of the share owned by the PRP plus the value bought by the purchaser)." question_text: "What was the full purchase price?" value_shared_ownership_staircase: check_answer_label: "Full purchase price" + check_answer_prompt: "" hint_text: "Enter the full purchase price paid for the equity bought in this staircasing transaction (this is equal to the value of the share bought by the purchaser)." question_text: "What was the full purchase price for this staircasing transaction?" @@ -137,64 +160,75 @@ en: page_header: "About the price of the property" initial_equity: check_answer_label: "Initial percentage equity share" + check_answer_prompt: "" hint_text: "Enter the amount of initial equity share held by the purchaser (for example, 25% or 50%)" question_text: "What was the initial percentage share purchased?" staircase_equity: check_answer_label: "Initial percentage equity share" + check_answer_prompt: "" hint_text: "Enter the amount of initial equity share held by the purchaser (for example, 25% or 50%)" question_text: "What was the percentage shared purchased in the initial transaction?" mortgageused: page_header: "" - check_answer_label: "Mortgage used?" + check_answer_label: "Mortgage used" + check_answer_prompt: "Tell us if a mortgage was used" hint_text: "" question_text: "Was a mortgage used for the purchase of this property?" mortgage: page_header: "" check_answer_label: "Mortgage amount" + check_answer_prompt: "" 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?" mortgagelender: page_header: "" check_answer_label: "Mortgage lender" + check_answer_prompt: "" hint_text: "" question_text: "What is the name of the mortgage lender?" mortgagelenderother: page_header: "" check_answer_label: "Other Mortgage Lender" + check_answer_prompt: "" hint_text: "" question_text: "What is the other mortgage lender?" mortlen: page_header: "" check_answer_label: "Length of mortgage" + check_answer_prompt: "" hint_text: "You should round up to the nearest year. Value should not exceed 60 years." question_text: "What is the length of the mortgage?" extrabor: page_header: "" - check_answer_label: "Any other borrowing?" + check_answer_label: "Any other borrowing" + check_answer_prompt: "Tell us if there is any other borrowing" hint_text: "" question_text: "Does this include any extra borrowing?" deposit: page_header: "About the deposit" check_answer_label: "Deposit amount" + check_answer_prompt: "" hint_text: "Enter the total cash sum paid by the buyer towards the property that was not funded by the mortgage. This excludes any grant or loan. As this is a fully staircased sale this question is optional. If you do not have the information available click save and continue" question_text: "How much cash deposit was paid on the property?" cashdis: page_header: "About the deposit" check_answer_label: "Cash discount through SocialHomeBuy" + check_answer_prompt: "" hint_text: "Enter the total cash discount given on the property being purchased through the Social HomeBuy scheme" question_text: "How much cash discount was given through Social HomeBuy?" mrent: page_header: "" check_answer_label: "Monthly rent" + check_answer_prompt: "" hint_text: "Amount paid before any charges" question_text: "What is the basic monthly rent?" @@ -202,21 +236,25 @@ en: page_header: "Monthly rent" prestaircasing: check_answer_label: "Monthly rent prior to staircasing" + check_answer_prompt: "" hint_text: "Amount paid before any charges" question_text: "What was the basic monthly rent prior to staircasing?" poststaircasing: check_answer_label: "Monthly rent after staircasing" + check_answer_prompt: "" hint_text: "Amount paid before any charges" question_text: "What is the basic monthly rent after staircasing?" leaseholdcharges: page_header: "" has_mscharge: - check_answer_label: "Does the property have any service charges?" - hint_text: "This includes any charges for day-to-day maintenance and repairs, buildings insurance, and any contributions to a sinking/reserve fund. It does not include estate management fees." + check_answer_label: "Property service charges" + check_answer_prompt: "Enter service charges if any" + hint_text: "For example, service and management charges" question_text: "Does the property have any service charges?" mscharge: check_answer_label: "Monthly leasehold charges" + check_answer_prompt: "" hint_text: "" question_text: "Enter the total monthly charge" @@ -224,33 +262,39 @@ en: discounted_ownership: page_header: "About the price of the property" check_answer_label: "Purchase price" + check_answer_prompt: "" hint_text: "For all schemes, including Right to Acquire (RTA), Right to Buy (RTB), Voluntary Right to Buy (VRTB) or Preserved Right to Buy (PRTB) sales, enter the full price of the property without any discount" question_text: "What is the full purchase price?" outright_sale: page_header: "About the price of the property" check_answer_label: "Purchase price" + check_answer_prompt: "" hint_text: "" question_text: "What is the full purchase price?" discount: page_header: "About the price of the property" check_answer_label: "Percentage discount" + check_answer_prompt: "" 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" + check_answer_prompt: "" 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?" management_fee: page_header: "" has_management_fee: - check_answer_label: "Does the property have an estate management fee?" + check_answer_label: "Monthly estate management fee" + check_answer_prompt: "Tell us if the property has an estate management fee" hint_text: "Estate management fees are typically used for the maintenance of communal gardens, payments, private roads, car parks and/or play areas within new build estates." question_text: "Does the property have an estate management fee?" management_fee: check_answer_label: "Monthly estate management fee" + check_answer_prompt: "" hint_text: "" question_text: "Enter the total monthly management fee" diff --git a/config/locales/forms/2025/sales/setup.en.yml b/config/locales/forms/2025/sales/setup.en.yml index e1642c5bc..a3cca0609 100644 --- a/config/locales/forms/2025/sales/setup.en.yml +++ b/config/locales/forms/2025/sales/setup.en.yml @@ -6,42 +6,49 @@ en: owning_organisation_id: page_header: "" check_answer_label: "Owning organisation" + check_answer_prompt: "" hint_text: "" question_text: "Which organisation owns this log?" managing_organisation_id: page_header: "" check_answer_label: "Reported by" + check_answer_prompt: "Select reporting organisation" hint_text: "" question_text: "Which organisation is reporting this sale?" assigned_to_id: page_header: "" check_answer_label: "Log owner" + check_answer_prompt: "Select user" hint_text: "" question_text: "Which user are you creating this log for?" saledate: page_header: "" check_answer_label: "Sale completion date" + check_answer_prompt: "" hint_text: "" question_text: "What is the sale completion date?" purchid: page_header: "" check_answer_label: "Purchaser code" + check_answer_prompt: "" hint_text: "This is how you usually refer to the purchaser on your own systems." question_text: "What is the purchaser code?" ownershipsch: page_header: "" check_answer_label: "Purchase made under ownership scheme" - hint_text: "Sales logs are no longer required for outright and other sales FROM 1 APRIL 2025" #Remove this hint text for 2026 - question_text: "Is this a shared ownership or a discounted ownership sale?" + check_answer_prompt: "Tell us if purchase made under ownership scheme" + hint_text: "" + question_text: "Was this purchase made through an ownership scheme?" staircasing: page_header: "" check_answer_label: "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?" @@ -49,46 +56,54 @@ en: shared_ownership: page_header: "Type of shared ownership sale" check_answer_label: "Type of shared ownership sale" + check_answer_prompt: "" hint_text: "When the purchaser buys an initial share of up to 75% of the property value and pays rent to the Private Registered Provider (PRP) on the remaining portion, or a subsequent staircasing transaction" question_text: "What is the type of shared ownership sale?" discounted_ownership: page_header: "Type of discounted ownership sale" check_answer_label: "Type of discounted ownership sale" + check_answer_prompt: "" hint_text: "" question_text: "What is the type of discounted ownership sale?" jointpur: page_header: "" check_answer_label: "Joint purchase" + check_answer_prompt: "Tell us if joint purchase" hint_text: "This is where two or more people are named as legal owners of the property after the purchase" question_text: "Is this a joint purchase?" jointmore: page_header: "" check_answer_label: "More than 2 joint buyers" + check_answer_prompt: "Tell us if there are more than 2 joint buyers" hint_text: "" question_text: "Are there more than 2 joint buyers of this property?" noint: joint_purchase: page_header: "" - check_answer_label: "Buyers interviewed in person?" + check_answer_label: "Buyers interviewed in person" + check_answer_prompt: "Tell us if buyers interviewed in person" hint_text: "You should still try to answer all questions even if the buyers weren’t interviewed in person" question_text: "Were the buyers interviewed for any of the answers you will provide on this log?" not_joint_purchase: page_header: "" - check_answer_label: "Buyer interviewed in person?" + check_answer_label: "Buyer interviewed in person" + check_answer_prompt: "Tell us if buyer interviewed in person" hint_text: "You should still try to answer all questions even if the buyer wasn’t interviewed in person" question_text: "Was the buyer interviewed for any of the answers you will provide on this log?" privacynotice: joint_purchase: page_header: "Ministry of Housing, Communities and Local Government privacy notice" - check_answer_label: "Buyers have seen the privacy notice?" + check_answer_label: "Buyers have seen the privacy notice" + check_answer_prompt: "Tell us if buyers have seen the privacy notice" hint_text: "" question_text: "Declaration" not_joint_purchase: page_header: "Ministry of Housing, Communities and Local Government privacy notice" - check_answer_label: "Buyer has seen the privacy notice?" + check_answer_label: "Buyer has seen the privacy notice" + check_answer_prompt: "Tell us if buyer has seen the privacy notice" hint_text: "" question_text: "Declaration" diff --git a/config/locales/forms/2025/sales/soft_validations.en.yml b/config/locales/forms/2025/sales/soft_validations.en.yml index 11bbefd72..a82e9ba3c 100644 --- a/config/locales/forms/2025/sales/soft_validations.en.yml +++ b/config/locales/forms/2025/sales/soft_validations.en.yml @@ -7,6 +7,7 @@ en: max: page_header: "" check_answer_label: "Retirement confirmation" + check_answer_prompt: "" hint_text: "" question_text: "Are you sure this person isn't retired?" title_text: "You told us this person is over 66 and not retired." @@ -14,6 +15,7 @@ en: min: page_header: "" check_answer_label: "Retirement confirmation" + check_answer_prompt: "" hint_text: "" question_text: "Are you sure this person is retired?" title_text: "You told us this person is aged %{age} years and retired." @@ -21,6 +23,7 @@ en: old_persons_shared_ownership_value_check: page_header: "" check_answer_label: "Shared ownership confirmation" + check_answer_prompt: "" hint_text: "" question_text: "Are you sure this is correct?" title_text: @@ -29,6 +32,7 @@ en: informative_text: "At least one buyer must be aged 65 years and over to use this scheme." income1_value_check: check_answer_label: "Buyer 1 income confirmation" + check_answer_prompt: "" hint_text: "" question_text: "Are you sure this is correct?" ecstat: @@ -41,6 +45,7 @@ en: income2_value_check: check_answer_label: "Buyer 2 income confirmation" + check_answer_prompt: "" hint_text: "" question_text: "Are you sure this is correct?" ecstat: @@ -54,6 +59,7 @@ en: combined_income_value_check: page_header: "" check_answer_label: "Combined income confirmation" + check_answer_prompt: "" hint_text: "" question_text: "Are you sure this is correct?" title_text: "You told us the combined income of this household is %{combined_income}. This seems high for this sale type. Are you sure this is correct?" @@ -61,6 +67,7 @@ en: mortgage_value_check: page_header: "" check_answer_label: "Mortgage confirmation" + check_answer_prompt: "" hint_text: "" question_text: "Are you sure that the mortgage is more than 5 times the income used for the mortgage application?" title_text: "You told us that the mortgage amount is %{mortgage}." @@ -69,6 +76,7 @@ en: savings_value_check: page_header: "" check_answer_label: "Savings confirmation" + check_answer_prompt: "" hint_text: "" question_text: "Are you sure the savings are higher than £100,000?" joint_purchase: @@ -81,6 +89,7 @@ en: staircase_bought_value_check: page_header: "" check_answer_label: "Percentage bought confirmation" + check_answer_prompt: "" hint_text: "" question_text: "Are you sure this is correct?" title_text: "You told us that %{percentage}% was bought in this staircasing transaction." @@ -90,6 +99,7 @@ en: joint_purchase: page_header: "" check_answer_label: "Percentage owned confirmation" + check_answer_prompt: "" hint_text: "" question_text: "Are you sure?" title_text: "You told us that the buyers now own %{stairowned} of the property." @@ -97,6 +107,7 @@ en: not_joint_purchase: page_header: "" check_answer_label: "Percentage owned confirmation" + check_answer_prompt: "" hint_text: "" question_text: "Are you sure?" title_text: "You told us that the buyer now owns %{stairowned} of the property." @@ -105,6 +116,7 @@ en: hodate_check: page_header: "" check_answer_label: "Practical completion or handover date check" + check_answer_prompt: "" hint_text: "" question_text: "Are you sure?" title_text: "You told us practical completion or handover date is more than 3 years before sale completion date." @@ -112,6 +124,7 @@ en: value_value_check: page_header: "" check_answer_label: "Purchase price confirmation" + check_answer_prompt: "" hint_text: "" question_text: "Are you sure?" title_text: "You told us the purchase price is %{value}." @@ -120,6 +133,7 @@ en: shared_ownership_deposit_value_check: page_header: "" check_answer_label: "Shared ownership deposit confirmation" + check_answer_prompt: "" hint_text: "" question_text: "Are you sure this is correct?" title_text: "You told us that the %{mortgage_deposit_and_discount_error_fields} add up to %{mortgage_deposit_and_discount_total}." @@ -128,6 +142,7 @@ en: joint_purchase: page_header: "" check_answer_label: "Deposit confirmation" + check_answer_prompt: "" hint_text: "" 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}." @@ -135,6 +150,7 @@ en: not_joint_purchase: page_header: "" check_answer_label: "Deposit confirmation" + check_answer_prompt: "" hint_text: "" 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}." @@ -143,6 +159,7 @@ en: address_search_value_check: page_header: "" check_answer_label: "" + check_answer_prompt: "" hint_text: "" question_text: "" title_text: "No address found." @@ -150,7 +167,8 @@ en: wheel_value_check: page_header: "" - check_answer_label: "Does anyone in the household use a wheelchair?" + check_answer_label: "Household member uses a wheelchair" + check_answer_prompt: "Tell us if someone uses a wheelchair" hint_text: "" question_text: "You told us that someone in the household uses a wheelchair." title_text: "You told us that someone in the household uses a wheelchair." @@ -159,6 +177,7 @@ en: buyer1: page_header: "" check_answer_label: "Buyer live in confirmation" + check_answer_prompt: "" hint_text: "" question_text: "Are you sure this is correct?" title_text: "You told us that buyer 1 will not live in the property." @@ -166,6 +185,7 @@ en: buyer2: page_header: "" check_answer_label: "Buyer live in confirmation" + check_answer_prompt: "" hint_text: "" question_text: "Are you sure this is correct?" title_text: "You told us that buyer 2 will not live in the property." @@ -174,6 +194,7 @@ en: student_not_child_value_check: page_header: "" check_answer_label: "Student not a child confirmation" + check_answer_prompt: "" hint_text: "" question_text: "Are you sure this person is not a child?" title_text: "You told us this person is a student aged between 16 and 19." @@ -182,6 +203,7 @@ en: partner_under_16_value_check: page_header: "" check_answer_label: "Partner under 16 confirmation" + check_answer_prompt: "" 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." @@ -190,6 +212,7 @@ en: multiple_partners_value_check: page_header: "" check_answer_label: "Multiple partners confirmation" + check_answer_prompt: "" hint_text: "" question_text: "Are you sure this is correct?" title_text: "You told us there are more than 1 persons with 'Partner' relationship to buyer 1." @@ -198,6 +221,7 @@ en: monthly_charges_value_check: page_header: "" check_answer_label: "Monthly charges confirmation" + check_answer_prompt: "" hint_text: "" question_text: "Are you sure this is correct?" title_text: "You told us that the monthly charges were %{mscharge}." @@ -206,6 +230,7 @@ en: extra_borrowing_value_check: page_header: "" check_answer_label: "Extra borrowing confirmation" + check_answer_prompt: "" hint_text: "" question_text: "Are you sure there is no extra borrowing?" title_text: "You told us that the mortgage and deposit total is %{mortgage_and_deposit_total}." @@ -214,6 +239,7 @@ en: percentage_discount_value_check: page_header: "" check_answer_label: "Percentage discount confirmation" + check_answer_prompt: "" hint_text: "" question_text: "Are you sure this is correct?" title_text: "You told us that the percentage discount is %{discount}." @@ -222,6 +248,7 @@ en: grant_value_check: page_header: "" check_answer_label: "Grant value confirmation" + check_answer_prompt: "" hint_text: "" question_text: "Are you sure? Grants are usually £9,000 - £16,000" title_text: "You told us that the grant amount is %{grant}." @@ -230,6 +257,7 @@ en: discounted_sale_value_check: page_header: "" check_answer_label: "Discounted sale value confirmation" + check_answer_prompt: "" hint_text: "" question_text: "Are you sure this is correct?" title_text: "Mortgage, deposit, and grant total must equal %{value_with_discount}." @@ -238,6 +266,7 @@ en: deposit_and_mortgage_value_check: page_header: "" check_answer_label: "Deposit and mortgage against discount confirmation" + check_answer_prompt: "" hint_text: "" question_text: "Are you sure? Mortgage and deposit usually equal or are more than (value - discount)" title_text: "You told us the mortgage amount was %{mortgage}, the cash deposit was %{deposit} and the discount was %{discount}." diff --git a/config/locales/validations/sales/sale_information.en.yml b/config/locales/validations/sales/sale_information.en.yml index f29856143..fecdb4a13 100644 --- a/config/locales/validations/sales/sale_information.en.yml +++ b/config/locales/validations/sales/sale_information.en.yml @@ -67,7 +67,7 @@ en: mortgage_not_used: "The cash deposit is %{deposit}.

    The full purchase price (%{value}) multiplied by the percentage bought is %{expected_shared_ownership_deposit_value}.

    These two amounts should be the same." mortgage_used_socialhomebuy: "The mortgage amount (%{mortgage}), cash deposit (%{deposit}), and cash discount (%{cashdis}) added together is %{mortgage_deposit_and_discount_total}.

    The full purchase price (%{value}) multiplied by the percentage equity stake purchased (%{equity}) is %{expected_shared_ownership_deposit_value}.

    These two amounts should be the same." mortgage_not_used_socialhomebuy: "The cash deposit (%{deposit}) and cash discount (%{cashdis}) added together is %{deposit_and_discount_total}.

    The full purchase price (%{value}) multiplied by the percentage bought (%{equity}) is %{expected_shared_ownership_deposit_value}.

    These two amounts should be the same." - staircasing_mortgage: + staircasing_mortgage: # this key mortgage_used: "The mortgage (%{mortgage}) and cash deposit (%{deposit}) added together is %{mortgage_and_deposit_total}.

    The full purchase price (%{value}) multiplied by the percentage bought is %{stairbought_part_of_value}.

    These two amounts should be the same." mortgage_not_used: "The cash deposit is %{deposit}.

    The full purchase price (%{value}) multiplied by the percentage bought is %{stairbought_part_of_value}.

    These two amounts should be the same." mortgage_used_socialhomebuy: "The mortgage amount (%{mortgage}), cash deposit (%{deposit}), and cash discount (%{cashdis}) added together is %{mortgage_deposit_and_discount_total}.

    The full purchase price (%{value}) multiplied by the percentage bought (%{stairbought}) is %{stairbought_part_of_value}.

    These two amounts should be the same." diff --git a/spec/components/check_answers_summary_list_card_component_spec.rb b/spec/components/check_answers_summary_list_card_component_spec.rb index c08fb3f42..2909e9122 100644 --- a/spec/components/check_answers_summary_list_card_component_spec.rb +++ b/spec/components/check_answers_summary_list_card_component_spec.rb @@ -29,8 +29,8 @@ RSpec.describe CheckAnswersSummaryListCardComponent, type: :component do let(:bulk_upload) { create(:bulk_upload) } let(:log) { create(:lettings_log, :in_progress, creation_method: "bulk upload", age2: 99, bulk_upload:) } - it "displays tweaked copy in red" do - expect(rendered).to have_selector("span", class: "app-!-colour-red", text: "You still need to answer this question") + it "displays red prompt link for required question" do + expect(rendered).to have_link(log.form.get_question("age1_known", log).check_answer_prompt, href: "/lettings-logs/#{log.id}/lead-tenant-age?referrer=check_answers_new_answer", class: "app-red-link app-red-link---no-visited-state") end end @@ -46,24 +46,28 @@ RSpec.describe CheckAnswersSummaryListCardComponent, type: :component do let(:log) { create(:lettings_log, :in_progress) } it "displays normal copy with muted colour " do - expect(rendered).to have_selector("span", class: "app-!-colour-muted", text: "You didn’t answer this question") + expect(rendered).to have_link(log.form.get_question("sex1", log).check_answer_prompt, href: "/lettings-logs/#{log.id}/lead-tenant-gender-identity?referrer=check_answers_new_answer", class: "govuk-link govuk-link--no-visited-state") end end context "when log was created via a bulk upload and has an unanswered optional question" do let(:subsection_id) { "setup" } let(:bulk_upload) { create(:bulk_upload) } - let(:log) { create(:lettings_log, :completed, creation_method: "bulk upload", tenancycode: nil, bulk_upload:) } + let(:log) { create(:lettings_log, :completed, creation_method: "bulk upload", needstype: nil, tenancycode: nil, bulk_upload:) } - it "displays tweaked copy in red" do - expect(rendered).to have_selector("span", class: "app-!-colour-muted", text: "You didn’t answer this question") - expect(rendered).not_to have_selector("span", class: "app-!-colour-red", text: "You still need to answer this question") + it "displays red prompt link for required question" do + expect(rendered).to have_no_link(log.form.get_question("needstype", log).check_answer_prompt, href: "/lettings-logs/#{log.id}/needs-type?referrer=check_answers_new_answer", class: "govuk-link govuk-link--no-visited-state") + expect(rendered).to have_link(log.form.get_question("needstype", log).check_answer_prompt, href: "/lettings-logs/#{log.id}/needs-type?referrer=check_answers_new_answer", class: "app-red-link app-red-link---no-visited-state") + end + + it "displays regular link for optional question" do + expect(rendered).to have_link(log.form.get_question("tenancycode", log).check_answer_prompt, href: "/lettings-logs/#{log.id}/tenant-code?referrer=check_answers_new_answer", class: "govuk-link govuk-link--no-visited-state") end end context "when before 23/24 collection" do context "when given a set of questions" do - let(:log) { build(:lettings_log, :completed, age2: 99, startdate: Time.zone.local(2021, 5, 1), assigned_to: create(:user)) } + let(:log) { create(:lettings_log, :completed, :ignore_validation_errors, age2: 99, startdate: Time.zone.local(2021, 5, 1), assigned_to: create(:user)) } it "renders a summary list card without question numbers for the answers to those questions" do expect(rendered).to have_content(questions.first.answer_label(log)) diff --git a/spec/features/form/check_answers_page_lettings_logs_spec.rb b/spec/features/form/check_answers_page_lettings_logs_spec.rb index bbbeccbe6..f4808cda5 100644 --- a/spec/features/form/check_answers_page_lettings_logs_spec.rb +++ b/spec/features/form/check_answers_page_lettings_logs_spec.rb @@ -91,28 +91,24 @@ RSpec.describe "Lettings Log Check Answers Page" do # This way only the links in the table will get picked up it "has an answer link with the check_answers_new_answer referrer for questions missing an answer" do visit("/lettings-logs/#{empty_lettings_log.id}/#{subsection}/check-answers?referrer=check_answers") - assert_selector "a", text: /Answer (?!the missing questions)/, count: 4 assert_selector "a", text: "Change", count: 0 - expect(page).to have_link("Answer", href: "/lettings-logs/#{empty_lettings_log.id}/person-1-age?referrer=check_answers_new_answer") + expect(page).to have_link("Enter lead tenant’s age", href: "/lettings-logs/#{empty_lettings_log.id}/person-1-age?referrer=check_answers_new_answer") end - it "has a change link for answered questions" do + it "has a change link for answered question" do fill_in_number_question(empty_lettings_log.id, "age1", 28, "person-1-age") visit("/lettings-logs/#{empty_lettings_log.id}/#{subsection}/check-answers") - assert_selector "a", text: /Answer (?!the missing questions)/, count: 3 assert_selector "a", text: "Change", count: 1 expect(page).to have_link("Change", href: "/lettings-logs/#{empty_lettings_log.id}/person-1-age?referrer=check_answers") end - it "updates the change/answer link when answers get updated" do + it "updates the add change link when answers get answered" do visit("/lettings-logs/#{empty_lettings_log.id}/household-needs/check-answers") - assert_selector "a", text: /Answer (?!the missing questions)/, count: 3 assert_selector "a", text: "Change", count: 1 visit("/lettings-logs/#{empty_lettings_log.id}/accessibility-requirements") check("lettings-log-accessibility-requirements-housingneeds-c-field") click_button("Save and continue") visit("/lettings-logs/#{empty_lettings_log.id}/household-needs/check-answers") - assert_selector "a", text: /Answer (?!the missing questions)/, count: 2 assert_selector "a", text: "Change", count: 2 expect(page).to have_link("Change", href: "/lettings-logs/#{empty_lettings_log.id}/accessibility-requirements?referrer=check_answers") end diff --git a/spec/features/lettings_log_spec.rb b/spec/features/lettings_log_spec.rb index 525dee9ff..a400ef2d0 100644 --- a/spec/features/lettings_log_spec.rb +++ b/spec/features/lettings_log_spec.rb @@ -353,7 +353,7 @@ RSpec.describe "Lettings Log Features" do let!(:org_rel2) { create(:organisation_relationship, parent_organisation: support_user.organisation, child_organisation: managing_org2) } context "and the organisation relationship for the selected managing agent is deleted" do - it "doesn't change the CYA page text to be 'You didn't answer this question'" do + it "doesn't change the CYA page text to be 'No answer provided'" do visit("/lettings-logs") click_button("Create a new lettings log") click_link("Set up this lettings log") @@ -499,7 +499,7 @@ RSpec.describe "Lettings Log Features" do let!(:org_rel2) { create(:organisation_relationship, child_organisation: user.organisation, parent_organisation: owning_org2) } context "and the organisation relationship for the selected stock owner is deleted" do - it "doesn't change the CYA page text to be 'You didn't answer this question'" do + it "doesn't change the CYA page text to be 'No answer provided'" do visit("/lettings-logs") click_button("Create a new lettings log") click_link("Set up this lettings log") diff --git a/spec/features/schemes_spec.rb b/spec/features/schemes_spec.rb index 84572f35b..dff650eb7 100644 --- a/spec/features/schemes_spec.rb +++ b/spec/features/schemes_spec.rb @@ -578,7 +578,7 @@ RSpec.describe "Schemes scheme Features" do fill_in_and_save_location location.update!(location_code: nil) visit "/schemes/#{scheme.id}/locations/#{location.id}/check-answers" - expect(page).to have_content "You didn’t answer this question" + expect(page).to have_link("Select local authority", href: "/schemes/#{scheme.id}/locations/#{location.id}/local-authority?referrer=check_answers") end end @@ -667,7 +667,7 @@ RSpec.describe "Schemes scheme Features" do choose "Yes" click_button "Save changes" visit("/schemes/#{scheme.id}/check-answers") - expect(page).to have_content("You didn’t answer this question") + expect(page).to have_link("Select secondary client group", href: "/schemes/#{scheme.id}/secondary-client-group?referrer=check-answers") end end diff --git a/spec/helpers/check_answers_helper_spec.rb b/spec/helpers/check_answers_helper_spec.rb index 6d63ebbc1..9fb98946a 100644 --- a/spec/helpers/check_answers_helper_spec.rb +++ b/spec/helpers/check_answers_helper_spec.rb @@ -43,7 +43,7 @@ RSpec.describe CheckAnswersHelper do context "when unanswered and bulk upload" do let(:question) { log.form.questions.sample } let(:bulk_upload) { create(:bulk_upload) } - let(:log) { build(:sales_log, creation_method: "bulk upload", bulk_upload:) } + let(:log) { create(:sales_log, creation_method: "bulk upload", bulk_upload:) } it "is red" do expect(get_answer_label(question, log)).to include("red") diff --git a/spec/helpers/details_table_helper_spec.rb b/spec/helpers/details_table_helper_spec.rb index 4e5a518f8..e12a0b02f 100644 --- a/spec/helpers/details_table_helper_spec.rb +++ b/spec/helpers/details_table_helper_spec.rb @@ -3,6 +3,7 @@ require "rails_helper" RSpec.describe DetailsTableHelper do describe "details html" do let(:details) { details_html(attribute) } + let(:current_user) { FactoryBot.build(:user) } context "when given a simple attribute" do let(:attribute) { { name: "name", value: "Dummy org", editable: true } } @@ -12,7 +13,7 @@ RSpec.describe DetailsTableHelper do end end - context "when given a bullet point list of attibutes" do + context "when given a bullet point list of attributes" do let(:list) { %w[Camden Westminster Bristol] } let(:attribute) do { @@ -28,7 +29,7 @@ RSpec.describe DetailsTableHelper do end end - context "when given a bullet point list with one attibute" do + context "when given a bullet point list with one attribute" do let(:list) { %w[Camden] } let(:attribute) do { @@ -43,5 +44,21 @@ RSpec.describe DetailsTableHelper do expect(details).to eq("

    Camden

    ") end end + + context "when given an attribute value is empty" do + let(:attribute) { { value: "" } } + + it "displays the default message" do + expect(details_html(attribute)).to include("No answer provided") + end + end + + context "when given an attribute value is not empty" do + let(:attribute) { { value: "Dummy text" } } + + it "displays the default message" do + expect(details_html(attribute)).to include("Dummy text") + end + end end end diff --git a/spec/helpers/merge_requests_helper_spec.rb b/spec/helpers/merge_requests_helper_spec.rb index 0db07e02b..db0598489 100644 --- a/spec/helpers/merge_requests_helper_spec.rb +++ b/spec/helpers/merge_requests_helper_spec.rb @@ -269,4 +269,26 @@ RSpec.describe MergeRequestsHelper do end end end + + describe "#merge_request_details_prompt" do + it "returns the correct message for existing_absorbing_organisation" do + expect(helper.merge_request_details_prompt("existing_absorbing_organisation")).to eq("Tell us if absorbing organisation is already active") + end + + it "returns the correct message for helpdesk_ticket" do + expect(helper.merge_request_details_prompt("helpdesk_ticket")).to eq("Enter helpdesk ticket number") + end + + it "returns the correct message for merging_organisations" do + expect(helper.merge_request_details_prompt("merging_organisations")).to eq("Add merging organisations") + end + + it "returns the correct message for merge_date" do + expect(helper.merge_request_details_prompt("merge_date")).to eq("Set merge date") + end + + it "returns a default message for an unknown page" do + expect(helper.merge_request_details_prompt("unknown_page")).to eq("Enter unknown page") + end + end end diff --git a/spec/models/form/question_spec.rb b/spec/models/form/question_spec.rb index 8b9ab7a85..e3beecc85 100644 --- a/spec/models/form/question_spec.rb +++ b/spec/models/form/question_spec.rb @@ -129,6 +129,11 @@ RSpec.describe Form::Question, type: :model do expect(question).not_to be_value_is_yes("random") end + it "has a check answer prompt" do + question_definition["check_answer_prompt"] = "Enter total income" + expect(question.check_answer_prompt).to eq("Enter total income") + end + context "when type is numeric" do it "has a min value" do expect(question.min).to eq(0) @@ -141,6 +146,10 @@ RSpec.describe Form::Question, type: :model do it "does not map value from label" do expect(question.value_from_label("5")).to eq("5") end + + it "has generates a default check answer prompt" do + expect(question.check_answer_prompt).to eq("Enter income") + end end context "when type is radio" do @@ -159,6 +168,10 @@ RSpec.describe Form::Question, type: :model do expect(question.label_from_value(1)).to eq("Weekly") end + it "has generates a default check answer prompt" do + expect(question.check_answer_prompt).to eq("Select income") + end + context "when answer options include yes, no, prefer not to say" do let(:question_id) { "illness" } @@ -222,6 +235,10 @@ RSpec.describe Form::Question, type: :model do expect(question.label_from_value("E09000033")).to eq("Westminster") end + it "has generates a default check answer prompt" do + expect(question.check_answer_prompt).to eq("Select income") + end + context "when the saved answer is not in the value map" do it "displays the saved answer umapped" do expect(question.label_from_value(9999)).to eq("9999") @@ -234,6 +251,10 @@ RSpec.describe Form::Question, type: :model do let(:page_id) { "illness" } let(:answer_options) { { "illness_type_1" => { "value" => "Vision - such as blindness or partial sight" }, "illness_type_2" => { "value" => "Hearing - such as deafness or partial hearing" } } } + it "has generates a default check answer prompt" do + expect(question.check_answer_prompt).to eq("Select income") + end + it "has answer options" do expected_answer_options = { "illness_type_1" => { "value" => "Vision - such as blindness or partial sight" }, @@ -281,7 +302,6 @@ RSpec.describe Form::Question, type: :model do end it "has an update answer link text helper" do - expect(question.action_text(lettings_log)).to match(/Answer/) lettings_log["incfreq"] = 0 expect(question.action_text(lettings_log)).to match(/Change/) end @@ -318,6 +338,10 @@ RSpec.describe Form::Question, type: :model do lettings_log.mrcdate = nil expect(question.answer_label(lettings_log)).to eq("") end + + it "has generates a default check answer prompt" do + expect(question.check_answer_prompt).to eq("Set income") + end end context "when type is checkbox" do diff --git a/spec/models/form/sales/questions/uprn_known_spec.rb b/spec/models/form/sales/questions/uprn_known_spec.rb index e551ca430..fb5215676 100644 --- a/spec/models/form/sales/questions/uprn_known_spec.rb +++ b/spec/models/form/sales/questions/uprn_known_spec.rb @@ -37,7 +37,7 @@ RSpec.describe Form::Sales::Questions::UprnKnown, type: :model do end it "has the correct unanswered_error_message" do - expect(question.unanswered_error_message).to eq("You must answer #{format_ending(I18n.t('forms.2023.sales.property_information.uprn.uprn_known.check_answer_label'))}") + expect(question.unanswered_error_message).to eq(I18n.t("validations.sales.property_information.uprn_known.invalid")) end it "has the correct hidden_in_check_answers" do diff --git a/spec/requests/check_errors_controller_spec.rb b/spec/requests/check_errors_controller_spec.rb index 9c4d3f8c1..71a83a3fa 100644 --- a/spec/requests/check_errors_controller_spec.rb +++ b/spec/requests/check_errors_controller_spec.rb @@ -294,7 +294,7 @@ RSpec.describe CheckErrorsController, type: :request do it "displays correct clear links" do expect(page).to have_content("Make sure these answers are correct") - expect(page).to have_content("You didn’t answer this question") + expect(page).to have_link(lettings_log.form.get_question("hhmemb", lettings_log).check_answer_prompt, href: "/lettings-logs/#{lettings_log.id}/household-members?referrer=check_answers_new_answer", class: "govuk-link govuk-link--no-visited-state") expect(page).to have_link("Answer") expect(lettings_log.reload.earnings).to eq(nil) end @@ -349,7 +349,7 @@ RSpec.describe CheckErrorsController, type: :request do it "displays correct clear links" do expect(page).to have_content("Make sure these answers are correct") - expect(page).to have_content("You didn’t answer this question") + expect(page).to have_link(sales_log.form.get_question("income1", sales_log).check_answer_prompt, href: "/sales-logs/#{sales_log.id}/buyer-1-income?referrer=check_answers_new_answer", class: "govuk-link govuk-link--no-visited-state") expect(page).to have_link("Answer") expect(sales_log.reload.income1).to eq(nil) end @@ -409,7 +409,7 @@ RSpec.describe CheckErrorsController, type: :request do follow_redirect! expect(request.query_parameters["check_errors"]).to eq("true") expect(request.query_parameters["related_question_ids"]).to eq(%w[income1 la ownershipsch]) - expect(page).to have_content("You have successfully updated Buyer 1’s gross annual income known? and Buyer 1’s gross annual income") + expect(page).to have_content("You have successfully updated Buyer 1’s gross annual income known and Buyer 1’s gross annual income") expect(page).to have_link("Confirm and continue", href: "/sales-logs/#{sales_log.id}/buyer-1-income") end end @@ -440,7 +440,7 @@ RSpec.describe CheckErrorsController, type: :request do it "correctly clears the values" do expect(page).to have_content("Make sure these answers are correct") - expect(page).to have_content("You didn’t answer this question") + expect(page).to have_link(lettings_log.form.get_question("hhmemb", lettings_log).check_answer_prompt, href: "/lettings-logs/#{lettings_log.id}/household-members?referrer=check_answers_new_answer", class: "govuk-link govuk-link--no-visited-state") expect(page.all(:button, value: "Clear").count).to eq(0) expect(lettings_log.reload.earnings).to eq(nil) expect(lettings_log.reload.incfreq).to eq(nil) @@ -470,7 +470,7 @@ RSpec.describe CheckErrorsController, type: :request do it "displays correct clear links" do expect(page).to have_content("Make sure these answers are correct") - expect(page).to have_content("You didn’t answer this question") + expect(page).to have_link(sales_log.form.get_question("income1", sales_log).check_answer_prompt, href: "/sales-logs/#{sales_log.id}/buyer-1-income?referrer=check_answers_new_answer", class: "govuk-link govuk-link--no-visited-state") expect(page.all(:button, value: "Clear").count).to eq(0) expect(sales_log.reload.income1).to eq(nil) expect(sales_log.reload.la).to eq(nil) diff --git a/spec/requests/form_controller_spec.rb b/spec/requests/form_controller_spec.rb index 2b7d4c65f..3ee34c517 100644 --- a/spec/requests/form_controller_spec.rb +++ b/spec/requests/form_controller_spec.rb @@ -1189,7 +1189,7 @@ RSpec.describe FormController, type: :request do it "displays a success banner" do follow_redirect! - expect(response.body).to include("You have successfully updated Q31: lead tenant’s age") + expect(response.body).to include("You have successfully updated Q31: lead tenant's age") end end diff --git a/spec/requests/lettings_logs_controller_spec.rb b/spec/requests/lettings_logs_controller_spec.rb index 05d83a162..55cf3d573 100644 --- a/spec/requests/lettings_logs_controller_spec.rb +++ b/spec/requests/lettings_logs_controller_spec.rb @@ -1295,9 +1295,9 @@ RSpec.describe LettingsLogsController, type: :request do expect(CGI.unescape_html(response.body)).to include("Not known") end - it "shows `you haven't answered this question` if the question wasn’t answered" do + it "shows link to answer question if the question wasn’t answered" do get "/lettings-logs/#{id}/income-and-benefits/check-answers" - expect(CGI.unescape_html(response.body)).to include("You didn’t answer this question") + expect(page).to have_link("Enter income", href: "/lettings-logs/#{id}/net-income?referrer=check_answers_new_answer", class: "govuk-link govuk-link--no-visited-state") end it "does not allow you to change the answers for previous collection year logs" do diff --git a/spec/views/merge_requests/show.html.erb_spec.rb b/spec/views/merge_requests/show.html.erb_spec.rb index c1dd47bfd..5cbc5d233 100644 --- a/spec/views/merge_requests/show.html.erb_spec.rb +++ b/spec/views/merge_requests/show.html.erb_spec.rb @@ -24,7 +24,7 @@ RSpec.describe "merge_requests/show.html.erb", type: :view do it "displays the requester details" do expect(rendered).to have_selector("dt", text: "Requester") - expect(rendered).to have_selector("dd", text: merge_request.requester&.name || "You didn't answer this question") + expect(rendered).to have_selector("dd", text: merge_request.requester&.name || "No answer provided") end it "displays the helpdesk ticket details" do @@ -32,7 +32,7 @@ RSpec.describe "merge_requests/show.html.erb", type: :view do if merge_request.helpdesk_ticket.present? expect(rendered).to have_link(merge_request.helpdesk_ticket, href: "https://mhclgdigital.atlassian.net/browse/#{merge_request.helpdesk_ticket}") else - expect(rendered).to have_selector("dd", text: "You didn't answer this question") + expect(rendered).to have_selector("dd", text: "No answer provided") end end @@ -48,7 +48,7 @@ RSpec.describe "merge_requests/show.html.erb", type: :view do it "displays the merge date details" do expect(rendered).to have_selector("dt", text: "Merge date") - expect(rendered).to have_selector("dd", text: merge_request.merge_date || "You didn't answer this question") + expect(rendered).to have_selector("dd", text: merge_request.merge_date || "No answer provided") end context "when the merge request is complete" do