Browse Source

CLDC-3668 Extract guidance copy (#2737)

* Extract guidance copy

* Update tests and lint
pull/2730/head^2
kosiakkatrina 2 months ago committed by GitHub
parent
commit
625b0c757c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 2
      app/models/form/lettings/questions/declaration.rb
  2. 2
      app/models/form/lettings/questions/rent_type.rb
  3. 4
      app/models/form/sales/questions/privacy_notice.rb
  4. 10
      app/models/form/sales/questions/shared_ownership_type.rb
  5. 28
      app/views/form/guidance/_discounted_ownership_type_definitions.erb
  6. 10
      app/views/form/guidance/_finding_location.erb
  7. 13
      app/views/form/guidance/_finding_scheme.erb
  8. 8
      app/views/form/guidance/_mortgage_lender.html.erb
  9. 13
      app/views/form/guidance/_outright_sale_type_definitions.erb
  10. 4
      app/views/form/guidance/_privacy_notice_buyer.erb
  11. 1
      app/views/form/guidance/_privacy_notice_buyer_2024.erb
  12. 1
      app/views/form/guidance/_privacy_notice_buyer_2024_joint_purchase.erb
  13. 4
      app/views/form/guidance/_privacy_notice_buyer_joint_purchase.erb
  14. 4
      app/views/form/guidance/_privacy_notice_tenant.erb
  15. 1
      app/views/form/guidance/_privacy_notice_tenant_2024.erb
  16. 26
      app/views/form/guidance/_rent_type_definitions.erb
  17. 21
      app/views/form/guidance/_rent_type_definitions_2024.erb
  18. 4
      app/views/form/guidance/_scheme_selection.html.erb
  19. 31
      app/views/form/guidance/_shared_ownership_type_definitions.erb
  20. 26
      app/views/form/guidance/_shared_ownership_type_definitions_2024.erb
  21. 14
      app/views/form/guidance/_void_date.html.erb
  22. 21
      app/views/form/guidance/_what_counts_as_income.html.erb
  23. 63
      config/locales/forms/2023/lettings/guidance.en.yml
  24. 47
      config/locales/forms/2023/sales/guidance.en.yml
  25. 63
      config/locales/forms/2024/lettings/guidance.en.yml
  26. 46
      config/locales/forms/2024/sales/guidance.en.yml
  27. 2
      spec/models/form/lettings/questions/declaration_spec.rb
  28. 2
      spec/models/form/lettings/questions/rent_type_spec.rb
  29. 4
      spec/models/form/sales/questions/privacy_notice_spec.rb
  30. 2
      spec/models/form/sales/questions/shared_ownership_type_spec.rb
  31. 2
      spec/requests/form_controller_spec.rb
  32. 2
      spec/views/form/page_view_spec.rb

2
app/models/form/lettings/questions/declaration.rb

@ -4,7 +4,7 @@ class Form::Lettings::Questions::Declaration < ::Form::Question
@id = "declaration" @id = "declaration"
@type = "checkbox" @type = "checkbox"
@check_answers_card_number = 0 unless form.start_year_after_2024? @check_answers_card_number = 0 unless form.start_year_after_2024?
@top_guidance_partial = form.start_year_after_2024? ? "privacy_notice_tenant_2024" : "privacy_notice_tenant" @top_guidance_partial = "privacy_notice_tenant"
@question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max] @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
end end

2
app/models/form/lettings/questions/rent_type.rb

@ -4,7 +4,7 @@ class Form::Lettings::Questions::RentType < ::Form::Question
@id = "rent_type" @id = "rent_type"
@copy_key = "lettings.setup.rent_type.rent_type" @copy_key = "lettings.setup.rent_type.rent_type"
@type = "radio" @type = "radio"
@top_guidance_partial = form.start_year_after_2024? ? "rent_type_definitions_2024" : "rent_type_definitions" @top_guidance_partial = "rent_type_definitions"
@answer_options = form.start_year_after_2024? ? ANSWER_OPTIONS_2024 : ANSWER_OPTIONS @answer_options = form.start_year_after_2024? ? ANSWER_OPTIONS_2024 : ANSWER_OPTIONS
@conditional_for = { "irproduct_other" => [5] } @conditional_for = { "irproduct_other" => [5] }
@question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max] if form.start_date.present? @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max] if form.start_date.present?

4
app/models/form/sales/questions/privacy_notice.rb

@ -29,12 +29,8 @@ class Form::Sales::Questions::PrivacyNotice < ::Form::Question
end end
def guidance def guidance
if form.start_year_after_2024?
@joint_purchase ? "privacy_notice_buyer_2024_joint_purchase" : "privacy_notice_buyer_2024"
else
@joint_purchase ? "privacy_notice_buyer_joint_purchase" : "privacy_notice_buyer" @joint_purchase ? "privacy_notice_buyer_joint_purchase" : "privacy_notice_buyer"
end end
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 19, 2024 => 14 }.freeze QUESTION_NUMBER_FROM_YEAR = { 2023 => 19, 2024 => 14 }.freeze
end end

10
app/models/form/sales/questions/shared_ownership_type.rb

@ -3,7 +3,7 @@ class Form::Sales::Questions::SharedOwnershipType < ::Form::Question
super super
@id = "type" @id = "type"
@copy_key = "sales.setup.type.shared_ownership" @copy_key = "sales.setup.type.shared_ownership"
@top_guidance_partial = guidance_partial @top_guidance_partial = "shared_ownership_type_definitions"
@type = "radio" @type = "radio"
@answer_options = answer_options @answer_options = answer_options
@question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max] @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
@ -34,13 +34,5 @@ class Form::Sales::Questions::SharedOwnershipType < ::Form::Question
end end
end end
def guidance_partial
if form.start_year_after_2024?
"shared_ownership_type_definitions_2024"
elsif form.start_date.year >= 2023
"shared_ownership_type_definitions"
end
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 4, 2024 => 6 }.freeze QUESTION_NUMBER_FROM_YEAR = { 2023 => 4, 2024 => 6 }.freeze
end end

28
app/views/form/guidance/_discounted_ownership_type_definitions.erb

@ -1,23 +1,5 @@
<%= govuk_details(summary_text: "Discounted ownership type definitions") do %> <div class="govuk-body">
<p class="govuk-body"> <%= govuk_details(summary_text: I18n.t("forms.#{@log.form.start_date.year}.sales.guidance.discounted_ownership_type_definitions.title")) do %>
<b>Right to Acquire (RTA):</b> a discounted sale of a property built or purchased after 31 March 1997 to tenants of a private registered provider. <%= I18n.t("forms.#{@log.form.start_date.year}.sales.guidance.discounted_ownership_type_definitions.content").html_safe %>
</p> <% end %>
<p class="govuk-body"> </div>
<b>Preserved Right to Buy (PRTB):</b> a discounted sale of a property that used to be owned by a council to tenants of a private registered provider.
</p>
<p class="govuk-body">
<b>Voluntary Right to Buy (VRTB):</b> a discounted sale to tenants in this PRP owned property, as part of a pilot scheme.
</p>
<p class="govuk-body">
<b>Right to Buy (RTB):</b> a discounted sale to tenants in this council owned property.
</p>
<p class="govuk-body">
<b>Rent to Buy full ownership:</b> a sale on full ownership terms following a period of discounted rent.
</p>
<p class="govuk-body">
<b>Social HomeBuy for outright purchase:</b> a discounted sale to tenants of a private registered provider on full ownership terms.
</p>
<p class="govuk-body">
<b>Any other equity loan scheme:</b> any scheme, not covered elsewhere, in which a loan is used to purchase equity.
</p>
<% end %>

10
app/views/form/guidance/_finding_location.erb

@ -1,4 +1,6 @@
<%= govuk_details(summary_text: "What is a location?") do %> <div class="govuk-body">
<p class="govuk-body">A location is a postcode area where supported housing is provided under a scheme. A scheme can have multiple locations, and a location can have multiple units at the same postcode.</p> <%= govuk_details(summary_text: I18n.t("forms.#{@log.form.start_date.year}.lettings.guidance.finding_location.title")) do %>
<p class="govuk-body"><%= govuk_link_to("Read more about schemes and locations", scheme_changes_path) %></p> <p><%= I18n.t("forms.#{@log.form.start_date.year}.lettings.guidance.finding_location.content").html_safe %></p>
<% end %> <p><%= govuk_link_to(I18n.t("forms.#{@log.form.start_date.year}.lettings.guidance.finding_location.scheme_changes_link_text"), scheme_changes_path) %></p>
<% end %>
</div>

13
app/views/form/guidance/_finding_scheme.erb

@ -1,6 +1,7 @@
<%= govuk_details(summary_text: "Can’t find your scheme?") do %> <div class="govuk-body">
<p class="govuk-body">Schemes are attached to the organisation that owns the property. Check you have correctly answered question 1 "Which organisation owns this property?"</p> <%= govuk_details(summary_text: I18n.t("forms.#{@log.form.start_date.year}.lettings.guidance.finding_scheme.title")) do %>
<p class="govuk-body">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> <%= I18n.t("forms.#{@log.form.start_date.year}.lettings.guidance.finding_scheme.content").html_safe %>
<p class="govuk-body"><%= govuk_link_to("View your organisation’s schemes", clear_filters_url(filter_type: "schemes")) %></p> <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>
<p class="govuk-body"><%= govuk_link_to("Read more about how schemes have changed", scheme_changes_path) %></p> <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>

8
app/views/form/guidance/_mortgage_lender.html.erb

@ -1,7 +1,3 @@
<%= govuk_details(summary_text: "Can’t find the mortgage lender you’re looking for?") do %> <%= govuk_details(summary_text: I18n.t("forms.#{@log.form.start_date.year}.sales.guidance.mortgage_lender.title")) do %>
<ul class="govuk-list govuk-list--bullet"> <%= I18n.t("forms.#{@log.form.start_date.year}.sales.guidance.mortgage_lender.content").html_safe %>
<li>Double check the spelling and try again</li>
<li>Type the first few letters to see the suggestions</li>
<li>Type Other and continue - we’ll ask you to type in your answer in the next question</li>
</ul>
<% end %> <% end %>

13
app/views/form/guidance/_outright_sale_type_definitions.erb

@ -1,8 +1,5 @@
<%= govuk_details(summary_text: "Outright sale type definitions") do %> <div class="govuk-body">
<p class="govuk-body"> <%= govuk_details(summary_text: I18n.t("forms.#{@log.form.start_date.year}.sales.guidance.outright_sale_type_definitions.title")) do %>
<b>Outright sale:</b> the full purchase of a property, usually with a mortgage or cash. <%= I18n.t("forms.#{@log.form.start_date.year}.sales.guidance.outright_sale_type_definitions.content").html_safe %>
</p> <% end %>
<p class="govuk-body"> </div>
<b>Other sale:</b> any sale which does not fit the criteria of any of the remaining options.
</p>
<% end %>

4
app/views/form/guidance/_privacy_notice_buyer.erb

@ -1 +1,3 @@
<p class="govuk-body">Make sure the buyer has seen <%= govuk_link_to "the Ministry of Housing, Communities and Local Government (MHCLG) privacy notice", privacy_notice_path, target: :_blank %> before completing this log.</p> <p class="govuk-body">
<%= I18n.t("forms.#{@log.form.start_date.year}.sales.guidance.privacy_notice_buyer.content", privacy_notice_link: "#{govuk_link_to I18n.t("forms.#{@log.form.start_date.year}.sales.guidance.privacy_notice_buyer.privacy_notice_link_text"), privacy_notice_path, target: :_blank}").html_safe %>
</p>

1
app/views/form/guidance/_privacy_notice_buyer_2024.erb

@ -1 +0,0 @@
<p class="govuk-body">Make sure the buyer has seen or been given access to <%= govuk_link_to "the Ministry of Housing, Communities and Local Government (MHCLG) privacy notice", privacy_notice_path, target: :_blank %> before completing this log. This is a legal requirement under data protection legislation.</p>

1
app/views/form/guidance/_privacy_notice_buyer_2024_joint_purchase.erb

@ -1 +0,0 @@
<p class="govuk-body">Make sure the buyers have seen or been given access to <%= govuk_link_to "the Ministry of Housing, Communities and Local Government (MHCLG) privacy notice", privacy_notice_path, target: :_blank %> before completing this log. This is a legal requirement under data protection legislation.</p>

4
app/views/form/guidance/_privacy_notice_buyer_joint_purchase.erb

@ -1 +1,3 @@
<p class="govuk-body">Make sure the buyers have seen <%= govuk_link_to "the Ministry of Housing, Communities and Local Government (MHCLG) privacy notice", privacy_notice_path, target: :_blank %> before completing this log.</p> <p class="govuk-body">
<%= I18n.t("forms.#{@log.form.start_date.year}.sales.guidance.privacy_notice_buyer_joint_purchase.content", privacy_notice_link: "#{govuk_link_to I18n.t("forms.#{@log.form.start_date.year}.sales.guidance.privacy_notice_buyer_joint_purchase.privacy_notice_link_text"), privacy_notice_path, target: :_blank}").html_safe %>
</p>

4
app/views/form/guidance/_privacy_notice_tenant.erb

@ -1 +1,3 @@
<p class="govuk-body">Make sure the tenant has seen <%= govuk_link_to "the Ministry of Housing, Communities and Local Government (MHCLG) privacy notice", privacy_notice_path, target: :_blank %> before completing this log.</p> <p class="govuk-body">
<%= I18n.t("forms.#{@log.form.start_date.year}.lettings.guidance.privacy_notice_tenant.content", privacy_notice_link: "#{govuk_link_to I18n.t("forms.#{@log.form.start_date.year}.lettings.guidance.privacy_notice_tenant.privacy_notice_link_text"), privacy_notice_path, target: :_blank}").html_safe %>
</p>

1
app/views/form/guidance/_privacy_notice_tenant_2024.erb

@ -1 +0,0 @@
<p class="govuk-body">Make sure the lead tenant has seen or been given access to <%= govuk_link_to "the Ministry of Housing, Communities and Local Government (MHCLG) privacy notice", privacy_notice_path, target: :_blank %> before completing this log. This is a legal requirement under data protection legislation.</p>

26
app/views/form/guidance/_rent_type_definitions.erb

@ -1,21 +1,5 @@
<%= govuk_details(summary_text: "Rent type definitions") do %> <div class="govuk-body">
<p class="govuk-body"> <%= govuk_details(summary_text: I18n.t("forms.#{@log.form.start_date.year}.lettings.guidance.rent_type_definitions.title")) do %>
<b>Affordable Rent:</b> where up to 80% of market rent can be charged. A new supply agreement is signed with Homes England or the Greater London Authority (GLA). <%= I18n.t("forms.#{@log.form.start_date.year}.lettings.guidance.rent_type_definitions.content").html_safe %>
</p> <% end %>
<p class="govuk-body"> </div>
<b>London Affordable Rent:</b> a tenure of affordable housing available in London by the GLA. It is an affordable rent which must be set in accordance with the Regulator of Social Housing’s Affordable Rent guidance. The landlord of these homes must be registered with the Regulator of Social Housing. These are a type of Affordable Rent lettings.
</p>
<p class="govuk-body">
<b>London Living Rent:</b> a tenure of affordable housing available in London by the GLA. It was introduced in Affordable Homes Programme 2016 to 2021. These are a type of Intermediate Rent lettings.
</p>
<p class="govuk-body">
<b>Rent to Buy: </b> a discount of up to 20% market rent is charged for a single rental period for a minimum of 5 years. After that period, the tenant is offered first chance to purchase the property (either shared ownership or outright) at full market value. These are a type of Intermediate Rent lettings.
</p>
<p class="govuk-body">
<b>Social Rent:</b> where target rents are determined through the national rent regime. This is sometimes also known as 'formula rent'.
</p>
<p class="govuk-body">
<b>Other intermediate rent:</b> any other specific scheme where up to 80% of market rent can be charged. This includes schemes with reduced rent so tenants can save towards a house purchasing deposit and schemes with an in-built future opportunity to buy the property being rented.
</p>
<% end %>

21
app/views/form/guidance/_rent_type_definitions_2024.erb

@ -1,21 +0,0 @@
<%= govuk_details(summary_text: "Rent type definitions") do %>
<p class="govuk-body">
<b>Social Rent:</b> where target rents are determined through the national rent regime. This is sometimes also known as 'formula rent'.
</p>
<p class="govuk-body">
<b>Affordable Rent:</b> where up to 80% of market rent can be charged. A new supply agreement is signed with Homes England or the Greater London Authority (GLA).
</p>
<p class="govuk-body">
<b>London Affordable Rent:</b> a tenure of affordable housing available in London by the GLA. It is an affordable rent which must be set in accordance with the Regulator of Social Housing’s Affordable Rent guidance. The landlord of these homes must be registered with the Regulator of Social Housing. These are a type of Affordable Rent lettings.
</p>
<p class="govuk-body">
<b>Rent to Buy: </b> a discount of up to 20% market rent is charged for a single rental period for a minimum of 5 years. After that period, the tenant is offered first chance to purchase the property (either shared ownership or outright) at full market value. These are a type of Intermediate Rent lettings.
</p>
<p class="govuk-body">
<b>London Living Rent:</b> a tenure of affordable housing available in London by the GLA. It was introduced in Affordable Homes Programme 2016 to 2021. These are a type of Intermediate Rent lettings.
</p>
<p class="govuk-body">
<b>Other intermediate rent:</b> any other specific scheme where up to 80% of market rent can be charged. This includes schemes with reduced rent so tenants can save towards a house purchasing deposit and schemes with an in-built future opportunity to buy the property being rented.
</p>
<% end %>

4
app/views/form/guidance/_scheme_selection.html.erb

@ -1,5 +1,5 @@
<% if current_user.data_provider? %> <% if current_user.data_provider? %>
<p class="govuk-body">If you’re not sure which scheme to choose, ask a data coordinator. Find your data coordinators on the <%= govuk_link_to("users page", users_path) %>.</p> <p class="govuk-body"><%= I18n.t("forms.#{@log.form.start_date.year}.lettings.guidance.scheme_selection.data_provider.content", users_page_link: govuk_link_to(I18n.t("forms.#{@log.form.start_date.year}.lettings.guidance.scheme_selection.data_provider.users_page_link_text"), users_path).to_s).html_safe %></p>
<% elsif current_user.data_coordinator? %> <% elsif current_user.data_coordinator? %>
<p class="govuk-body"><%= govuk_link_to "Create a new supported housing scheme", new_scheme_path %></p> <p class="govuk-body"><%= govuk_link_to I18n.t("forms.#{@log.form.start_date.year}.lettings.guidance.scheme_selection.data_coordinator.create_scheme_link_text"), new_scheme_path %></p>
<% end %> <% end %>

31
app/views/form/guidance/_shared_ownership_type_definitions.erb

@ -1,26 +1,5 @@
<%= govuk_details(summary_text: "Shared ownership type definitions") do %> <div class="govuk-body">
<p class="govuk-body"> <%= govuk_details(summary_text: I18n.t("forms.#{@log.form.start_date.year}.sales.guidance.shared_ownership_type_definitions.title")) do %>
<b>Shared ownership:</b> Cannot be used for homes funded through the Affordable Homes Programme 2021 to 2026. Use the 2021 model lease for these properties. <%= I18n.t("forms.#{@log.form.start_date.year}.sales.guidance.shared_ownership_type_definitions.content").html_safe %>
</p> <% end %>
<p class="govuk-body"> </div>
<b>Shared ownership 2021 model lease:</b> Homes bought using the Affordable Homes Programme 2021 to 2026.
</p>
<p class="govuk-body">
<b>Older Persons Shared Ownership:</b> A type of shared ownership for those 55 years and over.
</p>
<p class="govuk-body">
<b>Social HomeBuy shared ownership purchase:</b> Tenants of private registered providers purchase their home at discount on Shared Ownership terms.
</p>
<p class="govuk-body">
<b>Home Ownership for people with Long-Term Disabilities (HOLD):</b> A shared ownership sale for those with long term disabilities.
</p>
<p class="govuk-body">
<b>Rent to Buy shared ownership:</b> A sale following a period of discounted rent.
</p>
<p class="govuk-body">
<b>Right to Shared Ownership:</b> A sale of a share of a rented home to a tenant using this scheme.
</p>
<p class="govuk-body">
<b>London Living Rent shared ownership:</b> A shared ownership sale following a period of discounted rent as part of the London Living Rent scheme.
</p>
<% end %>

26
app/views/form/guidance/_shared_ownership_type_definitions_2024.erb

@ -1,26 +0,0 @@
<%= govuk_details(summary_text: "Shared ownership type definitions") do %>
<p class="govuk-body">
<b>Shared Ownership (old model lease):</b> Cannot be used for homes funded through the Affordable Homes Programme 2021 to 2026. Use the new model lease for these properties.
</p>
<p class="govuk-body">
<b>Shared Ownership (new model lease):</b> Homes bought using the Affordable Homes Programme 2021 to 2026.
</p>
<p class="govuk-body">
<b>Social HomeBuy — shared ownership purchase:</b> Tenants of private registered providers purchase their home at discount on Shared Ownership terms.
</p>
<p class="govuk-body">
<b>Home Ownership for people with Long-Term Disabilities (HOLD):</b> A shared ownership sale for those with long term disabilities.
</p>
<p class="govuk-body">
<b>Older Persons Shared Ownership:</b> A type of shared ownership for those 55 years and over.
</p>
<p class="govuk-body">
<b>Rent to Buy — Shared Ownership:</b> A sale following a period of discounted rent.
</p>
<p class="govuk-body">
<b>Right to Shared Ownership (RtSO):</b> A sale of a share of a rented home to a tenant using this scheme.
</p>
<p class="govuk-body">
<b>London Living Rent — Shared Ownership:</b> A shared ownership sale following a period of discounted rent as part of the London Living Rent scheme.
</p>
<% end %>

14
app/views/form/guidance/_void_date.html.erb

@ -1,9 +1,5 @@
<%= govuk_details(summary_text: "What is a void date?") do %> <div class="govuk-body">
<p class="govuk-body">Date the property was (legally or contractually) available to let, or for:</p> <%= govuk_details(summary_text: I18n.t("forms.#{@log.form.start_date.year}.lettings.guidance.void_date.title")) do %>
<ul class="govuk-list govuk-list--bullet"> <%= I18n.t("forms.#{@log.form.start_date.year}.lettings.guidance.void_date.content").html_safe %>
<li>re-lets: the day after the previous tenant's contract ended</li> <% end %>
<li>new builds: the day the landlord legally first owned the property (‘completion date’)</li> </div>
<li>new conversions or acquisitions: completion date, or the day after rehabilitation work ended</li>
<li>new leases: the day the landlord got contractual property rights and could let it out to tenants</li>
</ul>
<% end %>

21
app/views/form/guidance/_what_counts_as_income.html.erb

@ -1,16 +1,5 @@
<%= govuk_details(summary_text: "What counts as income?") do %> <div class="govuk-body">
<p class="govuk-body">You should include any income after tax from:</p> <%= govuk_details(summary_text: I18n.t("forms.#{@log.form.start_date.year}.lettings.guidance.what_counts_as_income.title")) do %>
<ul class="govuk-list govuk-list--bullet"> <%= I18n.t("forms.#{@log.form.start_date.year}.lettings.guidance.what_counts_as_income.content").html_safe %>
<li>employment</li> <% end %>
<li>pensions</li> </div>
<li>Universal Credit</li>
</ul>
<p class="govuk-body">Don’t include:</p>
<ul class="govuk-list govuk-list--bullet">
<li>National Insurance (NI) contributions and tax</li>
<li>housing benefit</li>
<li>child benefit</li>
<li>council tax support</li>
</ul>
<% end %>

63
config/locales/forms/2023/lettings/guidance.en.yml

@ -0,0 +1,63 @@
en:
forms:
2023:
lettings:
guidance:
finding_location:
title: "What is a location?"
content: "A location is a postcode area where supported housing is provided under a scheme. A scheme can have multiple locations, and a location can have multiple units at the same postcode."
scheme_changes_link_text: "Read more about schemes and locations"
finding_scheme:
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:
content: "Make sure the tenant has seen %{privacy_notice_link} before completing this log."
privacy_notice_link_text: "the Ministry of Housing, Communities and Local Government (MHCLG) privacy notice"
rent_type_definitions:
title: "Rent type definitions"
content: "<p><b>Affordable Rent:</b> where up to 80% of market rent can be charged. A new supply agreement is signed with Homes England or the Greater London Authority (GLA).</p>
<p><b>London Affordable Rent:</b> a tenure of affordable housing available in London by the GLA. It is an affordable rent which must be set in accordance with the Regulator of Social Housing’s Affordable Rent guidance. The landlord of these homes must be registered with the Regulator of Social Housing. These are a type of Affordable Rent lettings.</p>
<p><b>London Living Rent:</b> a tenure of affordable housing available in London by the GLA. It was introduced in Affordable Homes Programme 2016 to 2021. These are a type of Intermediate Rent lettings.</p>
<p><b>Rent to Buy: </b> a discount of up to 20% market rent is charged for a single rental period for a minimum of 5 years. After that period, the tenant is offered first chance to purchase the property (either shared ownership or outright) at full market value. These are a type of Intermediate Rent lettings.</p>
<p><b>Social Rent:</b> where target rents are determined through the national rent regime. This is sometimes also known as 'formula rent'.</p>
<p><b>Other intermediate rent:</b> any other specific scheme where up to 80% of market rent can be charged. This includes schemes with reduced rent so tenants can save towards a house purchasing deposit and schemes with an in-built future opportunity to buy the property being rented.</p>"
scheme_selection:
data_provider:
content: "If you’re not sure which scheme to choose, ask a data coordinator. Find your data coordinators on the %{users_page_link}."
users_page_link_text: "users page"
data_coordinator:
create_scheme_link_text: "Create a new supported housing scheme"
void_date:
title: "What is a void date?"
content: "<p>Date the property was (legally or contractually) available to let, or for:</p>
<ul class=\"govuk-list govuk-list--bullet\">
<li>re-lets: the day after the previous tenant's contract ended</li>
<li>new builds: the day the landlord legally first owned the property (‘completion date’)</li>
<li>new conversions or acquisitions: completion date, or the day after rehabilitation work ended</li>
<li>new leases: the day the landlord got contractual property rights and could let it out to tenants</li>
</ul>"
what_counts_as_income:
title: "What counts as income?"
content: "<p>You should include any income after tax from:</p>
<ul class=\"govuk-list govuk-list--bullet\">
<li>employment</li>
<li>pensions</li>
<li>Universal Credit</li>
</ul>
<p>Don’t include:</p>
<ul class=\"govuk-list govuk-list--bullet\">
<li>National Insurance (NI) contributions and tax</li>
<li>housing benefit</li>
<li>child benefit</li>
<li>council tax support</li>
</ul>"

47
config/locales/forms/2023/sales/guidance.en.yml

@ -0,0 +1,47 @@
en:
forms:
2023:
sales:
guidance:
shared_ownership_type_definitions:
title: "Shared Ownership Type Definitions"
content: "<p><b>Shared ownership:</b> Cannot be used for homes funded through the Affordable Homes Programme 2021 to 2026. Use the 2021 model lease for these properties.</p>
<p><b>Shared ownership 2021 model lease:</b> Homes bought using the Affordable Homes Programme 2021 to 2026.</p>
<p><b>Older Persons Shared Ownership:</b> A type of shared ownership for those 55 years and over.</p>
<p><b>Social HomeBuy shared ownership purchase:</b> Tenants of private registered providers purchase their home at discount on Shared Ownership terms.</p>
<p>>Home Ownership for people with Long-Term Disabilities (HOLD):</b> A shared ownership sale for those with long term disabilities.</p>
<p><b>Rent to Buy shared ownership:</b> A sale following a period of discounted rent.</p>
<p><b>Right to Shared Ownership:</b> A sale of a share of a rented home to a tenant using this scheme.</p>
<p><b>London Living Rent shared ownership:</b> A shared ownership sale following a period of discounted rent as part of the London Living Rent scheme.</p>"
discounted_ownership_type_definitions:
title: "Discounted Ownership Type Definitions"
content: "<p><b>Right to Acquire (RTA):</b> a discounted sale of a property built or purchased after 31 March 1997 to tenants of a private registered provider.</p>
<p><b>Preserved Right to Buy (PRTB):</b> a discounted sale of a property that used to be owned by a council to tenants of a private registered provider.</p>
<p><b>Voluntary Right to Buy (VRTB):</b> a discounted sale to tenants in this PRP owned property, as part of a pilot scheme.</p>
<p><b>Right to Buy (RTB):</b> a discounted sale to tenants in this council owned property.</p>
<p><b>Rent to Buy full ownership:</b> a sale on full ownership terms following a period of discounted rent.</p>
<p><b>Social HomeBuy for outright purchase:</b> a discounted sale to tenants of a private registered provider on full ownership terms.</p>
<p><b>Any other equity loan scheme:</b> any scheme, not covered elsewhere, in which a loan is used to purchase equity.</p>"
mortgage_lender:
title: "Can’t find the mortgage lender you’re looking for?"
content: "<ul class=\"govuk-list govuk-list--bullet\">
<li>Double check the spelling and try again</li>
<li>Type the first few letters to see the suggestions</li>
<li>Type Other and continue - we’ll ask you to type in your answer in the next question</li>
</ul>"
outright_sale_type_definitions:
title: "Outright sale type definitions"
content: "<p><b>Outright sale:</b> the full purchase of a property, usually with a mortgage or cash.</p>
<p><b>Other sale:</b> any sale which does not fit the criteria of any of the remaining options.</p>"
privacy_notice_buyer_joint_purchase:
content: "Make sure the buyers have seen %{privacy_notice_link} before completing this log."
privacy_notice_link_text: "the Ministry of Housing, Communities and Local Government (MHCLG) privacy notice"
privacy_notice_buyer:
content: "Make sure the buyer has seen %{privacy_notice_link} before completing this log."
privacy_notice_link_text: "the Ministry of Housing, Communities and Local Government (MHCLG) privacy notice"

63
config/locales/forms/2024/lettings/guidance.en.yml

@ -0,0 +1,63 @@
en:
forms:
2024:
lettings:
guidance:
finding_location:
title: "What is a location?"
content: "A location is a postcode area where supported housing is provided under a scheme. A scheme can have multiple locations, and a location can have multiple units at the same postcode."
scheme_changes_link_text: "Read more about schemes and locations"
finding_scheme:
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:
content: "Make sure the lead tenant has seen or been given access to %{privacy_notice_link} before completing this log. This is a legal requirement under data protection legislation."
privacy_notice_link_text: "the Ministry of Housing, Communities and Local Government (MHCLG) privacy notice"
rent_type_definitions:
title: "Rent type definitions"
content: "<p><b>Social Rent:</b> where target rents are determined through the national rent regime. This is sometimes also known as 'formula rent'.</p>
<p><b>Affordable Rent:</b> where up to 80% of market rent can be charged. A new supply agreement is signed with Homes England or the Greater London Authority (GLA).</p>
<p><b>London Affordable Rent:</b> a tenure of affordable housing available in London by the GLA. It is an affordable rent which must be set in accordance with the Regulator of Social Housing’s Affordable Rent guidance. The landlord of these homes must be registered with the Regulator of Social Housing. These are a type of Affordable Rent lettings.</p>
<p><b>Rent to Buy: </b> a discount of up to 20% market rent is charged for a single rental period for a minimum of 5 years. After that period, the tenant is offered first chance to purchase the property (either shared ownership or outright) at full market value. These are a type of Intermediate Rent lettings.</p>
<p><b>London Living Rent:</b> a tenure of affordable housing available in London by the GLA. It was introduced in Affordable Homes Programme 2016 to 2021. These are a type of Intermediate Rent lettings.</p>
<p><b>Other intermediate rent:</b> any other specific scheme where up to 80% of market rent can be charged. This includes schemes with reduced rent so tenants can save towards a house purchasing deposit and schemes with an in-built future opportunity to buy the property being rented.</p>"
scheme_selection:
data_provider:
content: "If you’re not sure which scheme to choose, ask a data coordinator. Find your data coordinators on the %{users_page_link}."
users_page_link_text: "users page"
data_coordinator:
create_scheme_link_text: "Create a new supported housing scheme"
void_date:
title: "What is a void date?"
content: "<p>Date the property was (legally or contractually) available to let, or for:</p>
<ul class=\"govuk-list govuk-list--bullet\">
<li>re-lets: the day after the previous tenant's contract ended</li>
<li>new builds: the day the landlord legally first owned the property (‘completion date’)</li>
<li>new conversions or acquisitions: completion date, or the day after rehabilitation work ended</li>
<li>new leases: the day the landlord got contractual property rights and could let it out to tenants</li>
</ul>"
what_counts_as_income:
title: "What counts as income?"
content: "<p>You should include any income after tax from:</p>
<ul class=\"govuk-list govuk-list--bullet\">
<li>employment</li>
<li>pensions</li>
<li>Universal Credit</li>
</ul>
<p>Don’t include:</p>
<ul class=\"govuk-list govuk-list--bullet\">
<li>National Insurance (NI) contributions and tax</li>
<li>housing benefit</li>
<li>child benefit</li>
<li>council tax support</li>
</ul>"

46
config/locales/forms/2024/sales/guidance.en.yml

@ -0,0 +1,46 @@
en:
forms:
2024:
sales:
guidance:
shared_ownership_type_definitions:
title: "Shared Ownership Type Definitions"
content: "<p><b>Shared Ownership (old model lease):</b> Cannot be used for homes funded through the Affordable Homes Programme 2021 to 2026. Use the new model lease for these properties.</p>
<p><b>Shared Ownership (new model lease):</b> Homes bought using the Affordable Homes Programme 2021 to 2026.</p>
<p><b>Social HomeBuy — shared ownership purchase:</b> Tenants of private registered providers purchase their home at discount on Shared Ownership terms.</p>
<p><b>Home Ownership for people with Long-Term Disabilities (HOLD):</b> A shared ownership sale for those with long term disabilities.</p>
<p><b>Older Persons Shared Ownership:</b> A type of shared ownership for those 55 years and over.</p>
<p><b>Rent to Buy — Shared Ownership:</b> A sale following a period of discounted rent.</p>
<p><b>Right to Shared Ownership (RtSO):</b> A sale of a share of a rented home to a tenant using this scheme.</p>
<p><b>London Living Rent — Shared Ownership:</b> A shared ownership sale following a period of discounted rent as part of the London Living Rent scheme.</p>"
discounted_ownership_type_definitions:
title: "Discounted Ownership Type Definitions"
content: "<p><b>Right to Acquire (RTA):</b> a discounted sale of a property built or purchased after 31 March 1997 to tenants of a private registered provider.</p>
<p><b>Preserved Right to Buy (PRTB):</b> a discounted sale of a property that used to be owned by a council to tenants of a private registered provider.</p>
<p><b>Voluntary Right to Buy (VRTB):</b> a discounted sale to tenants in this PRP owned property, as part of a pilot scheme.</p>
<p><b>Right to Buy (RTB):</b> a discounted sale to tenants in this council owned property.</p>
<p><b>Rent to Buy full ownership:</b> a sale on full ownership terms following a period of discounted rent.</p>
<p><b>Social HomeBuy for outright purchase:</b> a discounted sale to tenants of a private registered provider on full ownership terms.</p>
<p><b>Any other equity loan scheme:</b> any scheme, not covered elsewhere, in which a loan is used to purchase equity.</p>"
mortgage_lender:
title: "Can’t find the mortgage lender you’re looking for?"
content: "<ul class=\"govuk-list govuk-list--bullet\">
<li>Double check the spelling and try again</li>
<li>Type the first few letters to see the suggestions</li>
<li>Type Other and continue - we’ll ask you to type in your answer in the next question</li>
</ul>"
outright_sale_type_definitions:
title: "Outright sale type definitions"
content: "<p><b>Outright sale:</b> the full purchase of a property, usually with a mortgage or cash.</p>
<p><b>Other sale:</b> any sale which does not fit the criteria of any of the remaining options.</p>"
privacy_notice_buyer_joint_purchase:
content: "Make sure the buyers have seen or been given access to %{privacy_notice_link} before completing this log. This is a legal requirement under data protection legislation."
privacy_notice_link_text: "the Ministry of Housing, Communities and Local Government (MHCLG) privacy notice"
privacy_notice_buyer:
content: "Make sure the buyer has seen or been given access to %{privacy_notice_link} before completing this log. This is a legal requirement under data protection legislation."
privacy_notice_link_text: "the Ministry of Housing, Communities and Local Government (MHCLG) privacy notice"

2
spec/models/form/lettings/questions/declaration_spec.rb

@ -67,7 +67,7 @@ RSpec.describe Form::Lettings::Questions::Declaration, type: :model do
end end
it "uses the expected top guidance partial" do it "uses the expected top guidance partial" do
expect(question.top_guidance_partial).to eq("privacy_notice_tenant_2024") expect(question.top_guidance_partial).to eq("privacy_notice_tenant")
end end
it "has check_answers_card_number nil" do it "has check_answers_card_number nil" do

2
spec/models/form/lettings/questions/rent_type_spec.rb

@ -73,7 +73,7 @@ RSpec.describe Form::Lettings::Questions::RentType, type: :model do
end end
it "has the correct guidance partial" do it "has the correct guidance partial" do
expect(question.top_guidance_partial).to eq("rent_type_definitions_2024") expect(question.top_guidance_partial).to eq("rent_type_definitions")
end end
end end
end end

4
spec/models/form/sales/questions/privacy_notice_spec.rb

@ -94,7 +94,7 @@ RSpec.describe Form::Sales::Questions::PrivacyNotice, type: :model do
end end
it "uses the expected top guidance partial" do it "uses the expected top guidance partial" do
expect(question.top_guidance_partial).to eq("privacy_notice_buyer_2024") expect(question.top_guidance_partial).to eq("privacy_notice_buyer")
end end
it "returns correct unanswered_error_message" do it "returns correct unanswered_error_message" do
@ -116,7 +116,7 @@ RSpec.describe Form::Sales::Questions::PrivacyNotice, type: :model do
end end
it "uses the expected top guidance partial" do it "uses the expected top guidance partial" do
expect(question.top_guidance_partial).to eq("privacy_notice_buyer_2024_joint_purchase") expect(question.top_guidance_partial).to eq("privacy_notice_buyer_joint_purchase")
end end
it "returns correct unanswered_error_message" do it "returns correct unanswered_error_message" do

2
spec/models/form/sales/questions/shared_ownership_type_spec.rb

@ -63,7 +63,7 @@ RSpec.describe Form::Sales::Questions::SharedOwnershipType, type: :model do
end end
it "shows shows correct top_guidance_partial" do it "shows shows correct top_guidance_partial" do
expect(question.top_guidance_partial).to eq("shared_ownership_type_definitions_2024") expect(question.top_guidance_partial).to eq("shared_ownership_type_definitions")
end end
end end
end end

2
spec/requests/form_controller_spec.rb

@ -412,7 +412,7 @@ RSpec.describe FormController, type: :request do
context "with a form page that has custom guidance" do context "with a form page that has custom guidance" do
it "displays the correct partial" do it "displays the correct partial" do
get "/lettings-logs/#{lettings_log.id}/net-income", headers: headers, params: {} get "/lettings-logs/#{lettings_log.id}/net-income", headers: headers, params: {}
expect(response.body).to match("What counts as income?") expect(response.body).to match(I18n.t("forms.2021.lettings.guidance.what_counts_as_income.title"))
end end
end end

2
spec/views/form/page_view_spec.rb

@ -100,7 +100,7 @@ RSpec.describe "form/page" do
end end
context "with a question containing extra guidance" do context "with a question containing extra guidance" do
let(:expected_guidance) { /What counts as income?/ } let(:expected_guidance) { /#{I18n.t("forms.2021.lettings.guidance.what_counts_as_income.content")}/ }
context "with radio type" do context "with radio type" do
let(:question_attributes) { { type: "radio", answer_options: { "1": "A", "2": "B" } } } let(:question_attributes) { { type: "radio", answer_options: { "1": "A", "2": "B" } } }

Loading…
Cancel
Save