Merge branch 'main' into CLDC-3965-Sales-CSV-column-changes

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 %>
     <p><%= 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")) %></p>
+    <% if I18n.exists?("forms.#{@log.form.start_date.year}.lettings.guidance.finding_scheme.scheme_changes_link_text") %>
       <p><%= govuk_link_to(I18n.t("forms.#{@log.form.start_date.year}.lettings.guidance.finding_scheme.scheme_changes_link_text"), scheme_changes_path) %></p>
     <% end %>
+  <% end %>
 </div>

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.</br>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.</br></br>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.</br>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.</br></br>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: ""

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.</br>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.</br></br>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.</br>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.</br></br>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: ""

config/locales/forms/2025/lettings/guidance.en.yml

@@ -12,7 +12,6 @@ en:
             title: "Can’t find your scheme?"
             content: "<p>Schemes are attached to the organisation that owns the property. Check you have correctly answered question 1 \"Which organisation owns this property?\"</p>
               <p>If your organisation’s schemes were migrated from old CORE, they may have new names and codes. Search by postcode to find your scheme.</p>"
-            scheme_changes_link_text: "Read more about how schemes have changed"
             view_schemes_link_text: "View your organisation’s schemes"
 
           privacy_notice_tenant:

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.</br>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.</br></br>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.</br>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.</br></br>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: ""