From 96f9cca80df0c7b865a4819d8c94674565a201d9 Mon Sep 17 00:00:00 2001 From: Manny Dinssa <44172848+Dinssa@users.noreply.github.com> Date: Thu, 27 Mar 2025 09:45:24 +0000 Subject: [PATCH 1/2] Add line breaks to fixed term tenancy question hint text (#3020) --- config/locales/forms/2023/lettings/tenancy_information.en.yml | 4 ++-- config/locales/forms/2024/lettings/tenancy_information.en.yml | 4 ++-- config/locales/forms/2025/lettings/tenancy_information.en.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/config/locales/forms/2023/lettings/tenancy_information.en.yml b/config/locales/forms/2023/lettings/tenancy_information.en.yml index ba9dfd4d2..1208251b9 100644 --- a/config/locales/forms/2023/lettings/tenancy_information.en.yml +++ b/config/locales/forms/2023/lettings/tenancy_information.en.yml @@ -54,13 +54,13 @@ en: 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." + 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." + 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: "" diff --git a/config/locales/forms/2024/lettings/tenancy_information.en.yml b/config/locales/forms/2024/lettings/tenancy_information.en.yml index 73ea4a226..c9e56f943 100644 --- a/config/locales/forms/2024/lettings/tenancy_information.en.yml +++ b/config/locales/forms/2024/lettings/tenancy_information.en.yml @@ -54,13 +54,13 @@ en: 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." + 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." + 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: "" diff --git a/config/locales/forms/2025/lettings/tenancy_information.en.yml b/config/locales/forms/2025/lettings/tenancy_information.en.yml index 2b3ef6b37..92396e2ee 100644 --- a/config/locales/forms/2025/lettings/tenancy_information.en.yml +++ b/config/locales/forms/2025/lettings/tenancy_information.en.yml @@ -54,13 +54,13 @@ en: 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." + 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." + 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: "" From 1e9700bbf252866aa0432704739f6e087f3dbffe Mon Sep 17 00:00:00 2001 From: kosiakkatrina <54268893+kosiakkatrina@users.noreply.github.com> Date: Thu, 27 Mar 2025 09:57:37 +0000 Subject: [PATCH 2/2] Remove schemes update link (#3019) --- app/views/form/guidance/_finding_scheme.erb | 4 +++- config/locales/forms/2025/lettings/guidance.en.yml | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/views/form/guidance/_finding_scheme.erb b/app/views/form/guidance/_finding_scheme.erb index 40b6fe823..29caf896f 100644 --- a/app/views/form/guidance/_finding_scheme.erb +++ b/app/views/form/guidance/_finding_scheme.erb @@ -2,6 +2,8 @@ <%= govuk_details(summary_text: I18n.t("forms.#{@log.form.start_date.year}.lettings.guidance.finding_scheme.title")) do %> <%= I18n.t("forms.#{@log.form.start_date.year}.lettings.guidance.finding_scheme.content").html_safe %>

<%= govuk_link_to(I18n.t("forms.#{@log.form.start_date.year}.lettings.guidance.finding_scheme.view_schemes_link_text"), clear_filters_url(filter_type: "schemes")) %>

-

<%= govuk_link_to(I18n.t("forms.#{@log.form.start_date.year}.lettings.guidance.finding_scheme.scheme_changes_link_text"), scheme_changes_path) %>

+ <% if I18n.exists?("forms.#{@log.form.start_date.year}.lettings.guidance.finding_scheme.scheme_changes_link_text") %> +

<%= govuk_link_to(I18n.t("forms.#{@log.form.start_date.year}.lettings.guidance.finding_scheme.scheme_changes_link_text"), scheme_changes_path) %>

+ <% end %> <% end %> diff --git a/config/locales/forms/2025/lettings/guidance.en.yml b/config/locales/forms/2025/lettings/guidance.en.yml index cb51fbf9d..432735e77 100644 --- a/config/locales/forms/2025/lettings/guidance.en.yml +++ b/config/locales/forms/2025/lettings/guidance.en.yml @@ -12,7 +12,6 @@ en: title: "Can’t find your scheme?" content: "

Schemes are attached to the organisation that owns the property. Check you have correctly answered question 1 \"Which organisation owns this property?\"

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

" - scheme_changes_link_text: "Read more about how schemes have changed" view_schemes_link_text: "View your organisation’s schemes" privacy_notice_tenant: