Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PC-570 wording changes following supplier feedback #259

Merged
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions help_to_heat/frontdoor/schemas.py
Original file line number Diff line number Diff line change
Expand Up @@ -355,11 +355,11 @@
"No loft": _("No loft"),
},
"loft_insulation": {
"Yes, there is at least 270mm of insulation in my loft": _(
"Yes, there is at least 270mm of insulation in my loft"
"I have more than 100 mm of loft insulation": _(
"I have more than 100 mm of loft insulation"
),
"No, there is less than 270mm of insulation in my loft": _(
"No, there is less than 270mm of insulation in my loft"
"I have up to 100 mm of loft insulation": _(
"I have up to 100 mm of loft insulation"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please replace all uses of 100 mm and 270 mm throughout with 100mm and 270mm (no space).

This is the expected style in the GOV.UK style guide:

Measurements

Use numerals and spell out measurements at first mention.

Do not use a space between the numeral and abbreviated measurement: 3,500kg not 3,500 kg.

Abbreviating kilograms to kg is fine - you do not need to spell it out.

Use ‘grams’ (not ‘grammes’). For example: micrograms, milligrams.

If the measurement is more than one word, like kilometres per hour, then spell it out the first time it’s used with the abbreviation. From then on, abbreviate. If it’s only mentioned once, do not abbreviate.

Use Celsius for temperature: 37°C

),
"I don't know": _("I don't know"),
"No loft": _("No loft"),
Expand Down Expand Up @@ -581,12 +581,12 @@
epc_rating_options = ("A", "B", "C", "D", "E", "F", "G", "H", "Not found")
loft_insulation_options_map = (
{
"value": "Yes, there is at least 270mm of insulation in my loft",
"label": _("Yes, there is at least 270mm of insulation in my loft"),
"value": "I have more than 100 mm of loft insulation",
"label": _("I have more than 100 mm of loft insulation"),
},
{
"value": "No, there is less than 270mm of insulation in my loft",
"label": _("No, there is less than 270mm of insulation in my loft"),
"value": "I have up to 100 mm of loft insulation",
"label": _("I have up to 100 mm of loft insulation"),
},
{
"value": "I don't know",
Expand Down
Binary file modified help_to_heat/locale/cy/LC_MESSAGES/django.mo
Binary file not shown.
211 changes: 155 additions & 56 deletions help_to_heat/locale/cy/LC_MESSAGES/django.po
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lots of the Welsh mixes between using ' and for apostrophes. We should be using .

Please can you replace these everywhere? We could take the opportunity to do it in all our strings.

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion help_to_heat/templates/frontdoor/address.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<h1 class="govuk-heading-l">
{{_("What is the property's address?")}}
</h1>
<p class="govuk-body">{{_("We use this information to search the Energy Performance of Buildings Register for an Energy Performance Certificate that matches your address")}}</p>
<p class="govuk-body">{{_("We use this information to search for an Energy Performance Certificate that matches your address.")}}</p>

</legend>

Expand Down
10 changes: 8 additions & 2 deletions help_to_heat/templates/frontdoor/loft-insulation.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,14 @@
<fieldset class="govuk-fieldset" {% if errors %} aria-describedby="question-loft_insulation-error" {% endif %}>
<legend class="govuk-fieldset__legend govuk-fieldset__legend--l">
<h1 class="govuk-fieldset__heading">
{{_("Is your loft fully insulated?")}}
{{_("How much loft insulation do you have?")}}
</h1>
</legend>
<p class="govuk-body">
{{_("A loft is fully insulated if it has more than 270mm (about 10-11 inches) of insulation covering the whole loft, usually laid on the 'floor' of the loft with one layer between the horizontal timbers and another layer going across them to bring the insulation up to the required level.")}}
{{_("A loft is fully insulated if it has 270 mm (about 10-11 inches) of insulation covering the whole loft, usually laid on the 'floor' of the loft with one layer between the horizontal timber joists and another layer going across them to bring the insulation up to the required level.")}}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

'floor' should be ‘floor’

</p>
<p class="govuk-body">
{{_("A loft with less than 100 mm of insulation could benefit from additional insulation.")}}
</p>

<details class="govuk-details" data-module="govuk-details">
Expand All @@ -28,6 +31,9 @@ <h1 class="govuk-fieldset__heading">
<p class="govuk-body">
{{_("If your home was built after 2002, or you have installed loft insulation since 2002, it is likely that it is fully insulated.")}}
</p>
<p class="govuk-body">
{{_("If you have insulation above the level of the joist it is likely to be more than 100 mm thick already.")}}
</p>
</div>
</details>

Expand Down
9 changes: 6 additions & 3 deletions help_to_heat/templates/frontdoor/schemes.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
{{csrf_input}}
<div class="govuk-form-group">
<h1 class="govuk-heading-l">{{_("Information based on your answers")}}</h1>
<p class="govuk-body">{{_("Based on your answers you can register for help through:")}}</p>
<p class="govuk-body">{{_("Based on your answers you are eligible to be considered for the Great British Insulation Scheme. Although you are eligible, you are not guaranteed to be assisted by this scheme.")}}</p>
</div>

<div class="govuk-notification-banner" role="region" aria-labelledby="govuk-notification-banner-title" data-module="govuk-notification-banner">
Expand All @@ -25,8 +25,11 @@ <h1 class="govuk-heading-l">{{_("Information based on your answers")}}</h1>
<p class="govuk-notification-banner__heading">

<h2 class="govuk-heading-m">{{eligible_schemes|join(", ")}}</h2>
<p class="govuk-body">{{_("You can create a referral to your home energy supplier, which will get in touch to arrange an assessment of your home. This will identify which insulation measures would be most suitable, to help you to keep your home warm and save you money on your energy bills. They will also advise where any additional help with the energy efficiency of your home is available.")}}</p>
<p class="govuk-body">{{_("Depending on the outcome of the assessment, you may be asked to make a financial contribution for an installation to go ahead. It would then be your decision whether you wish to proceed.")}}</p>
<p class="govuk-body">{{_("The Great British Insulation Scheme is delivered by energy suppliers. They will assess your home, either through a desktop assessment or by arranging a visit to your home. What the energy supplier can offer will depend on this assessment.")}}</p>
<p class="govuk-body">{{_("If you need to pay anything, you’ll find out after the assessment. You can decide not to go ahead if you do not agree with the assessment or costs.")}}</p>
<p class="govuk-body">{{_("The most common measures installed under this scheme are loft insulation or cavity wall insulation. These may require a financial contribution. Other insulation measures such as solid wall insulation may be available, but the energy supplier is only likely to offer them to you with a substantial financial contribution.")}}</p>
<p class="govuk-body">{{_("If you are comfortable with this then in the next step you can create a referral that will be sent to your chosen energy supplier.")}}</p>
<p class="govuk-body">{{_("By submitting a referral through this service your energy supplier will also check if you are eligible for additional help through the government’s ECO4 scheme. ECO4 is available for households on low incomes, receiving qualifying benefits, or who are vulnerable to the effects of living in a cold home.")}}</p>
</p>
</div>
</div>
Expand Down
6 changes: 3 additions & 3 deletions help_to_heat/templates/frontdoor/success.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ <h2 class="govuk-heading-m">{{_("What happens next?")}}</h2>

<p class="govuk-body">{{_("You do not need to create another referral at any point.")}}</p>

<p class="govuk-body">{{_("Once the energy supplier has confirmed they have received your referral, they will review this and determine whether your property is applicable for energy efficiency improvements. They may ask you for more information. You will be notified of the outcome of the review process.")}}</p>
<p class="govuk-body">{{_("Once the energy supplier has confirmed they have received your referral, they or their delivery partner will review this and determine whether your property could be suitable for energy efficiency improvements. They may ask you for more information. You will then be notified to tell you whether your referral will proceed to the next stage of assessment. If your referral is not progressed, they will let you know why. ")}}</p>

<p class="govuk-body">{{_("Properties that are applicable for home energy efficiency improvements must have a home survey completed. Your energy supplier will organise this with you.")}}</p>
<p class="govuk-body">{{_("As part of the assessment process, properties must have a home survey completed. Your energy supplier will organise this with you.")}}</p>

<h2 class="govuk-heading-m">{{_("Contacting the energy supplier about your referral after 10 working days")}}</h2>

<p class="govuk-body">{{_("You can ")}}<a href="https://www.ofgem.gov.uk/environmental-and-social-schemes/energy-company-obligation-eco/contacts-guidance-and-resources/eco-supplier-contact-details" target="_blank" rel="noopener noreferrer" class="govuk-link">{{_("find contact details for the energy supplier (opens in new tab)")}}</a>{{_(" if you need to contact them.")}}</p>

<p class="govuk-body">{{_("You do not need to contact the energy supplier unless it has been more than 10 working days since you submitted the referral and you have not yet received a confirmation email from them.")}}</p>
<p class="govuk-body">{{_("You do not need to contact the energy supplier unless it has been more than 10 working days since you submitted the referral and you have not yet received a confirmation email or a phone call from them.")}}</p>

<h2 class="govuk-heading-m">{{_("Access more household energy support")}}</h2>
<p class="govuk-body">{{_("You can:")}}</p>
Expand Down
4 changes: 3 additions & 1 deletion help_to_heat/templates/frontdoor/supplier.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ <h1 class="govuk-fieldset__heading">
</h1>
</legend>

<p class="govuk-body">{{_("If your home energy supplier is not listed, you can select any energy supplier from the list")}}.</p>
<p class="govuk-body">{{_("If your energy supplier contacts you saying they are unable to fulfill the requirements for your home, you can create another referral to a different energy supplier.")}}</p>

<p class="govuk-body">{{_("If your home energy supplier is not listed, you can select any energy supplier from the list.")}}</p>

<p class="govuk-body">{{_("If you live in a park home and buy your energy from the site, select the energy supplier who supplies the site.")}}</p>

Expand Down
4 changes: 2 additions & 2 deletions tests/test_frontdoor.py
Original file line number Diff line number Diff line change
Expand Up @@ -155,9 +155,9 @@ def _answer_house_questions(page, session_id, benefits_answer, epc_rating="D", s
assert page.has_one("h1:contains('Is there access to your loft?')")
page = _check_page(page, "loft-access", "loft_access", "Yes, there is access to my loft")

assert page.has_one("h1:contains('Is your loft fully insulated?')")
assert page.has_one("h1:contains('How much loft insulation do you have?')")
page = _check_page(
page, "loft-insulation", "loft_insulation", "No, there is less than 270mm of insulation in my loft"
page, "loft-insulation", "loft_insulation", "I have up to 100 mm of loft insulation"
)

assert page.has_one("h1:contains('Check your answers')")
Expand Down
Loading