From 5c1e7aeb80e8862c1c7ed4722b9568925a4209b8 Mon Sep 17 00:00:00 2001 From: Samuel Young Date: Wed, 6 Nov 2024 12:24:18 +0000 Subject: [PATCH 01/16] PC-1116: fix country check on address page --- help_to_heat/frontdoor/views.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/help_to_heat/frontdoor/views.py b/help_to_heat/frontdoor/views.py index 792d5b05..40df18e2 100644 --- a/help_to_heat/frontdoor/views.py +++ b/help_to_heat/frontdoor/views.py @@ -485,6 +485,9 @@ def build_extra_context(self, request, session_id, page_name, data, is_change_pa Build any additional data to be added to the context. This will be available to use in the template html file. + + data will be the user submitted data for this page. + if you need access to other page's answers, call interface.api.session.get_session(session_id) """ return {} @@ -496,7 +499,8 @@ def save_get_data(self, data, session_id, page_name): For instance, saving tracking data when a user loads the page - data will be the user submitted data for this page + data will be the user submitted data for this page. + if you need access to other page's answers, call interface.api.session.get_session(session_id) """ return data @@ -506,7 +510,8 @@ def save_post_data(self, data, session_id, page_name): For instance, checking and storing whether the UPRN is duplicate - data will be the user submitted data for this page + data will be the user submitted data for this page. + if you need access to other page's answers, call interface.api.session.get_session(session_id) The returned data object will be used to decide which page to send to """ @@ -603,7 +608,8 @@ def build_extra_context(self, request, session_id, page_name, data, is_change_pa def save_post_data(self, data, session_id, page_name): reset_epc_details(session_id) - country = data.get(country_field) + session_data = interface.api.session.get_session(session_id) + country = session_data.get(country_field) building_name_or_number = data.get(address_building_name_or_number_field) postcode = data.get(address_postcode_field) try: From ac98316d75943c3946e89b91b2992556937469ae Mon Sep 17 00:00:00 2001 From: Samuel Young Date: Wed, 6 Nov 2024 14:32:34 +0000 Subject: [PATCH 02/16] PC-1347: add a routing exception for success page --- help_to_heat/frontdoor/schemas.py | 7 +++++++ help_to_heat/frontdoor/views.py | 11 ++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/help_to_heat/frontdoor/schemas.py b/help_to_heat/frontdoor/schemas.py index 6ac29cb6..63dcd3f2 100644 --- a/help_to_heat/frontdoor/schemas.py +++ b/help_to_heat/frontdoor/schemas.py @@ -105,6 +105,7 @@ schemes_page, shell_warning_page, shell_warning_page_field, + success_page, summary_page, supplier_field, supplier_field_british_gas, @@ -201,10 +202,16 @@ # which pages should ignore routing checks # the code will not check if the user's route allows them to see these pages # a prev page url should be provided to allow the back link to work +# or, if the page does not allow the user to go back, it may not be needed to calculate previous page +# this means the page can be seen without any routing checks being run +# if this is desired, set prev_page to the below constant +no_back_button_on_page = "no-back-button-on-page" + routing_overrides = { address_manual_page: {"prev_page": address_page}, epc_select_manual_page: {"prev_page": epc_select_page}, address_select_manual_page: {"prev_page": address_select_page}, + success_page: {"prev_page": no_back_button_on_page}, } # which change page to send back to diff --git a/help_to_heat/frontdoor/views.py b/help_to_heat/frontdoor/views.py index 792d5b05..7df734af 100644 --- a/help_to_heat/frontdoor/views.py +++ b/help_to_heat/frontdoor/views.py @@ -146,6 +146,7 @@ from .routing import CouldNotCalculateJourneyException, calculate_journey from .routing.backwards_routing import get_prev_page from .routing.forwards_routing import get_next_page +from .schemas import no_back_button_on_page from .session_handlers.duplicate_referral_checker import ( DuplicateReferralChecker, ) @@ -556,7 +557,15 @@ def _get_prev_page_url(self, request, session_id, page_name, is_change_page): ) if page_name in schemas.routing_overrides: - return page_name_to_url(session_id, schemas.routing_overrides[page_name]["prev_page"]) + prev_page = schemas.routing_overrides[page_name]["prev_page"] + + # the page is assumed to not have a back button so this should not be shown to the user + # in case it ever does, provide a fallback so the user does not get into an invalid state + # in this case, leave them on the page they are currently on + if prev_page == no_back_button_on_page: + return page_name_to_url(session_id, page_name) + + return page_name_to_url(session_id, prev_page) return page_name_to_url(session_id, get_prev_page(page_name, answers)) From 1f3f401434d5d56fad67dd410370bde9ac31c612 Mon Sep 17 00:00:00 2001 From: Samuel Young Date: Wed, 6 Nov 2024 14:32:55 +0000 Subject: [PATCH 03/16] PC-1347: extract translations --- help_to_heat/locale/cy/LC_MESSAGES/django.po | 312 +++++++++---------- 1 file changed, 156 insertions(+), 156 deletions(-) diff --git a/help_to_heat/locale/cy/LC_MESSAGES/django.po b/help_to_heat/locale/cy/LC_MESSAGES/django.po index d6415b72..9bdf15c2 100644 --- a/help_to_heat/locale/cy/LC_MESSAGES/django.po +++ b/help_to_heat/locale/cy/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-10-31 09:47+0000\n" +"POT-Creation-Date: 2024-11-07 16:40+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -19,126 +19,126 @@ msgstr "" "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != " "11) ? 2 : 3;\n" -#: help_to_heat/frontdoor/schemas.py:141 +#: help_to_heat/frontdoor/schemas.py:142 msgid "Country of property" msgstr "Gwlad yr eiddo" -#: help_to_heat/frontdoor/schemas.py:142 help_to_heat/frontdoor/schemas.py:164 +#: help_to_heat/frontdoor/schemas.py:143 help_to_heat/frontdoor/schemas.py:165 msgid "Energy supplier" msgstr "Cyflenwr ynni" -#: help_to_heat/frontdoor/schemas.py:143 +#: help_to_heat/frontdoor/schemas.py:144 msgctxt "summary page" msgid "Do you own the property?" msgstr "Ydy'r eiddo yn perthyn i chi?" -#: help_to_heat/frontdoor/schemas.py:144 +#: help_to_heat/frontdoor/schemas.py:145 #: help_to_heat/templates/frontdoor/park-home.html:14 msgid "Do you live in a park home?" msgstr "Ydych chi'n byw mewn aelwyd mewn parc?" -#: help_to_heat/frontdoor/schemas.py:145 +#: help_to_heat/frontdoor/schemas.py:146 #: help_to_heat/templates/frontdoor/park-home-main-residence.html:14 msgid "Is the park home your main residence?" msgstr "Ai'r aelwyd mewn parc yw'ch prif breswylfa?" -#: help_to_heat/frontdoor/schemas.py:146 +#: help_to_heat/frontdoor/schemas.py:147 msgid "Property address" msgstr "Cyfeiriad yr eiddo" -#: help_to_heat/frontdoor/schemas.py:147 +#: help_to_heat/frontdoor/schemas.py:148 msgid "Council tax band" msgstr "Band treth gyngor" -#: help_to_heat/frontdoor/schemas.py:148 +#: help_to_heat/frontdoor/schemas.py:149 msgid "Energy Performance Certificate" msgstr "Dystysgrif Perfformiad Ynni" -#: help_to_heat/frontdoor/schemas.py:150 +#: help_to_heat/frontdoor/schemas.py:151 msgctxt "summary page" msgid "Is anyone in your household receiving any of the following benefits?" msgstr "" "Oes unrhyw un yn eich aelwyd chi'n cael unrhyw un o'r budd-daliadau canlynol?" -#: help_to_heat/frontdoor/schemas.py:152 +#: help_to_heat/frontdoor/schemas.py:153 msgid "Annual household income" msgstr "Incwm blynyddol yr aelwyd" -#: help_to_heat/frontdoor/schemas.py:153 help_to_heat/frontdoor/schemas.py:154 +#: help_to_heat/frontdoor/schemas.py:154 help_to_heat/frontdoor/schemas.py:155 #: help_to_heat/templates/frontdoor/epc.html:49 msgid "Property type" msgstr "Math o eiddo" -#: help_to_heat/frontdoor/schemas.py:155 +#: help_to_heat/frontdoor/schemas.py:156 msgid "Number of bedrooms" msgstr "Nifer yr ystafelloedd gwely" -#: help_to_heat/frontdoor/schemas.py:156 +#: help_to_heat/frontdoor/schemas.py:157 msgid "Property walls" msgstr "Waliau'r eiddo" -#: help_to_heat/frontdoor/schemas.py:157 +#: help_to_heat/frontdoor/schemas.py:158 msgctxt "summary page" msgid "Are your walls insulated?" msgstr "Ydy'ch waliau wedi'u hinswleiddio?" -#: help_to_heat/frontdoor/schemas.py:158 +#: help_to_heat/frontdoor/schemas.py:159 msgid "Does this property have a loft?" msgstr "Oes gan yr eiddo yma atig?" -#: help_to_heat/frontdoor/schemas.py:159 +#: help_to_heat/frontdoor/schemas.py:160 #: help_to_heat/templates/frontdoor/loft-access.html:14 msgid "Is there access to your loft?" msgstr "Oes modd mynd i'ch atig?" -#: help_to_heat/frontdoor/schemas.py:160 +#: help_to_heat/frontdoor/schemas.py:161 msgid "Is there 100mm of insulation in your loft?" msgstr "Oes 100mm o inswleiddiad yn eich atig?" -#: help_to_heat/frontdoor/schemas.py:165 +#: help_to_heat/frontdoor/schemas.py:166 #: help_to_heat/templates/frontdoor/contact-details.html:23 msgid "First name" msgstr "Enw cyntaf" -#: help_to_heat/frontdoor/schemas.py:166 +#: help_to_heat/frontdoor/schemas.py:167 #: help_to_heat/templates/frontdoor/contact-details.html:26 msgid "Last name" msgstr "Enw olaf" -#: help_to_heat/frontdoor/schemas.py:167 +#: help_to_heat/frontdoor/schemas.py:168 #: help_to_heat/templates/frontdoor/contact-details.html:39 msgid "Contact number" msgstr "Rhif ffôn" -#: help_to_heat/frontdoor/schemas.py:168 +#: help_to_heat/frontdoor/schemas.py:169 msgid "Email" msgstr "Ebost" -#: help_to_heat/frontdoor/schemas.py:271 help_to_heat/frontdoor/schemas.py:418 +#: help_to_heat/frontdoor/schemas.py:278 help_to_heat/frontdoor/schemas.py:425 msgid "England" msgstr "Lloegr" -#: help_to_heat/frontdoor/schemas.py:275 help_to_heat/frontdoor/schemas.py:419 +#: help_to_heat/frontdoor/schemas.py:282 help_to_heat/frontdoor/schemas.py:426 msgid "Scotland" msgstr "Yr Alban" -#: help_to_heat/frontdoor/schemas.py:279 help_to_heat/frontdoor/schemas.py:420 +#: help_to_heat/frontdoor/schemas.py:286 help_to_heat/frontdoor/schemas.py:427 msgid "Wales" msgstr "Cymru" -#: help_to_heat/frontdoor/schemas.py:283 +#: help_to_heat/frontdoor/schemas.py:290 msgid "Northern Ireland" msgstr "Gogledd Iwerddon" -#: help_to_heat/frontdoor/schemas.py:290 help_to_heat/frontdoor/schemas.py:423 +#: help_to_heat/frontdoor/schemas.py:297 help_to_heat/frontdoor/schemas.py:430 msgid "Yes, I own my property and live in it" msgstr "Ydy, mae'r eiddo'n perthyn i mi a dwi'n byw ynddo" -#: help_to_heat/frontdoor/schemas.py:294 help_to_heat/frontdoor/schemas.py:424 +#: help_to_heat/frontdoor/schemas.py:301 help_to_heat/frontdoor/schemas.py:431 msgid "No, I am a tenant" msgstr "Nac ydy. Tenant ydw i" -#: help_to_heat/frontdoor/schemas.py:296 help_to_heat/frontdoor/schemas.py:304 +#: help_to_heat/frontdoor/schemas.py:303 help_to_heat/frontdoor/schemas.py:311 msgid "" "If you are eligible for a referral through this service, your energy " "supplier will need to check that you have your landlord’s " @@ -148,207 +148,207 @@ msgstr "" "i'ch cyflenwr ynni wirio bod gennych chi ganiatâd eich landlord i osod " "unrhyw fesurau arbed ynni yn yr eiddo." -#: help_to_heat/frontdoor/schemas.py:302 help_to_heat/frontdoor/schemas.py:425 +#: help_to_heat/frontdoor/schemas.py:309 help_to_heat/frontdoor/schemas.py:432 msgid "No, I am a social housing tenant" msgstr "Nac ydy. Dwi'n denant tai cymdeithasol" -#: help_to_heat/frontdoor/schemas.py:310 help_to_heat/frontdoor/schemas.py:426 +#: help_to_heat/frontdoor/schemas.py:317 help_to_heat/frontdoor/schemas.py:433 msgid "" "Yes, I am the property owner but I lease the property to one or more tenants" msgstr "" "Ydy, mae'r eiddo'n perthyn i mi ond dwi'n gosod yr eiddo i un neu ragor o " "denantiaid" -#: help_to_heat/frontdoor/schemas.py:316 +#: help_to_heat/frontdoor/schemas.py:323 msgctxt "park home question option" msgid "Yes" msgstr "Ydw" -#: help_to_heat/frontdoor/schemas.py:320 +#: help_to_heat/frontdoor/schemas.py:327 msgctxt "park home question option" msgid "No" msgstr "Nad ydw" -#: help_to_heat/frontdoor/schemas.py:326 help_to_heat/frontdoor/schemas.py:336 +#: help_to_heat/frontdoor/schemas.py:333 help_to_heat/frontdoor/schemas.py:343 msgid "Yes" msgstr "Ie" -#: help_to_heat/frontdoor/schemas.py:330 help_to_heat/frontdoor/schemas.py:340 +#: help_to_heat/frontdoor/schemas.py:337 help_to_heat/frontdoor/schemas.py:347 msgid "No" msgstr "Nage" -#: help_to_heat/frontdoor/schemas.py:344 help_to_heat/frontdoor/schemas.py:462 -#: help_to_heat/frontdoor/schemas.py:468 help_to_heat/frontdoor/schemas.py:482 -#: help_to_heat/frontdoor/schemas.py:594 help_to_heat/frontdoor/schemas.py:612 -#: help_to_heat/frontdoor/schemas.py:704 +#: help_to_heat/frontdoor/schemas.py:351 help_to_heat/frontdoor/schemas.py:469 +#: help_to_heat/frontdoor/schemas.py:475 help_to_heat/frontdoor/schemas.py:489 +#: help_to_heat/frontdoor/schemas.py:601 help_to_heat/frontdoor/schemas.py:619 +#: help_to_heat/frontdoor/schemas.py:711 msgid "I do not know" msgstr "Wn i ddim" -#: help_to_heat/frontdoor/schemas.py:349 +#: help_to_heat/frontdoor/schemas.py:356 msgid "Not found" msgstr "Heb ei ganfod" -#: help_to_heat/frontdoor/schemas.py:378 help_to_heat/frontdoor/schemas.py:429 +#: help_to_heat/frontdoor/schemas.py:385 help_to_heat/frontdoor/schemas.py:436 msgctxt "yes no question option" msgid "Yes" msgstr "Oes" -#: help_to_heat/frontdoor/schemas.py:382 help_to_heat/frontdoor/schemas.py:430 +#: help_to_heat/frontdoor/schemas.py:389 help_to_heat/frontdoor/schemas.py:437 msgctxt "yes no question option" msgid "No" msgstr "Nac oes" -#: help_to_heat/frontdoor/schemas.py:388 help_to_heat/frontdoor/schemas.py:433 +#: help_to_heat/frontdoor/schemas.py:395 help_to_heat/frontdoor/schemas.py:440 msgid "Less than £31,000 a year" msgstr "Llai na £31,000 y flwyddyn" -#: help_to_heat/frontdoor/schemas.py:392 help_to_heat/frontdoor/schemas.py:434 +#: help_to_heat/frontdoor/schemas.py:399 help_to_heat/frontdoor/schemas.py:441 msgid "£31,000 or more a year" msgstr "£31,000 y flwyddyn neu ragor" -#: help_to_heat/frontdoor/schemas.py:398 help_to_heat/frontdoor/schemas.py:437 -#: help_to_heat/frontdoor/views.py:262 +#: help_to_heat/frontdoor/schemas.py:405 help_to_heat/frontdoor/schemas.py:444 +#: help_to_heat/frontdoor/views.py:263 msgid "House" msgstr "Tŷ" -#: help_to_heat/frontdoor/schemas.py:402 help_to_heat/frontdoor/schemas.py:438 -#: help_to_heat/frontdoor/views.py:261 +#: help_to_heat/frontdoor/schemas.py:409 help_to_heat/frontdoor/schemas.py:445 +#: help_to_heat/frontdoor/views.py:262 msgid "Bungalow" msgstr "Byngalo" -#: help_to_heat/frontdoor/schemas.py:406 help_to_heat/frontdoor/schemas.py:439 +#: help_to_heat/frontdoor/schemas.py:413 help_to_heat/frontdoor/schemas.py:446 msgid "Apartment, flat or maisonette" msgstr "Rhandy, fflat neu fflat ddeulawr" -#: help_to_heat/frontdoor/schemas.py:411 +#: help_to_heat/frontdoor/schemas.py:418 msgid "house" msgstr "dŷ" -#: help_to_heat/frontdoor/schemas.py:412 +#: help_to_heat/frontdoor/schemas.py:419 msgid "bungalow" msgstr "fyngalo" -#: help_to_heat/frontdoor/schemas.py:413 +#: help_to_heat/frontdoor/schemas.py:420 msgid "apartment, flat or maisonette" msgstr "randy, fflat neu fflat ddeulawr" -#: help_to_heat/frontdoor/schemas.py:440 help_to_heat/frontdoor/views.py:264 +#: help_to_heat/frontdoor/schemas.py:447 help_to_heat/frontdoor/views.py:265 msgid "Park home" msgstr "Cartref mewn parc" -#: help_to_heat/frontdoor/schemas.py:443 help_to_heat/frontdoor/schemas.py:510 -#: help_to_heat/frontdoor/schemas.py:532 +#: help_to_heat/frontdoor/schemas.py:450 help_to_heat/frontdoor/schemas.py:517 +#: help_to_heat/frontdoor/schemas.py:539 msgid "Detached" msgstr "Tŷ sengl" -#: help_to_heat/frontdoor/schemas.py:444 help_to_heat/frontdoor/schemas.py:515 -#: help_to_heat/frontdoor/schemas.py:537 +#: help_to_heat/frontdoor/schemas.py:451 help_to_heat/frontdoor/schemas.py:522 +#: help_to_heat/frontdoor/schemas.py:544 msgid "Semi-detached" msgstr "Tŷ pâr" -#: help_to_heat/frontdoor/schemas.py:445 help_to_heat/frontdoor/schemas.py:520 -#: help_to_heat/frontdoor/schemas.py:542 +#: help_to_heat/frontdoor/schemas.py:452 help_to_heat/frontdoor/schemas.py:527 +#: help_to_heat/frontdoor/schemas.py:549 msgid "Terraced" msgstr "Tŷ teras" -#: help_to_heat/frontdoor/schemas.py:446 help_to_heat/frontdoor/schemas.py:525 -#: help_to_heat/frontdoor/schemas.py:547 +#: help_to_heat/frontdoor/schemas.py:453 help_to_heat/frontdoor/schemas.py:532 +#: help_to_heat/frontdoor/schemas.py:554 msgid "End terrace" msgstr "Tŷ pen teras" -#: help_to_heat/frontdoor/schemas.py:447 help_to_heat/frontdoor/schemas.py:491 +#: help_to_heat/frontdoor/schemas.py:454 help_to_heat/frontdoor/schemas.py:498 msgid "Top floor" msgstr "Llawr uchaf" -#: help_to_heat/frontdoor/schemas.py:448 help_to_heat/frontdoor/schemas.py:496 +#: help_to_heat/frontdoor/schemas.py:455 help_to_heat/frontdoor/schemas.py:503 msgid "Middle floor" msgstr "Llawr canol" -#: help_to_heat/frontdoor/schemas.py:449 help_to_heat/frontdoor/schemas.py:501 +#: help_to_heat/frontdoor/schemas.py:456 help_to_heat/frontdoor/schemas.py:508 msgid "Ground floor" msgstr "Llawr daear" -#: help_to_heat/frontdoor/schemas.py:452 help_to_heat/frontdoor/schemas.py:555 +#: help_to_heat/frontdoor/schemas.py:459 help_to_heat/frontdoor/schemas.py:562 msgid "Studio" msgstr "Stiwdio" -#: help_to_heat/frontdoor/schemas.py:453 help_to_heat/frontdoor/schemas.py:559 +#: help_to_heat/frontdoor/schemas.py:460 help_to_heat/frontdoor/schemas.py:566 msgid "One bedroom" msgstr "Un ystafell wely" -#: help_to_heat/frontdoor/schemas.py:454 help_to_heat/frontdoor/schemas.py:563 +#: help_to_heat/frontdoor/schemas.py:461 help_to_heat/frontdoor/schemas.py:570 msgid "Two bedrooms" msgstr "Dwy ystafell wely" -#: help_to_heat/frontdoor/schemas.py:455 help_to_heat/frontdoor/schemas.py:567 +#: help_to_heat/frontdoor/schemas.py:462 help_to_heat/frontdoor/schemas.py:574 msgid "Three or more bedrooms" msgstr "Tair neu fwy o ystafelloedd gwely" -#: help_to_heat/frontdoor/schemas.py:458 help_to_heat/frontdoor/schemas.py:574 +#: help_to_heat/frontdoor/schemas.py:465 help_to_heat/frontdoor/schemas.py:581 msgid "Solid walls" msgstr "Waliau solet" -#: help_to_heat/frontdoor/schemas.py:459 help_to_heat/frontdoor/schemas.py:578 +#: help_to_heat/frontdoor/schemas.py:466 help_to_heat/frontdoor/schemas.py:585 msgid "Cavity walls" msgstr "Waliau ceudod" -#: help_to_heat/frontdoor/schemas.py:460 help_to_heat/frontdoor/schemas.py:582 +#: help_to_heat/frontdoor/schemas.py:467 help_to_heat/frontdoor/schemas.py:589 msgid "Mix of solid and cavity walls" msgstr "Cymysgedd o waliau solet a waliau ceudod" -#: help_to_heat/frontdoor/schemas.py:461 help_to_heat/frontdoor/schemas.py:586 +#: help_to_heat/frontdoor/schemas.py:468 help_to_heat/frontdoor/schemas.py:593 msgid "I do not see my option listed" msgstr "Dwi ddim yn gweld bod fy opsiwn i wedi'i restru" -#: help_to_heat/frontdoor/schemas.py:465 help_to_heat/frontdoor/schemas.py:600 +#: help_to_heat/frontdoor/schemas.py:472 help_to_heat/frontdoor/schemas.py:607 msgid "Yes they are all insulated" msgstr "Ydyn, maen nhw i gyd wedi'u hinswleiddio" -#: help_to_heat/frontdoor/schemas.py:466 help_to_heat/frontdoor/schemas.py:604 +#: help_to_heat/frontdoor/schemas.py:473 help_to_heat/frontdoor/schemas.py:611 msgid "Some are insulated, some are not" msgstr "Mae rhai wedi'u eu hinswleiddio, mae rhai heb" -#: help_to_heat/frontdoor/schemas.py:467 help_to_heat/frontdoor/schemas.py:608 +#: help_to_heat/frontdoor/schemas.py:474 help_to_heat/frontdoor/schemas.py:615 msgid "No they are not insulated" msgstr "Na, dydyn nhw ddim wedi'u hinswleiddio" -#: help_to_heat/frontdoor/schemas.py:471 help_to_heat/frontdoor/schemas.py:618 +#: help_to_heat/frontdoor/schemas.py:478 help_to_heat/frontdoor/schemas.py:625 msgid "Yes, I have a loft that has not been converted into a room" msgstr "Oes, mae gen i atig sydd heb ei droi'n ystafell" -#: help_to_heat/frontdoor/schemas.py:472 help_to_heat/frontdoor/schemas.py:622 +#: help_to_heat/frontdoor/schemas.py:479 help_to_heat/frontdoor/schemas.py:629 msgid "No, I do not have a loft or my loft has been converted into a room" msgstr "Nac oes, does gen i ddim atig neu mae fy atig i wedi'i droi'n ystafell" -#: help_to_heat/frontdoor/schemas.py:475 help_to_heat/frontdoor/schemas.py:628 +#: help_to_heat/frontdoor/schemas.py:482 help_to_heat/frontdoor/schemas.py:635 msgid "Yes, there is access to my loft" msgstr "Oes, mae modd mynd i'r atig" -#: help_to_heat/frontdoor/schemas.py:476 help_to_heat/frontdoor/schemas.py:632 +#: help_to_heat/frontdoor/schemas.py:483 help_to_heat/frontdoor/schemas.py:639 msgid "No, there is no access to my loft" msgstr "Nac oes, does dim modd mynd i'r atig" -#: help_to_heat/frontdoor/schemas.py:477 help_to_heat/frontdoor/schemas.py:483 +#: help_to_heat/frontdoor/schemas.py:484 help_to_heat/frontdoor/schemas.py:490 msgid "No loft" msgstr "Dim atig" -#: help_to_heat/frontdoor/schemas.py:480 help_to_heat/frontdoor/schemas.py:696 +#: help_to_heat/frontdoor/schemas.py:487 help_to_heat/frontdoor/schemas.py:703 msgid "I have more than 100mm of loft insulation" msgstr "Mae gen i fwy na 100mm o inswleiddiad atig" -#: help_to_heat/frontdoor/schemas.py:481 help_to_heat/frontdoor/schemas.py:700 +#: help_to_heat/frontdoor/schemas.py:488 help_to_heat/frontdoor/schemas.py:707 msgid "I have up to 100mm of loft insulation" msgstr "Mae gen i hyd at 100mm o inswleiddiad atig" -#: help_to_heat/frontdoor/schemas.py:492 +#: help_to_heat/frontdoor/schemas.py:499 msgid "Sits directly below the roof with no other flat above it" msgstr "Yn gorwedd yn union o dan y to heb unrhyw fflat arall uwch ei phen" -#: help_to_heat/frontdoor/schemas.py:497 +#: help_to_heat/frontdoor/schemas.py:504 msgid "Has another flat above, and another below" msgstr "Mae fflat arall uwchben, ac un arall odani" -#: help_to_heat/frontdoor/schemas.py:503 +#: help_to_heat/frontdoor/schemas.py:510 msgid "" "The lowest flat in the building with no flat beneath - typically at street " "level but may be a basement" @@ -356,24 +356,24 @@ msgstr "" "Y fflat isaf yn yr adeilad heb fflat odani - fel arfer ar lefel y stryd ond " "gall fod yn islawr" -#: help_to_heat/frontdoor/schemas.py:511 help_to_heat/frontdoor/schemas.py:533 +#: help_to_heat/frontdoor/schemas.py:518 help_to_heat/frontdoor/schemas.py:540 msgid "Does not share any of its walls with another house or building" msgstr "Nid yw'n rhannu unrhyw un o'i waliau â thŷ neu adeilad arall" -#: help_to_heat/frontdoor/schemas.py:516 help_to_heat/frontdoor/schemas.py:538 +#: help_to_heat/frontdoor/schemas.py:523 help_to_heat/frontdoor/schemas.py:545 msgid "Is attached to one other house or building" msgstr "Mae wedi'i gysylltu ag un tŷ neu adeilad arall" -#: help_to_heat/frontdoor/schemas.py:521 help_to_heat/frontdoor/schemas.py:543 +#: help_to_heat/frontdoor/schemas.py:528 help_to_heat/frontdoor/schemas.py:550 msgid "Sits in the middle with a house or building on each side" msgstr "Yn sefyll yn y canol gyda thŷ neu adeilad o boptu iddo" -#: help_to_heat/frontdoor/schemas.py:526 help_to_heat/frontdoor/schemas.py:548 +#: help_to_heat/frontdoor/schemas.py:533 help_to_heat/frontdoor/schemas.py:555 msgid "" "Sits at the end of a row of similar houses with one house attached to it" msgstr "Yn sefyll ar ben rhes o dai tebyg gydag un tŷ ynghlwm wrtho" -#: help_to_heat/frontdoor/schemas.py:588 +#: help_to_heat/frontdoor/schemas.py:595 msgid "" "Other wall types could include cob walls, timber framed, system built, steel " "framed or other non-traditional build types" @@ -381,173 +381,173 @@ msgstr "" "Gallai mathau eraill o waliau gynnwys waliau cob, waliau ffrâm pren, " "adeiladu system, fframiau dur neu fathau eraill o adeiladau anhraddodiadol" -#: help_to_heat/frontdoor/schemas.py:649 +#: help_to_heat/frontdoor/schemas.py:656 msgid "Bulb, now part of Octopus Energy" msgstr "Bulb, sydd bellach yn rhan o Octopus" -#: help_to_heat/frontdoor/schemas.py:715 +#: help_to_heat/frontdoor/schemas.py:722 msgid "Completely agree" msgstr "Cytuno'n llwyr" -#: help_to_heat/frontdoor/schemas.py:719 +#: help_to_heat/frontdoor/schemas.py:726 msgid "Agree" msgstr "Cytuno" -#: help_to_heat/frontdoor/schemas.py:723 +#: help_to_heat/frontdoor/schemas.py:730 msgid "Neutral" msgstr "Niwtral" -#: help_to_heat/frontdoor/schemas.py:727 +#: help_to_heat/frontdoor/schemas.py:734 msgid "Disagree" msgstr "Anghytuno" -#: help_to_heat/frontdoor/schemas.py:731 +#: help_to_heat/frontdoor/schemas.py:738 msgid "Completely disagree" msgstr "Anghytuno'n llwyr" -#: help_to_heat/frontdoor/schemas.py:738 +#: help_to_heat/frontdoor/schemas.py:745 msgid "Very satisfied" msgstr "Bodlon iawn" -#: help_to_heat/frontdoor/schemas.py:742 +#: help_to_heat/frontdoor/schemas.py:749 msgid "Somewhat satisfied" msgstr "Eithaf bodlon" -#: help_to_heat/frontdoor/schemas.py:746 +#: help_to_heat/frontdoor/schemas.py:753 msgid "Neither satisfied nor dissatisfied" msgstr "Ddim yn fodlon nac yn anfodlon" -#: help_to_heat/frontdoor/schemas.py:750 +#: help_to_heat/frontdoor/schemas.py:757 msgid "Somewhat dissatisfied" msgstr "Eithaf anfodlon" -#: help_to_heat/frontdoor/schemas.py:754 +#: help_to_heat/frontdoor/schemas.py:761 msgid "Very dissatisfied" msgstr "Anfodlon iawn" -#: help_to_heat/frontdoor/schemas.py:761 +#: help_to_heat/frontdoor/schemas.py:768 msgid "To find ways to reduce my energy bills" msgstr "Dod o hyd i ffyrdd i leihau fy miliau ynni" -#: help_to_heat/frontdoor/schemas.py:765 +#: help_to_heat/frontdoor/schemas.py:772 msgid "To find ways to reduce my carbon emissions" msgstr "Dod o hyd i ffyrdd i leihau fy allyriadau carbon" -#: help_to_heat/frontdoor/schemas.py:769 +#: help_to_heat/frontdoor/schemas.py:776 msgid "To find ways to install a specific measure in my home" msgstr "Dod o hyd i ffyrdd o osod mesur penodol yn fy nghartref" -#: help_to_heat/frontdoor/schemas.py:773 +#: help_to_heat/frontdoor/schemas.py:780 msgid "To find ways to improve my EPC rating" msgstr "Dod o hyd i ffyrdd i wella fy sgôr EPC" -#: help_to_heat/frontdoor/schemas.py:777 +#: help_to_heat/frontdoor/schemas.py:784 msgid "To find ways to make my home more comfortable" msgstr "Dod o hyd i ffyrdd i wneud fy nghartref yn fwy cyffyrddus" -#: help_to_heat/frontdoor/schemas.py:781 +#: help_to_heat/frontdoor/schemas.py:788 msgid "Other" msgstr "Arall" -#: help_to_heat/frontdoor/schemas.py:869 +#: help_to_heat/frontdoor/schemas.py:876 msgid "Enter a valid UK postcode" msgstr "Rhowch god post dilys yn y Deyrnas Unedig" -#: help_to_heat/frontdoor/schemas.py:874 +#: help_to_heat/frontdoor/schemas.py:881 msgid "Invalid email format" msgstr "Fformat ebost annilys" -#: help_to_heat/frontdoor/schemas.py:884 help_to_heat/frontdoor/schemas.py:888 +#: help_to_heat/frontdoor/schemas.py:891 help_to_heat/frontdoor/schemas.py:895 msgid "" "Enter a telephone number, like 01632 960 001, 07700 900 982 or +44 808 157 " "0192" msgstr "Rhowch rif ffôn, fel 01632 960 001, 07700 900 982 neu +44 808 157 0192" -#: help_to_heat/frontdoor/schemas.py:900 +#: help_to_heat/frontdoor/schemas.py:907 msgid "Energy Company Obligation 4" msgstr "Rhwymedigaeth Cwmni Ynni 4" -#: help_to_heat/frontdoor/schemas.py:901 +#: help_to_heat/frontdoor/schemas.py:908 msgid "Great British Insulation Scheme" msgstr "Cynllun Inswleiddio Mawr Prydain" -#: help_to_heat/frontdoor/views.py:201 +#: help_to_heat/frontdoor/views.py:202 msgid "Select where the property is located" msgstr "Dewiswch beth yw lleoliad yr eiddo" -#: help_to_heat/frontdoor/views.py:202 +#: help_to_heat/frontdoor/views.py:203 msgid "Select if you own the property" msgstr "Dewiswch os yw'r eiddo'n perthyn i chi" -#: help_to_heat/frontdoor/views.py:203 +#: help_to_heat/frontdoor/views.py:204 msgid "Select if you live in a park home" msgstr "Dewiswch os ydych chi’n byw mewn aelwyd mewn parc " -#: help_to_heat/frontdoor/views.py:204 +#: help_to_heat/frontdoor/views.py:205 msgid "Select if the park home is your main residence" msgstr "Dewiswch os eich aelwyd mewn parc yw’ch prif breswylfa " -#: help_to_heat/frontdoor/views.py:205 +#: help_to_heat/frontdoor/views.py:206 msgid "Enter building name or number" msgstr "Rhowch enw neu rif yr adeilad" -#: help_to_heat/frontdoor/views.py:206 +#: help_to_heat/frontdoor/views.py:207 msgid "Enter Address line 1" msgstr "Rhowch linell 1 y cyfeiriad" -#: help_to_heat/frontdoor/views.py:207 +#: help_to_heat/frontdoor/views.py:208 msgid "Enter a postcode" msgstr "Rhowch god post" -#: help_to_heat/frontdoor/views.py:208 help_to_heat/frontdoor/views.py:209 +#: help_to_heat/frontdoor/views.py:209 help_to_heat/frontdoor/views.py:210 msgid "" "Select your address, or I can't find my address if your address is not listed" msgstr "" "Dewiswch eich cyfeiriad, neu ‘Dwi’n methu gweld fy nghyfeiriad i’ os nad " "yw'ch cyfeiriad wedi'i restru" -#: help_to_heat/frontdoor/views.py:210 +#: help_to_heat/frontdoor/views.py:211 msgid "Enter your Town or city" msgstr "Rhowch eich tref neu'ch dinas" -#: help_to_heat/frontdoor/views.py:211 +#: help_to_heat/frontdoor/views.py:212 msgid "Please confirm that you want to submit another referral" msgstr "A wnewch chi gadarnhau eich bod eisiau cyflwyno atgyfeiriad arall" -#: help_to_heat/frontdoor/views.py:212 +#: help_to_heat/frontdoor/views.py:213 msgid "Enter the Council Tax Band of the property" msgstr "Rhowch Fand Treth Gyngor yr eiddo" -#: help_to_heat/frontdoor/views.py:213 +#: help_to_heat/frontdoor/views.py:214 msgid "Select if your EPC rating is correct or not, or that you do not know" msgstr "" "Dewiswch a yw eich cyfraddiad EPC yn gywir neu beidio, neu nad ydych chi'n " "gwybod" -#: help_to_heat/frontdoor/views.py:214 +#: help_to_heat/frontdoor/views.py:215 msgid "" "Select if anyone in your household is receiving any benefits listed below" msgstr "" "Dewiswch a oes unrhyw un yn eich aelwyd chi'n cael unrhyw un neu ragor o'r " "budd-daliadau isod" -#: help_to_heat/frontdoor/views.py:215 +#: help_to_heat/frontdoor/views.py:216 msgid "Select your household income" msgstr "Dewiswch incwm eich aelwyd" -#: help_to_heat/frontdoor/views.py:216 help_to_heat/frontdoor/views.py:217 +#: help_to_heat/frontdoor/views.py:217 help_to_heat/frontdoor/views.py:218 msgid "Select your property type" msgstr "Dewiswch eich math o eiddo" -#: help_to_heat/frontdoor/views.py:218 +#: help_to_heat/frontdoor/views.py:219 msgid "Select the number of bedrooms the property has" msgstr "Dewiswch nifer yr ystafelloedd gwely sydd gan yr eiddo" -#: help_to_heat/frontdoor/views.py:219 +#: help_to_heat/frontdoor/views.py:220 msgid "Select the type of walls the property has" msgstr "Dewiswch y math o waliau sydd gan yr eiddo" -#: help_to_heat/frontdoor/views.py:220 +#: help_to_heat/frontdoor/views.py:221 msgid "" "Select if the walls of the property are insulated or not, or if you do not " "know" @@ -555,40 +555,40 @@ msgstr "" "Dewiswch a ydy waliau'r eiddo wedi'u hinswleiddio neu beidio, neu nad ydych " "chi'n gwybod" -#: help_to_heat/frontdoor/views.py:221 +#: help_to_heat/frontdoor/views.py:222 msgid "Select if you have a loft that has been converted into a room or not" msgstr "Dewiswch a oes gennych chi atig sydd wedi'i droi'n ystafell neu beidio" -#: help_to_heat/frontdoor/views.py:222 +#: help_to_heat/frontdoor/views.py:223 msgid "Select whether or not you have access to the loft" msgstr "Dewiswch a oes modd mynd i'r atig neu beidio" -#: help_to_heat/frontdoor/views.py:223 +#: help_to_heat/frontdoor/views.py:224 msgid "Select whether or not your loft is fully insulated" msgstr "Dewiswch a ydy'ch atig wedi'i inswleiddio'n llawn neu beidio" -#: help_to_heat/frontdoor/views.py:224 +#: help_to_heat/frontdoor/views.py:225 #: help_to_heat/templates/frontdoor/supplier.html:14 msgid "Select your home energy supplier from the list below" msgstr "Dewiswch eich cyflenwr ynni cartref chi o blith y rhestr isod" -#: help_to_heat/frontdoor/views.py:225 +#: help_to_heat/frontdoor/views.py:226 msgid "Enter your first name" msgstr "Rhowch eich enw cyntaf" -#: help_to_heat/frontdoor/views.py:226 +#: help_to_heat/frontdoor/views.py:227 msgid "Enter your last name" msgstr "Rhowch eich enw olaf" -#: help_to_heat/frontdoor/views.py:227 +#: help_to_heat/frontdoor/views.py:228 msgid "Enter your email address" msgstr "Rhowch eich cyfeiriad ebost" -#: help_to_heat/frontdoor/views.py:228 +#: help_to_heat/frontdoor/views.py:229 msgid "Enter your contact number" msgstr "Rhowch eich rhif ffôn" -#: help_to_heat/frontdoor/views.py:230 help_to_heat/frontdoor/views.py:233 +#: help_to_heat/frontdoor/views.py:231 help_to_heat/frontdoor/views.py:234 msgid "" "Please confirm that you agree to the use of your information by checking " "this box" @@ -596,7 +596,7 @@ msgstr "" "Rhowch gadarnhad eich bod yn cytuno i'ch gwybodaeth gael ei defnyddio drwy " "roi tic yn y blwch hwn" -#: help_to_heat/frontdoor/views.py:236 +#: help_to_heat/frontdoor/views.py:237 msgid "" "Please confirm that you understand your home must be sufficiently ventilated " "before any insulation is installed" @@ -604,7 +604,7 @@ msgstr "" "Rhowch gadarnhad eich bod yn deall bod rhaid bod i’ch cartref fod wedi’i " "awyru’n ddigonol cyn i unrhyw inswleiddiad gael ei osod" -#: help_to_heat/frontdoor/views.py:240 +#: help_to_heat/frontdoor/views.py:241 msgid "" "Please confirm that you understand you may be required to contribute towards " "the cost of installing insulation" @@ -612,63 +612,63 @@ msgstr "" "Rhowch gadarnhad eich bod yn deall y gall fod angen ichi gyfrannu at gost " "gosod inswleiddiad" -#: help_to_heat/frontdoor/views.py:245 +#: help_to_heat/frontdoor/views.py:246 msgid "January" msgstr "Ionawr" -#: help_to_heat/frontdoor/views.py:246 +#: help_to_heat/frontdoor/views.py:247 msgid "February" msgstr "Chwefror" -#: help_to_heat/frontdoor/views.py:247 +#: help_to_heat/frontdoor/views.py:248 msgid "March" msgstr "Mawrth" -#: help_to_heat/frontdoor/views.py:248 +#: help_to_heat/frontdoor/views.py:249 msgid "April" msgstr "Ebrill" -#: help_to_heat/frontdoor/views.py:249 +#: help_to_heat/frontdoor/views.py:250 msgid "May" msgstr "Mai" -#: help_to_heat/frontdoor/views.py:250 +#: help_to_heat/frontdoor/views.py:251 msgid "June" msgstr "Mehefin" -#: help_to_heat/frontdoor/views.py:251 +#: help_to_heat/frontdoor/views.py:252 msgid "July" msgstr "Gorffennaf" -#: help_to_heat/frontdoor/views.py:252 +#: help_to_heat/frontdoor/views.py:253 msgid "August" msgstr "Awst" -#: help_to_heat/frontdoor/views.py:253 +#: help_to_heat/frontdoor/views.py:254 msgid "September" msgstr "Medi" -#: help_to_heat/frontdoor/views.py:254 +#: help_to_heat/frontdoor/views.py:255 msgid "October" msgstr "Hydref" -#: help_to_heat/frontdoor/views.py:255 +#: help_to_heat/frontdoor/views.py:256 msgid "November" msgstr "Tachwedd" -#: help_to_heat/frontdoor/views.py:256 +#: help_to_heat/frontdoor/views.py:257 msgid "December" msgstr "Rhagfyr" -#: help_to_heat/frontdoor/views.py:260 +#: help_to_heat/frontdoor/views.py:261 msgid "Flat" msgstr "Fflat" -#: help_to_heat/frontdoor/views.py:263 +#: help_to_heat/frontdoor/views.py:264 msgid "Maisonette" msgstr "Fflat deulawr" -#: help_to_heat/frontdoor/views.py:646 help_to_heat/frontdoor/views.py:716 +#: help_to_heat/frontdoor/views.py:655 help_to_heat/frontdoor/views.py:725 msgid "I cannot find my address, I want to enter it manually" msgstr "Dwi'n methu gweld fy nghyfeiriad i. Hoffwn ei roi fy hunan." From 37067b6d8817dc7b0fff4722316b4157c9e8f661 Mon Sep 17 00:00:00 2001 From: Samuel Young Date: Wed, 6 Nov 2024 14:53:49 +0000 Subject: [PATCH 04/16] PC-1347: add verifying test --- tests/test_frontdoor.py | 15 +++++++++++++++ tests/utils.py | 6 +++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/tests/test_frontdoor.py b/tests/test_frontdoor.py index 2be0c960..ebcb6d80 100644 --- a/tests/test_frontdoor.py +++ b/tests/test_frontdoor.py @@ -6,6 +6,7 @@ from django.utils import timezone from help_to_heat.frontdoor import interface +from help_to_heat.frontdoor.consts import country_page from help_to_heat.frontdoor.mock_epc_api import ( MockEPCApi, MockEPCApiWithEPCC, @@ -2105,6 +2106,20 @@ def test_epc_page_shows_epc_info(): assert page.has_one("p:contains('23 July 2010')") +@unittest.mock.patch("help_to_heat.frontdoor.interface.EPCApi", MockEPCApi) +def test_success_page_still_shows_if_journey_cannot_reach_it(): + supplier = "Utilita" + + session_id, _ = _do_happy_flow(supplier=supplier) + + utils.delete_answer_in_session(session_id, country_page) + + client = utils.get_client() + page = client.get(f"/{session_id}/success").follow() + + assert page.has_one(f"h1:contains('Your details have been submitted to {supplier}')") + + def _setup_client_and_page(): client = utils.get_client() page = client.get("/start") diff --git a/tests/utils.py b/tests/utils.py index 3ffaade2..d42e0e3c 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -13,7 +13,7 @@ from django.conf import settings from django.utils import timezone -from help_to_heat import portal, wsgi +from help_to_heat import frontdoor, portal, wsgi from help_to_heat.portal import models __here__ = pathlib.Path(__file__).parent @@ -175,3 +175,7 @@ def create_referral(session_id, data=None, supplier="British Gas", creation_time referral = portal.models.Referral.objects.get() referral.created_at = creation_timestamp referral.save() + + +def delete_answer_in_session(session_id, page_name): + frontdoor.models.Answer.objects.get(session_id=session_id, page_name=page_name).delete() From 4588a62fe70b9cee280a3b344ac753f5ebe5a8d2 Mon Sep 17 00:00:00 2001 From: Glenn Clarke Date: Tue, 12 Nov 2024 15:07:33 +0000 Subject: [PATCH 05/16] PC-1413: Remove don't know option from schemas.py --- help_to_heat/frontdoor/schemas.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/help_to_heat/frontdoor/schemas.py b/help_to_heat/frontdoor/schemas.py index 63dcd3f2..d4d48a11 100644 --- a/help_to_heat/frontdoor/schemas.py +++ b/help_to_heat/frontdoor/schemas.py @@ -44,7 +44,6 @@ epc_rating_field, epc_select_manual_page, epc_select_page, - field_dont_know, field_no, field_yes, household_income_field, @@ -346,10 +345,6 @@ "value": field_no, "label": _("No"), }, - { - "value": field_dont_know, - "label": _("I do not know"), - }, ) epc_validation_options_map = epc_display_options_map + ( { From 872a1e79bb45a0d9dcb7a42935732e606d95ccb8 Mon Sep 17 00:00:00 2001 From: Glenn Clarke Date: Tue, 12 Nov 2024 17:35:14 +0000 Subject: [PATCH 06/16] PC-1413: Extract translations --- help_to_heat/locale/cy/LC_MESSAGES/django.po | 227 +++++++++---------- 1 file changed, 113 insertions(+), 114 deletions(-) diff --git a/help_to_heat/locale/cy/LC_MESSAGES/django.po b/help_to_heat/locale/cy/LC_MESSAGES/django.po index 9bdf15c2..7f5fdd28 100644 --- a/help_to_heat/locale/cy/LC_MESSAGES/django.po +++ b/help_to_heat/locale/cy/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-11-07 16:40+0000\n" +"POT-Creation-Date: 2024-11-12 17:16+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -19,126 +19,126 @@ msgstr "" "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != " "11) ? 2 : 3;\n" -#: help_to_heat/frontdoor/schemas.py:142 +#: help_to_heat/frontdoor/schemas.py:141 msgid "Country of property" msgstr "Gwlad yr eiddo" -#: help_to_heat/frontdoor/schemas.py:143 help_to_heat/frontdoor/schemas.py:165 +#: help_to_heat/frontdoor/schemas.py:142 help_to_heat/frontdoor/schemas.py:164 msgid "Energy supplier" msgstr "Cyflenwr ynni" -#: help_to_heat/frontdoor/schemas.py:144 +#: help_to_heat/frontdoor/schemas.py:143 msgctxt "summary page" msgid "Do you own the property?" msgstr "Ydy'r eiddo yn perthyn i chi?" -#: help_to_heat/frontdoor/schemas.py:145 +#: help_to_heat/frontdoor/schemas.py:144 #: help_to_heat/templates/frontdoor/park-home.html:14 msgid "Do you live in a park home?" msgstr "Ydych chi'n byw mewn aelwyd mewn parc?" -#: help_to_heat/frontdoor/schemas.py:146 +#: help_to_heat/frontdoor/schemas.py:145 #: help_to_heat/templates/frontdoor/park-home-main-residence.html:14 msgid "Is the park home your main residence?" msgstr "Ai'r aelwyd mewn parc yw'ch prif breswylfa?" -#: help_to_heat/frontdoor/schemas.py:147 +#: help_to_heat/frontdoor/schemas.py:146 msgid "Property address" msgstr "Cyfeiriad yr eiddo" -#: help_to_heat/frontdoor/schemas.py:148 +#: help_to_heat/frontdoor/schemas.py:147 msgid "Council tax band" msgstr "Band treth gyngor" -#: help_to_heat/frontdoor/schemas.py:149 +#: help_to_heat/frontdoor/schemas.py:148 msgid "Energy Performance Certificate" msgstr "Dystysgrif Perfformiad Ynni" -#: help_to_heat/frontdoor/schemas.py:151 +#: help_to_heat/frontdoor/schemas.py:150 msgctxt "summary page" msgid "Is anyone in your household receiving any of the following benefits?" msgstr "" "Oes unrhyw un yn eich aelwyd chi'n cael unrhyw un o'r budd-daliadau canlynol?" -#: help_to_heat/frontdoor/schemas.py:153 +#: help_to_heat/frontdoor/schemas.py:152 msgid "Annual household income" msgstr "Incwm blynyddol yr aelwyd" -#: help_to_heat/frontdoor/schemas.py:154 help_to_heat/frontdoor/schemas.py:155 +#: help_to_heat/frontdoor/schemas.py:153 help_to_heat/frontdoor/schemas.py:154 #: help_to_heat/templates/frontdoor/epc.html:49 msgid "Property type" msgstr "Math o eiddo" -#: help_to_heat/frontdoor/schemas.py:156 +#: help_to_heat/frontdoor/schemas.py:155 msgid "Number of bedrooms" msgstr "Nifer yr ystafelloedd gwely" -#: help_to_heat/frontdoor/schemas.py:157 +#: help_to_heat/frontdoor/schemas.py:156 msgid "Property walls" msgstr "Waliau'r eiddo" -#: help_to_heat/frontdoor/schemas.py:158 +#: help_to_heat/frontdoor/schemas.py:157 msgctxt "summary page" msgid "Are your walls insulated?" msgstr "Ydy'ch waliau wedi'u hinswleiddio?" -#: help_to_heat/frontdoor/schemas.py:159 +#: help_to_heat/frontdoor/schemas.py:158 msgid "Does this property have a loft?" msgstr "Oes gan yr eiddo yma atig?" -#: help_to_heat/frontdoor/schemas.py:160 +#: help_to_heat/frontdoor/schemas.py:159 #: help_to_heat/templates/frontdoor/loft-access.html:14 msgid "Is there access to your loft?" msgstr "Oes modd mynd i'ch atig?" -#: help_to_heat/frontdoor/schemas.py:161 +#: help_to_heat/frontdoor/schemas.py:160 msgid "Is there 100mm of insulation in your loft?" msgstr "Oes 100mm o inswleiddiad yn eich atig?" -#: help_to_heat/frontdoor/schemas.py:166 +#: help_to_heat/frontdoor/schemas.py:165 #: help_to_heat/templates/frontdoor/contact-details.html:23 msgid "First name" msgstr "Enw cyntaf" -#: help_to_heat/frontdoor/schemas.py:167 +#: help_to_heat/frontdoor/schemas.py:166 #: help_to_heat/templates/frontdoor/contact-details.html:26 msgid "Last name" msgstr "Enw olaf" -#: help_to_heat/frontdoor/schemas.py:168 +#: help_to_heat/frontdoor/schemas.py:167 #: help_to_heat/templates/frontdoor/contact-details.html:39 msgid "Contact number" msgstr "Rhif ffôn" -#: help_to_heat/frontdoor/schemas.py:169 +#: help_to_heat/frontdoor/schemas.py:168 msgid "Email" msgstr "Ebost" -#: help_to_heat/frontdoor/schemas.py:278 help_to_heat/frontdoor/schemas.py:425 +#: help_to_heat/frontdoor/schemas.py:277 help_to_heat/frontdoor/schemas.py:420 msgid "England" msgstr "Lloegr" -#: help_to_heat/frontdoor/schemas.py:282 help_to_heat/frontdoor/schemas.py:426 +#: help_to_heat/frontdoor/schemas.py:281 help_to_heat/frontdoor/schemas.py:421 msgid "Scotland" msgstr "Yr Alban" -#: help_to_heat/frontdoor/schemas.py:286 help_to_heat/frontdoor/schemas.py:427 +#: help_to_heat/frontdoor/schemas.py:285 help_to_heat/frontdoor/schemas.py:422 msgid "Wales" msgstr "Cymru" -#: help_to_heat/frontdoor/schemas.py:290 +#: help_to_heat/frontdoor/schemas.py:289 msgid "Northern Ireland" msgstr "Gogledd Iwerddon" -#: help_to_heat/frontdoor/schemas.py:297 help_to_heat/frontdoor/schemas.py:430 +#: help_to_heat/frontdoor/schemas.py:296 help_to_heat/frontdoor/schemas.py:425 msgid "Yes, I own my property and live in it" msgstr "Ydy, mae'r eiddo'n perthyn i mi a dwi'n byw ynddo" -#: help_to_heat/frontdoor/schemas.py:301 help_to_heat/frontdoor/schemas.py:431 +#: help_to_heat/frontdoor/schemas.py:300 help_to_heat/frontdoor/schemas.py:426 msgid "No, I am a tenant" msgstr "Nac ydy. Tenant ydw i" -#: help_to_heat/frontdoor/schemas.py:303 help_to_heat/frontdoor/schemas.py:311 +#: help_to_heat/frontdoor/schemas.py:302 help_to_heat/frontdoor/schemas.py:310 msgid "" "If you are eligible for a referral through this service, your energy " "supplier will need to check that you have your landlord’s " @@ -148,207 +148,206 @@ msgstr "" "i'ch cyflenwr ynni wirio bod gennych chi ganiatâd eich landlord i osod " "unrhyw fesurau arbed ynni yn yr eiddo." -#: help_to_heat/frontdoor/schemas.py:309 help_to_heat/frontdoor/schemas.py:432 +#: help_to_heat/frontdoor/schemas.py:308 help_to_heat/frontdoor/schemas.py:427 msgid "No, I am a social housing tenant" msgstr "Nac ydy. Dwi'n denant tai cymdeithasol" -#: help_to_heat/frontdoor/schemas.py:317 help_to_heat/frontdoor/schemas.py:433 +#: help_to_heat/frontdoor/schemas.py:316 help_to_heat/frontdoor/schemas.py:428 msgid "" "Yes, I am the property owner but I lease the property to one or more tenants" msgstr "" "Ydy, mae'r eiddo'n perthyn i mi ond dwi'n gosod yr eiddo i un neu ragor o " "denantiaid" -#: help_to_heat/frontdoor/schemas.py:323 +#: help_to_heat/frontdoor/schemas.py:322 msgctxt "park home question option" msgid "Yes" msgstr "Ydw" -#: help_to_heat/frontdoor/schemas.py:327 +#: help_to_heat/frontdoor/schemas.py:326 msgctxt "park home question option" msgid "No" msgstr "Nad ydw" -#: help_to_heat/frontdoor/schemas.py:333 help_to_heat/frontdoor/schemas.py:343 +#: help_to_heat/frontdoor/schemas.py:332 help_to_heat/frontdoor/schemas.py:342 msgid "Yes" msgstr "Ie" -#: help_to_heat/frontdoor/schemas.py:337 help_to_heat/frontdoor/schemas.py:347 +#: help_to_heat/frontdoor/schemas.py:336 help_to_heat/frontdoor/schemas.py:346 msgid "No" msgstr "Nage" -#: help_to_heat/frontdoor/schemas.py:351 help_to_heat/frontdoor/schemas.py:469 -#: help_to_heat/frontdoor/schemas.py:475 help_to_heat/frontdoor/schemas.py:489 -#: help_to_heat/frontdoor/schemas.py:601 help_to_heat/frontdoor/schemas.py:619 -#: help_to_heat/frontdoor/schemas.py:711 -msgid "I do not know" -msgstr "Wn i ddim" - -#: help_to_heat/frontdoor/schemas.py:356 +#: help_to_heat/frontdoor/schemas.py:351 msgid "Not found" msgstr "Heb ei ganfod" -#: help_to_heat/frontdoor/schemas.py:385 help_to_heat/frontdoor/schemas.py:436 +#: help_to_heat/frontdoor/schemas.py:380 help_to_heat/frontdoor/schemas.py:431 msgctxt "yes no question option" msgid "Yes" msgstr "Oes" -#: help_to_heat/frontdoor/schemas.py:389 help_to_heat/frontdoor/schemas.py:437 +#: help_to_heat/frontdoor/schemas.py:384 help_to_heat/frontdoor/schemas.py:432 msgctxt "yes no question option" msgid "No" msgstr "Nac oes" -#: help_to_heat/frontdoor/schemas.py:395 help_to_heat/frontdoor/schemas.py:440 +#: help_to_heat/frontdoor/schemas.py:390 help_to_heat/frontdoor/schemas.py:435 msgid "Less than £31,000 a year" msgstr "Llai na £31,000 y flwyddyn" -#: help_to_heat/frontdoor/schemas.py:399 help_to_heat/frontdoor/schemas.py:441 +#: help_to_heat/frontdoor/schemas.py:394 help_to_heat/frontdoor/schemas.py:436 msgid "£31,000 or more a year" msgstr "£31,000 y flwyddyn neu ragor" -#: help_to_heat/frontdoor/schemas.py:405 help_to_heat/frontdoor/schemas.py:444 +#: help_to_heat/frontdoor/schemas.py:400 help_to_heat/frontdoor/schemas.py:439 #: help_to_heat/frontdoor/views.py:263 msgid "House" msgstr "Tŷ" -#: help_to_heat/frontdoor/schemas.py:409 help_to_heat/frontdoor/schemas.py:445 +#: help_to_heat/frontdoor/schemas.py:404 help_to_heat/frontdoor/schemas.py:440 #: help_to_heat/frontdoor/views.py:262 msgid "Bungalow" msgstr "Byngalo" -#: help_to_heat/frontdoor/schemas.py:413 help_to_heat/frontdoor/schemas.py:446 +#: help_to_heat/frontdoor/schemas.py:408 help_to_heat/frontdoor/schemas.py:441 msgid "Apartment, flat or maisonette" msgstr "Rhandy, fflat neu fflat ddeulawr" -#: help_to_heat/frontdoor/schemas.py:418 +#: help_to_heat/frontdoor/schemas.py:413 msgid "house" msgstr "dŷ" -#: help_to_heat/frontdoor/schemas.py:419 +#: help_to_heat/frontdoor/schemas.py:414 msgid "bungalow" msgstr "fyngalo" -#: help_to_heat/frontdoor/schemas.py:420 +#: help_to_heat/frontdoor/schemas.py:415 msgid "apartment, flat or maisonette" msgstr "randy, fflat neu fflat ddeulawr" -#: help_to_heat/frontdoor/schemas.py:447 help_to_heat/frontdoor/views.py:265 +#: help_to_heat/frontdoor/schemas.py:442 help_to_heat/frontdoor/views.py:265 msgid "Park home" msgstr "Cartref mewn parc" -#: help_to_heat/frontdoor/schemas.py:450 help_to_heat/frontdoor/schemas.py:517 -#: help_to_heat/frontdoor/schemas.py:539 +#: help_to_heat/frontdoor/schemas.py:445 help_to_heat/frontdoor/schemas.py:512 +#: help_to_heat/frontdoor/schemas.py:534 msgid "Detached" msgstr "Tŷ sengl" -#: help_to_heat/frontdoor/schemas.py:451 help_to_heat/frontdoor/schemas.py:522 -#: help_to_heat/frontdoor/schemas.py:544 +#: help_to_heat/frontdoor/schemas.py:446 help_to_heat/frontdoor/schemas.py:517 +#: help_to_heat/frontdoor/schemas.py:539 msgid "Semi-detached" msgstr "Tŷ pâr" -#: help_to_heat/frontdoor/schemas.py:452 help_to_heat/frontdoor/schemas.py:527 -#: help_to_heat/frontdoor/schemas.py:549 +#: help_to_heat/frontdoor/schemas.py:447 help_to_heat/frontdoor/schemas.py:522 +#: help_to_heat/frontdoor/schemas.py:544 msgid "Terraced" msgstr "Tŷ teras" -#: help_to_heat/frontdoor/schemas.py:453 help_to_heat/frontdoor/schemas.py:532 -#: help_to_heat/frontdoor/schemas.py:554 +#: help_to_heat/frontdoor/schemas.py:448 help_to_heat/frontdoor/schemas.py:527 +#: help_to_heat/frontdoor/schemas.py:549 msgid "End terrace" msgstr "Tŷ pen teras" -#: help_to_heat/frontdoor/schemas.py:454 help_to_heat/frontdoor/schemas.py:498 +#: help_to_heat/frontdoor/schemas.py:449 help_to_heat/frontdoor/schemas.py:493 msgid "Top floor" msgstr "Llawr uchaf" -#: help_to_heat/frontdoor/schemas.py:455 help_to_heat/frontdoor/schemas.py:503 +#: help_to_heat/frontdoor/schemas.py:450 help_to_heat/frontdoor/schemas.py:498 msgid "Middle floor" msgstr "Llawr canol" -#: help_to_heat/frontdoor/schemas.py:456 help_to_heat/frontdoor/schemas.py:508 +#: help_to_heat/frontdoor/schemas.py:451 help_to_heat/frontdoor/schemas.py:503 msgid "Ground floor" msgstr "Llawr daear" -#: help_to_heat/frontdoor/schemas.py:459 help_to_heat/frontdoor/schemas.py:562 +#: help_to_heat/frontdoor/schemas.py:454 help_to_heat/frontdoor/schemas.py:557 msgid "Studio" msgstr "Stiwdio" -#: help_to_heat/frontdoor/schemas.py:460 help_to_heat/frontdoor/schemas.py:566 +#: help_to_heat/frontdoor/schemas.py:455 help_to_heat/frontdoor/schemas.py:561 msgid "One bedroom" msgstr "Un ystafell wely" -#: help_to_heat/frontdoor/schemas.py:461 help_to_heat/frontdoor/schemas.py:570 +#: help_to_heat/frontdoor/schemas.py:456 help_to_heat/frontdoor/schemas.py:565 msgid "Two bedrooms" msgstr "Dwy ystafell wely" -#: help_to_heat/frontdoor/schemas.py:462 help_to_heat/frontdoor/schemas.py:574 +#: help_to_heat/frontdoor/schemas.py:457 help_to_heat/frontdoor/schemas.py:569 msgid "Three or more bedrooms" msgstr "Tair neu fwy o ystafelloedd gwely" -#: help_to_heat/frontdoor/schemas.py:465 help_to_heat/frontdoor/schemas.py:581 +#: help_to_heat/frontdoor/schemas.py:460 help_to_heat/frontdoor/schemas.py:576 msgid "Solid walls" msgstr "Waliau solet" -#: help_to_heat/frontdoor/schemas.py:466 help_to_heat/frontdoor/schemas.py:585 +#: help_to_heat/frontdoor/schemas.py:461 help_to_heat/frontdoor/schemas.py:580 msgid "Cavity walls" msgstr "Waliau ceudod" -#: help_to_heat/frontdoor/schemas.py:467 help_to_heat/frontdoor/schemas.py:589 +#: help_to_heat/frontdoor/schemas.py:462 help_to_heat/frontdoor/schemas.py:584 msgid "Mix of solid and cavity walls" msgstr "Cymysgedd o waliau solet a waliau ceudod" -#: help_to_heat/frontdoor/schemas.py:468 help_to_heat/frontdoor/schemas.py:593 +#: help_to_heat/frontdoor/schemas.py:463 help_to_heat/frontdoor/schemas.py:588 msgid "I do not see my option listed" msgstr "Dwi ddim yn gweld bod fy opsiwn i wedi'i restru" -#: help_to_heat/frontdoor/schemas.py:472 help_to_heat/frontdoor/schemas.py:607 +#: help_to_heat/frontdoor/schemas.py:464 help_to_heat/frontdoor/schemas.py:470 +#: help_to_heat/frontdoor/schemas.py:484 help_to_heat/frontdoor/schemas.py:596 +#: help_to_heat/frontdoor/schemas.py:614 help_to_heat/frontdoor/schemas.py:706 +msgid "I do not know" +msgstr "Wn i ddim" + +#: help_to_heat/frontdoor/schemas.py:467 help_to_heat/frontdoor/schemas.py:602 msgid "Yes they are all insulated" msgstr "Ydyn, maen nhw i gyd wedi'u hinswleiddio" -#: help_to_heat/frontdoor/schemas.py:473 help_to_heat/frontdoor/schemas.py:611 +#: help_to_heat/frontdoor/schemas.py:468 help_to_heat/frontdoor/schemas.py:606 msgid "Some are insulated, some are not" msgstr "Mae rhai wedi'u eu hinswleiddio, mae rhai heb" -#: help_to_heat/frontdoor/schemas.py:474 help_to_heat/frontdoor/schemas.py:615 +#: help_to_heat/frontdoor/schemas.py:469 help_to_heat/frontdoor/schemas.py:610 msgid "No they are not insulated" msgstr "Na, dydyn nhw ddim wedi'u hinswleiddio" -#: help_to_heat/frontdoor/schemas.py:478 help_to_heat/frontdoor/schemas.py:625 +#: help_to_heat/frontdoor/schemas.py:473 help_to_heat/frontdoor/schemas.py:620 msgid "Yes, I have a loft that has not been converted into a room" msgstr "Oes, mae gen i atig sydd heb ei droi'n ystafell" -#: help_to_heat/frontdoor/schemas.py:479 help_to_heat/frontdoor/schemas.py:629 +#: help_to_heat/frontdoor/schemas.py:474 help_to_heat/frontdoor/schemas.py:624 msgid "No, I do not have a loft or my loft has been converted into a room" msgstr "Nac oes, does gen i ddim atig neu mae fy atig i wedi'i droi'n ystafell" -#: help_to_heat/frontdoor/schemas.py:482 help_to_heat/frontdoor/schemas.py:635 +#: help_to_heat/frontdoor/schemas.py:477 help_to_heat/frontdoor/schemas.py:630 msgid "Yes, there is access to my loft" msgstr "Oes, mae modd mynd i'r atig" -#: help_to_heat/frontdoor/schemas.py:483 help_to_heat/frontdoor/schemas.py:639 +#: help_to_heat/frontdoor/schemas.py:478 help_to_heat/frontdoor/schemas.py:634 msgid "No, there is no access to my loft" msgstr "Nac oes, does dim modd mynd i'r atig" -#: help_to_heat/frontdoor/schemas.py:484 help_to_heat/frontdoor/schemas.py:490 +#: help_to_heat/frontdoor/schemas.py:479 help_to_heat/frontdoor/schemas.py:485 msgid "No loft" msgstr "Dim atig" -#: help_to_heat/frontdoor/schemas.py:487 help_to_heat/frontdoor/schemas.py:703 +#: help_to_heat/frontdoor/schemas.py:482 help_to_heat/frontdoor/schemas.py:698 msgid "I have more than 100mm of loft insulation" msgstr "Mae gen i fwy na 100mm o inswleiddiad atig" -#: help_to_heat/frontdoor/schemas.py:488 help_to_heat/frontdoor/schemas.py:707 +#: help_to_heat/frontdoor/schemas.py:483 help_to_heat/frontdoor/schemas.py:702 msgid "I have up to 100mm of loft insulation" msgstr "Mae gen i hyd at 100mm o inswleiddiad atig" -#: help_to_heat/frontdoor/schemas.py:499 +#: help_to_heat/frontdoor/schemas.py:494 msgid "Sits directly below the roof with no other flat above it" msgstr "Yn gorwedd yn union o dan y to heb unrhyw fflat arall uwch ei phen" -#: help_to_heat/frontdoor/schemas.py:504 +#: help_to_heat/frontdoor/schemas.py:499 msgid "Has another flat above, and another below" msgstr "Mae fflat arall uwchben, ac un arall odani" -#: help_to_heat/frontdoor/schemas.py:510 +#: help_to_heat/frontdoor/schemas.py:505 msgid "" "The lowest flat in the building with no flat beneath - typically at street " "level but may be a basement" @@ -356,24 +355,24 @@ msgstr "" "Y fflat isaf yn yr adeilad heb fflat odani - fel arfer ar lefel y stryd ond " "gall fod yn islawr" -#: help_to_heat/frontdoor/schemas.py:518 help_to_heat/frontdoor/schemas.py:540 +#: help_to_heat/frontdoor/schemas.py:513 help_to_heat/frontdoor/schemas.py:535 msgid "Does not share any of its walls with another house or building" msgstr "Nid yw'n rhannu unrhyw un o'i waliau â thŷ neu adeilad arall" -#: help_to_heat/frontdoor/schemas.py:523 help_to_heat/frontdoor/schemas.py:545 +#: help_to_heat/frontdoor/schemas.py:518 help_to_heat/frontdoor/schemas.py:540 msgid "Is attached to one other house or building" msgstr "Mae wedi'i gysylltu ag un tŷ neu adeilad arall" -#: help_to_heat/frontdoor/schemas.py:528 help_to_heat/frontdoor/schemas.py:550 +#: help_to_heat/frontdoor/schemas.py:523 help_to_heat/frontdoor/schemas.py:545 msgid "Sits in the middle with a house or building on each side" msgstr "Yn sefyll yn y canol gyda thŷ neu adeilad o boptu iddo" -#: help_to_heat/frontdoor/schemas.py:533 help_to_heat/frontdoor/schemas.py:555 +#: help_to_heat/frontdoor/schemas.py:528 help_to_heat/frontdoor/schemas.py:550 msgid "" "Sits at the end of a row of similar houses with one house attached to it" msgstr "Yn sefyll ar ben rhes o dai tebyg gydag un tŷ ynghlwm wrtho" -#: help_to_heat/frontdoor/schemas.py:595 +#: help_to_heat/frontdoor/schemas.py:590 msgid "" "Other wall types could include cob walls, timber framed, system built, steel " "framed or other non-traditional build types" @@ -381,93 +380,93 @@ msgstr "" "Gallai mathau eraill o waliau gynnwys waliau cob, waliau ffrâm pren, " "adeiladu system, fframiau dur neu fathau eraill o adeiladau anhraddodiadol" -#: help_to_heat/frontdoor/schemas.py:656 +#: help_to_heat/frontdoor/schemas.py:651 msgid "Bulb, now part of Octopus Energy" msgstr "Bulb, sydd bellach yn rhan o Octopus" -#: help_to_heat/frontdoor/schemas.py:722 +#: help_to_heat/frontdoor/schemas.py:717 msgid "Completely agree" msgstr "Cytuno'n llwyr" -#: help_to_heat/frontdoor/schemas.py:726 +#: help_to_heat/frontdoor/schemas.py:721 msgid "Agree" msgstr "Cytuno" -#: help_to_heat/frontdoor/schemas.py:730 +#: help_to_heat/frontdoor/schemas.py:725 msgid "Neutral" msgstr "Niwtral" -#: help_to_heat/frontdoor/schemas.py:734 +#: help_to_heat/frontdoor/schemas.py:729 msgid "Disagree" msgstr "Anghytuno" -#: help_to_heat/frontdoor/schemas.py:738 +#: help_to_heat/frontdoor/schemas.py:733 msgid "Completely disagree" msgstr "Anghytuno'n llwyr" -#: help_to_heat/frontdoor/schemas.py:745 +#: help_to_heat/frontdoor/schemas.py:740 msgid "Very satisfied" msgstr "Bodlon iawn" -#: help_to_heat/frontdoor/schemas.py:749 +#: help_to_heat/frontdoor/schemas.py:744 msgid "Somewhat satisfied" msgstr "Eithaf bodlon" -#: help_to_heat/frontdoor/schemas.py:753 +#: help_to_heat/frontdoor/schemas.py:748 msgid "Neither satisfied nor dissatisfied" msgstr "Ddim yn fodlon nac yn anfodlon" -#: help_to_heat/frontdoor/schemas.py:757 +#: help_to_heat/frontdoor/schemas.py:752 msgid "Somewhat dissatisfied" msgstr "Eithaf anfodlon" -#: help_to_heat/frontdoor/schemas.py:761 +#: help_to_heat/frontdoor/schemas.py:756 msgid "Very dissatisfied" msgstr "Anfodlon iawn" -#: help_to_heat/frontdoor/schemas.py:768 +#: help_to_heat/frontdoor/schemas.py:763 msgid "To find ways to reduce my energy bills" msgstr "Dod o hyd i ffyrdd i leihau fy miliau ynni" -#: help_to_heat/frontdoor/schemas.py:772 +#: help_to_heat/frontdoor/schemas.py:767 msgid "To find ways to reduce my carbon emissions" msgstr "Dod o hyd i ffyrdd i leihau fy allyriadau carbon" -#: help_to_heat/frontdoor/schemas.py:776 +#: help_to_heat/frontdoor/schemas.py:771 msgid "To find ways to install a specific measure in my home" msgstr "Dod o hyd i ffyrdd o osod mesur penodol yn fy nghartref" -#: help_to_heat/frontdoor/schemas.py:780 +#: help_to_heat/frontdoor/schemas.py:775 msgid "To find ways to improve my EPC rating" msgstr "Dod o hyd i ffyrdd i wella fy sgôr EPC" -#: help_to_heat/frontdoor/schemas.py:784 +#: help_to_heat/frontdoor/schemas.py:779 msgid "To find ways to make my home more comfortable" msgstr "Dod o hyd i ffyrdd i wneud fy nghartref yn fwy cyffyrddus" -#: help_to_heat/frontdoor/schemas.py:788 +#: help_to_heat/frontdoor/schemas.py:783 msgid "Other" msgstr "Arall" -#: help_to_heat/frontdoor/schemas.py:876 +#: help_to_heat/frontdoor/schemas.py:871 msgid "Enter a valid UK postcode" msgstr "Rhowch god post dilys yn y Deyrnas Unedig" -#: help_to_heat/frontdoor/schemas.py:881 +#: help_to_heat/frontdoor/schemas.py:876 msgid "Invalid email format" msgstr "Fformat ebost annilys" -#: help_to_heat/frontdoor/schemas.py:891 help_to_heat/frontdoor/schemas.py:895 +#: help_to_heat/frontdoor/schemas.py:886 help_to_heat/frontdoor/schemas.py:890 msgid "" "Enter a telephone number, like 01632 960 001, 07700 900 982 or +44 808 157 " "0192" msgstr "Rhowch rif ffôn, fel 01632 960 001, 07700 900 982 neu +44 808 157 0192" -#: help_to_heat/frontdoor/schemas.py:907 +#: help_to_heat/frontdoor/schemas.py:902 msgid "Energy Company Obligation 4" msgstr "Rhwymedigaeth Cwmni Ynni 4" -#: help_to_heat/frontdoor/schemas.py:908 +#: help_to_heat/frontdoor/schemas.py:903 msgid "Great British Insulation Scheme" msgstr "Cynllun Inswleiddio Mawr Prydain" @@ -668,7 +667,7 @@ msgstr "Fflat" msgid "Maisonette" msgstr "Fflat deulawr" -#: help_to_heat/frontdoor/views.py:655 help_to_heat/frontdoor/views.py:725 +#: help_to_heat/frontdoor/views.py:661 help_to_heat/frontdoor/views.py:731 msgid "I cannot find my address, I want to enter it manually" msgstr "Dwi'n methu gweld fy nghyfeiriad i. Hoffwn ei roi fy hunan." From 261ce3f145abef75022fe8a07ec27eafcadf064f Mon Sep 17 00:00:00 2001 From: Glenn Clarke Date: Wed, 13 Nov 2024 14:27:10 +0000 Subject: [PATCH 07/16] PC-1364: Add new answer to loft insulation question, and reword existing answers --- help_to_heat/frontdoor/consts.py | 1 + help_to_heat/frontdoor/schemas.py | 10 +- help_to_heat/locale/cy/LC_MESSAGES/django.mo | Bin 95902 -> 96020 bytes help_to_heat/locale/cy/LC_MESSAGES/django.po | 226 ++++++++++--------- 4 files changed, 124 insertions(+), 113 deletions(-) diff --git a/help_to_heat/frontdoor/consts.py b/help_to_heat/frontdoor/consts.py index 0cfe7fdc..92227847 100644 --- a/help_to_heat/frontdoor/consts.py +++ b/help_to_heat/frontdoor/consts.py @@ -261,6 +261,7 @@ loft_insulation_field = "loft_insulation" loft_insulation_field_more_than_threshold = "I have more than 100mm of loft insulation" loft_insulation_field_less_than_threshold = "I have up to 100mm of loft insulation" +loft_insulation_field_no_insulation = "I have no loft insulation" loft_insulation_field_dont_know = field_dont_know loft_insulation_field_no_loft = "No loft" diff --git a/help_to_heat/frontdoor/schemas.py b/help_to_heat/frontdoor/schemas.py index d4d48a11..305c83db 100644 --- a/help_to_heat/frontdoor/schemas.py +++ b/help_to_heat/frontdoor/schemas.py @@ -62,6 +62,7 @@ loft_insulation_field_dont_know, loft_insulation_field_less_than_threshold, loft_insulation_field_more_than_threshold, + loft_insulation_field_no_insulation, loft_insulation_field_no_loft, loft_insulation_page, loft_page, @@ -480,7 +481,8 @@ }, loft_insulation_field: { loft_insulation_field_more_than_threshold: _("I have more than 100mm of loft insulation"), - loft_insulation_field_less_than_threshold: _("I have up to 100mm of loft insulation"), + loft_insulation_field_less_than_threshold: _("I have less than or equal to 100mm of loft insulation"), + loft_insulation_field_no_insulation: _("I have no loft insulation"), loft_insulation_field_dont_know: _("I do not know"), loft_insulation_field_no_loft: _("No loft"), }, @@ -699,7 +701,11 @@ }, { "value": loft_insulation_field_less_than_threshold, - "label": _("I have up to 100mm of loft insulation"), + "label": _("I have less than or equal to 100mm of loft insulation"), + }, + { + "value": loft_insulation_field_no_insulation, + "label": _("I have no loft insulation"), }, { "value": loft_insulation_field_dont_know, diff --git a/help_to_heat/locale/cy/LC_MESSAGES/django.mo b/help_to_heat/locale/cy/LC_MESSAGES/django.mo index bf19b7fb79b9a4a4bd3e5b1a9f878d7fbd4d4eb1..3755f9ce346fb26cba25a8de3cb96a8c53d799fe 100644 GIT binary patch delta 12661 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 Q+0nm$@~|AIf3wX008l6x)c^nh delta 12593 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 DI%4g~ diff --git a/help_to_heat/locale/cy/LC_MESSAGES/django.po b/help_to_heat/locale/cy/LC_MESSAGES/django.po index 7f5fdd28..bf457433 100644 --- a/help_to_heat/locale/cy/LC_MESSAGES/django.po +++ b/help_to_heat/locale/cy/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-11-12 17:16+0000\n" +"POT-Creation-Date: 2024-11-13 14:20+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -19,126 +19,126 @@ msgstr "" "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != " "11) ? 2 : 3;\n" -#: help_to_heat/frontdoor/schemas.py:141 +#: help_to_heat/frontdoor/schemas.py:142 msgid "Country of property" msgstr "Gwlad yr eiddo" -#: help_to_heat/frontdoor/schemas.py:142 help_to_heat/frontdoor/schemas.py:164 +#: help_to_heat/frontdoor/schemas.py:143 help_to_heat/frontdoor/schemas.py:165 msgid "Energy supplier" msgstr "Cyflenwr ynni" -#: help_to_heat/frontdoor/schemas.py:143 +#: help_to_heat/frontdoor/schemas.py:144 msgctxt "summary page" msgid "Do you own the property?" msgstr "Ydy'r eiddo yn perthyn i chi?" -#: help_to_heat/frontdoor/schemas.py:144 +#: help_to_heat/frontdoor/schemas.py:145 #: help_to_heat/templates/frontdoor/park-home.html:14 msgid "Do you live in a park home?" msgstr "Ydych chi'n byw mewn aelwyd mewn parc?" -#: help_to_heat/frontdoor/schemas.py:145 +#: help_to_heat/frontdoor/schemas.py:146 #: help_to_heat/templates/frontdoor/park-home-main-residence.html:14 msgid "Is the park home your main residence?" msgstr "Ai'r aelwyd mewn parc yw'ch prif breswylfa?" -#: help_to_heat/frontdoor/schemas.py:146 +#: help_to_heat/frontdoor/schemas.py:147 msgid "Property address" msgstr "Cyfeiriad yr eiddo" -#: help_to_heat/frontdoor/schemas.py:147 +#: help_to_heat/frontdoor/schemas.py:148 msgid "Council tax band" msgstr "Band treth gyngor" -#: help_to_heat/frontdoor/schemas.py:148 +#: help_to_heat/frontdoor/schemas.py:149 msgid "Energy Performance Certificate" msgstr "Dystysgrif Perfformiad Ynni" -#: help_to_heat/frontdoor/schemas.py:150 +#: help_to_heat/frontdoor/schemas.py:151 msgctxt "summary page" msgid "Is anyone in your household receiving any of the following benefits?" msgstr "" "Oes unrhyw un yn eich aelwyd chi'n cael unrhyw un o'r budd-daliadau canlynol?" -#: help_to_heat/frontdoor/schemas.py:152 +#: help_to_heat/frontdoor/schemas.py:153 msgid "Annual household income" msgstr "Incwm blynyddol yr aelwyd" -#: help_to_heat/frontdoor/schemas.py:153 help_to_heat/frontdoor/schemas.py:154 +#: help_to_heat/frontdoor/schemas.py:154 help_to_heat/frontdoor/schemas.py:155 #: help_to_heat/templates/frontdoor/epc.html:49 msgid "Property type" msgstr "Math o eiddo" -#: help_to_heat/frontdoor/schemas.py:155 +#: help_to_heat/frontdoor/schemas.py:156 msgid "Number of bedrooms" msgstr "Nifer yr ystafelloedd gwely" -#: help_to_heat/frontdoor/schemas.py:156 +#: help_to_heat/frontdoor/schemas.py:157 msgid "Property walls" msgstr "Waliau'r eiddo" -#: help_to_heat/frontdoor/schemas.py:157 +#: help_to_heat/frontdoor/schemas.py:158 msgctxt "summary page" msgid "Are your walls insulated?" msgstr "Ydy'ch waliau wedi'u hinswleiddio?" -#: help_to_heat/frontdoor/schemas.py:158 +#: help_to_heat/frontdoor/schemas.py:159 msgid "Does this property have a loft?" msgstr "Oes gan yr eiddo yma atig?" -#: help_to_heat/frontdoor/schemas.py:159 +#: help_to_heat/frontdoor/schemas.py:160 #: help_to_heat/templates/frontdoor/loft-access.html:14 msgid "Is there access to your loft?" msgstr "Oes modd mynd i'ch atig?" -#: help_to_heat/frontdoor/schemas.py:160 +#: help_to_heat/frontdoor/schemas.py:161 msgid "Is there 100mm of insulation in your loft?" msgstr "Oes 100mm o inswleiddiad yn eich atig?" -#: help_to_heat/frontdoor/schemas.py:165 +#: help_to_heat/frontdoor/schemas.py:166 #: help_to_heat/templates/frontdoor/contact-details.html:23 msgid "First name" msgstr "Enw cyntaf" -#: help_to_heat/frontdoor/schemas.py:166 +#: help_to_heat/frontdoor/schemas.py:167 #: help_to_heat/templates/frontdoor/contact-details.html:26 msgid "Last name" msgstr "Enw olaf" -#: help_to_heat/frontdoor/schemas.py:167 +#: help_to_heat/frontdoor/schemas.py:168 #: help_to_heat/templates/frontdoor/contact-details.html:39 msgid "Contact number" msgstr "Rhif ffôn" -#: help_to_heat/frontdoor/schemas.py:168 +#: help_to_heat/frontdoor/schemas.py:169 msgid "Email" msgstr "Ebost" -#: help_to_heat/frontdoor/schemas.py:277 help_to_heat/frontdoor/schemas.py:420 +#: help_to_heat/frontdoor/schemas.py:278 help_to_heat/frontdoor/schemas.py:421 msgid "England" msgstr "Lloegr" -#: help_to_heat/frontdoor/schemas.py:281 help_to_heat/frontdoor/schemas.py:421 +#: help_to_heat/frontdoor/schemas.py:282 help_to_heat/frontdoor/schemas.py:422 msgid "Scotland" msgstr "Yr Alban" -#: help_to_heat/frontdoor/schemas.py:285 help_to_heat/frontdoor/schemas.py:422 +#: help_to_heat/frontdoor/schemas.py:286 help_to_heat/frontdoor/schemas.py:423 msgid "Wales" msgstr "Cymru" -#: help_to_heat/frontdoor/schemas.py:289 +#: help_to_heat/frontdoor/schemas.py:290 msgid "Northern Ireland" msgstr "Gogledd Iwerddon" -#: help_to_heat/frontdoor/schemas.py:296 help_to_heat/frontdoor/schemas.py:425 +#: help_to_heat/frontdoor/schemas.py:297 help_to_heat/frontdoor/schemas.py:426 msgid "Yes, I own my property and live in it" msgstr "Ydy, mae'r eiddo'n perthyn i mi a dwi'n byw ynddo" -#: help_to_heat/frontdoor/schemas.py:300 help_to_heat/frontdoor/schemas.py:426 +#: help_to_heat/frontdoor/schemas.py:301 help_to_heat/frontdoor/schemas.py:427 msgid "No, I am a tenant" msgstr "Nac ydy. Tenant ydw i" -#: help_to_heat/frontdoor/schemas.py:302 help_to_heat/frontdoor/schemas.py:310 +#: help_to_heat/frontdoor/schemas.py:303 help_to_heat/frontdoor/schemas.py:311 msgid "" "If you are eligible for a referral through this service, your energy " "supplier will need to check that you have your landlord’s " @@ -148,206 +148,210 @@ msgstr "" "i'ch cyflenwr ynni wirio bod gennych chi ganiatâd eich landlord i osod " "unrhyw fesurau arbed ynni yn yr eiddo." -#: help_to_heat/frontdoor/schemas.py:308 help_to_heat/frontdoor/schemas.py:427 +#: help_to_heat/frontdoor/schemas.py:309 help_to_heat/frontdoor/schemas.py:428 msgid "No, I am a social housing tenant" msgstr "Nac ydy. Dwi'n denant tai cymdeithasol" -#: help_to_heat/frontdoor/schemas.py:316 help_to_heat/frontdoor/schemas.py:428 +#: help_to_heat/frontdoor/schemas.py:317 help_to_heat/frontdoor/schemas.py:429 msgid "" "Yes, I am the property owner but I lease the property to one or more tenants" msgstr "" "Ydy, mae'r eiddo'n perthyn i mi ond dwi'n gosod yr eiddo i un neu ragor o " "denantiaid" -#: help_to_heat/frontdoor/schemas.py:322 +#: help_to_heat/frontdoor/schemas.py:323 msgctxt "park home question option" msgid "Yes" msgstr "Ydw" -#: help_to_heat/frontdoor/schemas.py:326 +#: help_to_heat/frontdoor/schemas.py:327 msgctxt "park home question option" msgid "No" msgstr "Nad ydw" -#: help_to_heat/frontdoor/schemas.py:332 help_to_heat/frontdoor/schemas.py:342 +#: help_to_heat/frontdoor/schemas.py:333 help_to_heat/frontdoor/schemas.py:343 msgid "Yes" msgstr "Ie" -#: help_to_heat/frontdoor/schemas.py:336 help_to_heat/frontdoor/schemas.py:346 +#: help_to_heat/frontdoor/schemas.py:337 help_to_heat/frontdoor/schemas.py:347 msgid "No" msgstr "Nage" -#: help_to_heat/frontdoor/schemas.py:351 +#: help_to_heat/frontdoor/schemas.py:352 msgid "Not found" msgstr "Heb ei ganfod" -#: help_to_heat/frontdoor/schemas.py:380 help_to_heat/frontdoor/schemas.py:431 +#: help_to_heat/frontdoor/schemas.py:381 help_to_heat/frontdoor/schemas.py:432 msgctxt "yes no question option" msgid "Yes" msgstr "Oes" -#: help_to_heat/frontdoor/schemas.py:384 help_to_heat/frontdoor/schemas.py:432 +#: help_to_heat/frontdoor/schemas.py:385 help_to_heat/frontdoor/schemas.py:433 msgctxt "yes no question option" msgid "No" msgstr "Nac oes" -#: help_to_heat/frontdoor/schemas.py:390 help_to_heat/frontdoor/schemas.py:435 +#: help_to_heat/frontdoor/schemas.py:391 help_to_heat/frontdoor/schemas.py:436 msgid "Less than £31,000 a year" msgstr "Llai na £31,000 y flwyddyn" -#: help_to_heat/frontdoor/schemas.py:394 help_to_heat/frontdoor/schemas.py:436 +#: help_to_heat/frontdoor/schemas.py:395 help_to_heat/frontdoor/schemas.py:437 msgid "£31,000 or more a year" msgstr "£31,000 y flwyddyn neu ragor" -#: help_to_heat/frontdoor/schemas.py:400 help_to_heat/frontdoor/schemas.py:439 +#: help_to_heat/frontdoor/schemas.py:401 help_to_heat/frontdoor/schemas.py:440 #: help_to_heat/frontdoor/views.py:263 msgid "House" msgstr "Tŷ" -#: help_to_heat/frontdoor/schemas.py:404 help_to_heat/frontdoor/schemas.py:440 +#: help_to_heat/frontdoor/schemas.py:405 help_to_heat/frontdoor/schemas.py:441 #: help_to_heat/frontdoor/views.py:262 msgid "Bungalow" msgstr "Byngalo" -#: help_to_heat/frontdoor/schemas.py:408 help_to_heat/frontdoor/schemas.py:441 +#: help_to_heat/frontdoor/schemas.py:409 help_to_heat/frontdoor/schemas.py:442 msgid "Apartment, flat or maisonette" msgstr "Rhandy, fflat neu fflat ddeulawr" -#: help_to_heat/frontdoor/schemas.py:413 +#: help_to_heat/frontdoor/schemas.py:414 msgid "house" msgstr "dŷ" -#: help_to_heat/frontdoor/schemas.py:414 +#: help_to_heat/frontdoor/schemas.py:415 msgid "bungalow" msgstr "fyngalo" -#: help_to_heat/frontdoor/schemas.py:415 +#: help_to_heat/frontdoor/schemas.py:416 msgid "apartment, flat or maisonette" msgstr "randy, fflat neu fflat ddeulawr" -#: help_to_heat/frontdoor/schemas.py:442 help_to_heat/frontdoor/views.py:265 +#: help_to_heat/frontdoor/schemas.py:443 help_to_heat/frontdoor/views.py:265 msgid "Park home" msgstr "Cartref mewn parc" -#: help_to_heat/frontdoor/schemas.py:445 help_to_heat/frontdoor/schemas.py:512 -#: help_to_heat/frontdoor/schemas.py:534 +#: help_to_heat/frontdoor/schemas.py:446 help_to_heat/frontdoor/schemas.py:514 +#: help_to_heat/frontdoor/schemas.py:536 msgid "Detached" msgstr "Tŷ sengl" -#: help_to_heat/frontdoor/schemas.py:446 help_to_heat/frontdoor/schemas.py:517 -#: help_to_heat/frontdoor/schemas.py:539 +#: help_to_heat/frontdoor/schemas.py:447 help_to_heat/frontdoor/schemas.py:519 +#: help_to_heat/frontdoor/schemas.py:541 msgid "Semi-detached" msgstr "Tŷ pâr" -#: help_to_heat/frontdoor/schemas.py:447 help_to_heat/frontdoor/schemas.py:522 -#: help_to_heat/frontdoor/schemas.py:544 +#: help_to_heat/frontdoor/schemas.py:448 help_to_heat/frontdoor/schemas.py:524 +#: help_to_heat/frontdoor/schemas.py:546 msgid "Terraced" msgstr "Tŷ teras" -#: help_to_heat/frontdoor/schemas.py:448 help_to_heat/frontdoor/schemas.py:527 -#: help_to_heat/frontdoor/schemas.py:549 +#: help_to_heat/frontdoor/schemas.py:449 help_to_heat/frontdoor/schemas.py:529 +#: help_to_heat/frontdoor/schemas.py:551 msgid "End terrace" msgstr "Tŷ pen teras" -#: help_to_heat/frontdoor/schemas.py:449 help_to_heat/frontdoor/schemas.py:493 +#: help_to_heat/frontdoor/schemas.py:450 help_to_heat/frontdoor/schemas.py:495 msgid "Top floor" msgstr "Llawr uchaf" -#: help_to_heat/frontdoor/schemas.py:450 help_to_heat/frontdoor/schemas.py:498 +#: help_to_heat/frontdoor/schemas.py:451 help_to_heat/frontdoor/schemas.py:500 msgid "Middle floor" msgstr "Llawr canol" -#: help_to_heat/frontdoor/schemas.py:451 help_to_heat/frontdoor/schemas.py:503 +#: help_to_heat/frontdoor/schemas.py:452 help_to_heat/frontdoor/schemas.py:505 msgid "Ground floor" msgstr "Llawr daear" -#: help_to_heat/frontdoor/schemas.py:454 help_to_heat/frontdoor/schemas.py:557 +#: help_to_heat/frontdoor/schemas.py:455 help_to_heat/frontdoor/schemas.py:559 msgid "Studio" msgstr "Stiwdio" -#: help_to_heat/frontdoor/schemas.py:455 help_to_heat/frontdoor/schemas.py:561 +#: help_to_heat/frontdoor/schemas.py:456 help_to_heat/frontdoor/schemas.py:563 msgid "One bedroom" msgstr "Un ystafell wely" -#: help_to_heat/frontdoor/schemas.py:456 help_to_heat/frontdoor/schemas.py:565 +#: help_to_heat/frontdoor/schemas.py:457 help_to_heat/frontdoor/schemas.py:567 msgid "Two bedrooms" msgstr "Dwy ystafell wely" -#: help_to_heat/frontdoor/schemas.py:457 help_to_heat/frontdoor/schemas.py:569 +#: help_to_heat/frontdoor/schemas.py:458 help_to_heat/frontdoor/schemas.py:571 msgid "Three or more bedrooms" msgstr "Tair neu fwy o ystafelloedd gwely" -#: help_to_heat/frontdoor/schemas.py:460 help_to_heat/frontdoor/schemas.py:576 +#: help_to_heat/frontdoor/schemas.py:461 help_to_heat/frontdoor/schemas.py:578 msgid "Solid walls" msgstr "Waliau solet" -#: help_to_heat/frontdoor/schemas.py:461 help_to_heat/frontdoor/schemas.py:580 +#: help_to_heat/frontdoor/schemas.py:462 help_to_heat/frontdoor/schemas.py:582 msgid "Cavity walls" msgstr "Waliau ceudod" -#: help_to_heat/frontdoor/schemas.py:462 help_to_heat/frontdoor/schemas.py:584 +#: help_to_heat/frontdoor/schemas.py:463 help_to_heat/frontdoor/schemas.py:586 msgid "Mix of solid and cavity walls" msgstr "Cymysgedd o waliau solet a waliau ceudod" -#: help_to_heat/frontdoor/schemas.py:463 help_to_heat/frontdoor/schemas.py:588 +#: help_to_heat/frontdoor/schemas.py:464 help_to_heat/frontdoor/schemas.py:590 msgid "I do not see my option listed" msgstr "Dwi ddim yn gweld bod fy opsiwn i wedi'i restru" -#: help_to_heat/frontdoor/schemas.py:464 help_to_heat/frontdoor/schemas.py:470 -#: help_to_heat/frontdoor/schemas.py:484 help_to_heat/frontdoor/schemas.py:596 -#: help_to_heat/frontdoor/schemas.py:614 help_to_heat/frontdoor/schemas.py:706 +#: help_to_heat/frontdoor/schemas.py:465 help_to_heat/frontdoor/schemas.py:471 +#: help_to_heat/frontdoor/schemas.py:486 help_to_heat/frontdoor/schemas.py:598 +#: help_to_heat/frontdoor/schemas.py:616 help_to_heat/frontdoor/schemas.py:712 msgid "I do not know" msgstr "Wn i ddim" -#: help_to_heat/frontdoor/schemas.py:467 help_to_heat/frontdoor/schemas.py:602 +#: help_to_heat/frontdoor/schemas.py:468 help_to_heat/frontdoor/schemas.py:604 msgid "Yes they are all insulated" msgstr "Ydyn, maen nhw i gyd wedi'u hinswleiddio" -#: help_to_heat/frontdoor/schemas.py:468 help_to_heat/frontdoor/schemas.py:606 +#: help_to_heat/frontdoor/schemas.py:469 help_to_heat/frontdoor/schemas.py:608 msgid "Some are insulated, some are not" msgstr "Mae rhai wedi'u eu hinswleiddio, mae rhai heb" -#: help_to_heat/frontdoor/schemas.py:469 help_to_heat/frontdoor/schemas.py:610 +#: help_to_heat/frontdoor/schemas.py:470 help_to_heat/frontdoor/schemas.py:612 msgid "No they are not insulated" msgstr "Na, dydyn nhw ddim wedi'u hinswleiddio" -#: help_to_heat/frontdoor/schemas.py:473 help_to_heat/frontdoor/schemas.py:620 +#: help_to_heat/frontdoor/schemas.py:474 help_to_heat/frontdoor/schemas.py:622 msgid "Yes, I have a loft that has not been converted into a room" msgstr "Oes, mae gen i atig sydd heb ei droi'n ystafell" -#: help_to_heat/frontdoor/schemas.py:474 help_to_heat/frontdoor/schemas.py:624 +#: help_to_heat/frontdoor/schemas.py:475 help_to_heat/frontdoor/schemas.py:626 msgid "No, I do not have a loft or my loft has been converted into a room" msgstr "Nac oes, does gen i ddim atig neu mae fy atig i wedi'i droi'n ystafell" -#: help_to_heat/frontdoor/schemas.py:477 help_to_heat/frontdoor/schemas.py:630 +#: help_to_heat/frontdoor/schemas.py:478 help_to_heat/frontdoor/schemas.py:632 msgid "Yes, there is access to my loft" msgstr "Oes, mae modd mynd i'r atig" -#: help_to_heat/frontdoor/schemas.py:478 help_to_heat/frontdoor/schemas.py:634 +#: help_to_heat/frontdoor/schemas.py:479 help_to_heat/frontdoor/schemas.py:636 msgid "No, there is no access to my loft" msgstr "Nac oes, does dim modd mynd i'r atig" -#: help_to_heat/frontdoor/schemas.py:479 help_to_heat/frontdoor/schemas.py:485 +#: help_to_heat/frontdoor/schemas.py:480 help_to_heat/frontdoor/schemas.py:487 msgid "No loft" msgstr "Dim atig" -#: help_to_heat/frontdoor/schemas.py:482 help_to_heat/frontdoor/schemas.py:698 +#: help_to_heat/frontdoor/schemas.py:483 help_to_heat/frontdoor/schemas.py:700 msgid "I have more than 100mm of loft insulation" msgstr "Mae gen i fwy na 100mm o inswleiddiad atig" -#: help_to_heat/frontdoor/schemas.py:483 help_to_heat/frontdoor/schemas.py:702 -msgid "I have up to 100mm of loft insulation" -msgstr "Mae gen i hyd at 100mm o inswleiddiad atig" +#: help_to_heat/frontdoor/schemas.py:484 help_to_heat/frontdoor/schemas.py:704 +msgid "I have less than or equal to 100mm of loft insulation" +msgstr "Mae gen i lai na 100mm o inswleiddiad atig neu’r un faint â hynny" + +#: help_to_heat/frontdoor/schemas.py:485 help_to_heat/frontdoor/schemas.py:708 +msgid "I have no loft insulation" +msgstr "Does gen i ddim inswleiddiad atig" -#: help_to_heat/frontdoor/schemas.py:494 +#: help_to_heat/frontdoor/schemas.py:496 msgid "Sits directly below the roof with no other flat above it" msgstr "Yn gorwedd yn union o dan y to heb unrhyw fflat arall uwch ei phen" -#: help_to_heat/frontdoor/schemas.py:499 +#: help_to_heat/frontdoor/schemas.py:501 msgid "Has another flat above, and another below" msgstr "Mae fflat arall uwchben, ac un arall odani" -#: help_to_heat/frontdoor/schemas.py:505 +#: help_to_heat/frontdoor/schemas.py:507 msgid "" "The lowest flat in the building with no flat beneath - typically at street " "level but may be a basement" @@ -355,24 +359,24 @@ msgstr "" "Y fflat isaf yn yr adeilad heb fflat odani - fel arfer ar lefel y stryd ond " "gall fod yn islawr" -#: help_to_heat/frontdoor/schemas.py:513 help_to_heat/frontdoor/schemas.py:535 +#: help_to_heat/frontdoor/schemas.py:515 help_to_heat/frontdoor/schemas.py:537 msgid "Does not share any of its walls with another house or building" msgstr "Nid yw'n rhannu unrhyw un o'i waliau â thŷ neu adeilad arall" -#: help_to_heat/frontdoor/schemas.py:518 help_to_heat/frontdoor/schemas.py:540 +#: help_to_heat/frontdoor/schemas.py:520 help_to_heat/frontdoor/schemas.py:542 msgid "Is attached to one other house or building" msgstr "Mae wedi'i gysylltu ag un tŷ neu adeilad arall" -#: help_to_heat/frontdoor/schemas.py:523 help_to_heat/frontdoor/schemas.py:545 +#: help_to_heat/frontdoor/schemas.py:525 help_to_heat/frontdoor/schemas.py:547 msgid "Sits in the middle with a house or building on each side" msgstr "Yn sefyll yn y canol gyda thŷ neu adeilad o boptu iddo" -#: help_to_heat/frontdoor/schemas.py:528 help_to_heat/frontdoor/schemas.py:550 +#: help_to_heat/frontdoor/schemas.py:530 help_to_heat/frontdoor/schemas.py:552 msgid "" "Sits at the end of a row of similar houses with one house attached to it" msgstr "Yn sefyll ar ben rhes o dai tebyg gydag un tŷ ynghlwm wrtho" -#: help_to_heat/frontdoor/schemas.py:590 +#: help_to_heat/frontdoor/schemas.py:592 msgid "" "Other wall types could include cob walls, timber framed, system built, steel " "framed or other non-traditional build types" @@ -380,93 +384,93 @@ msgstr "" "Gallai mathau eraill o waliau gynnwys waliau cob, waliau ffrâm pren, " "adeiladu system, fframiau dur neu fathau eraill o adeiladau anhraddodiadol" -#: help_to_heat/frontdoor/schemas.py:651 +#: help_to_heat/frontdoor/schemas.py:653 msgid "Bulb, now part of Octopus Energy" msgstr "Bulb, sydd bellach yn rhan o Octopus" -#: help_to_heat/frontdoor/schemas.py:717 +#: help_to_heat/frontdoor/schemas.py:723 msgid "Completely agree" msgstr "Cytuno'n llwyr" -#: help_to_heat/frontdoor/schemas.py:721 +#: help_to_heat/frontdoor/schemas.py:727 msgid "Agree" msgstr "Cytuno" -#: help_to_heat/frontdoor/schemas.py:725 +#: help_to_heat/frontdoor/schemas.py:731 msgid "Neutral" msgstr "Niwtral" -#: help_to_heat/frontdoor/schemas.py:729 +#: help_to_heat/frontdoor/schemas.py:735 msgid "Disagree" msgstr "Anghytuno" -#: help_to_heat/frontdoor/schemas.py:733 +#: help_to_heat/frontdoor/schemas.py:739 msgid "Completely disagree" msgstr "Anghytuno'n llwyr" -#: help_to_heat/frontdoor/schemas.py:740 +#: help_to_heat/frontdoor/schemas.py:746 msgid "Very satisfied" msgstr "Bodlon iawn" -#: help_to_heat/frontdoor/schemas.py:744 +#: help_to_heat/frontdoor/schemas.py:750 msgid "Somewhat satisfied" msgstr "Eithaf bodlon" -#: help_to_heat/frontdoor/schemas.py:748 +#: help_to_heat/frontdoor/schemas.py:754 msgid "Neither satisfied nor dissatisfied" msgstr "Ddim yn fodlon nac yn anfodlon" -#: help_to_heat/frontdoor/schemas.py:752 +#: help_to_heat/frontdoor/schemas.py:758 msgid "Somewhat dissatisfied" msgstr "Eithaf anfodlon" -#: help_to_heat/frontdoor/schemas.py:756 +#: help_to_heat/frontdoor/schemas.py:762 msgid "Very dissatisfied" msgstr "Anfodlon iawn" -#: help_to_heat/frontdoor/schemas.py:763 +#: help_to_heat/frontdoor/schemas.py:769 msgid "To find ways to reduce my energy bills" msgstr "Dod o hyd i ffyrdd i leihau fy miliau ynni" -#: help_to_heat/frontdoor/schemas.py:767 +#: help_to_heat/frontdoor/schemas.py:773 msgid "To find ways to reduce my carbon emissions" msgstr "Dod o hyd i ffyrdd i leihau fy allyriadau carbon" -#: help_to_heat/frontdoor/schemas.py:771 +#: help_to_heat/frontdoor/schemas.py:777 msgid "To find ways to install a specific measure in my home" msgstr "Dod o hyd i ffyrdd o osod mesur penodol yn fy nghartref" -#: help_to_heat/frontdoor/schemas.py:775 +#: help_to_heat/frontdoor/schemas.py:781 msgid "To find ways to improve my EPC rating" msgstr "Dod o hyd i ffyrdd i wella fy sgôr EPC" -#: help_to_heat/frontdoor/schemas.py:779 +#: help_to_heat/frontdoor/schemas.py:785 msgid "To find ways to make my home more comfortable" msgstr "Dod o hyd i ffyrdd i wneud fy nghartref yn fwy cyffyrddus" -#: help_to_heat/frontdoor/schemas.py:783 +#: help_to_heat/frontdoor/schemas.py:789 msgid "Other" msgstr "Arall" -#: help_to_heat/frontdoor/schemas.py:871 +#: help_to_heat/frontdoor/schemas.py:877 msgid "Enter a valid UK postcode" msgstr "Rhowch god post dilys yn y Deyrnas Unedig" -#: help_to_heat/frontdoor/schemas.py:876 +#: help_to_heat/frontdoor/schemas.py:882 msgid "Invalid email format" msgstr "Fformat ebost annilys" -#: help_to_heat/frontdoor/schemas.py:886 help_to_heat/frontdoor/schemas.py:890 +#: help_to_heat/frontdoor/schemas.py:892 help_to_heat/frontdoor/schemas.py:896 msgid "" "Enter a telephone number, like 01632 960 001, 07700 900 982 or +44 808 157 " "0192" msgstr "Rhowch rif ffôn, fel 01632 960 001, 07700 900 982 neu +44 808 157 0192" -#: help_to_heat/frontdoor/schemas.py:902 +#: help_to_heat/frontdoor/schemas.py:908 msgid "Energy Company Obligation 4" msgstr "Rhwymedigaeth Cwmni Ynni 4" -#: help_to_heat/frontdoor/schemas.py:903 +#: help_to_heat/frontdoor/schemas.py:909 msgid "Great British Insulation Scheme" msgstr "Cynllun Inswleiddio Mawr Prydain" From 24ffbff2f17dca7e10e47442bdadf1ed85c0ba09 Mon Sep 17 00:00:00 2001 From: Glenn Clarke Date: Wed, 13 Nov 2024 14:31:27 +0000 Subject: [PATCH 08/16] PC-1364: Update consts --- help_to_heat/frontdoor/consts.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/help_to_heat/frontdoor/consts.py b/help_to_heat/frontdoor/consts.py index 92227847..5a8d9894 100644 --- a/help_to_heat/frontdoor/consts.py +++ b/help_to_heat/frontdoor/consts.py @@ -260,7 +260,7 @@ loft_insulation_field = "loft_insulation" loft_insulation_field_more_than_threshold = "I have more than 100mm of loft insulation" -loft_insulation_field_less_than_threshold = "I have up to 100mm of loft insulation" +loft_insulation_field_less_than_threshold = "I have less than or equal to 100mm of loft insulation" loft_insulation_field_no_insulation = "I have no loft insulation" loft_insulation_field_dont_know = field_dont_know loft_insulation_field_no_loft = "No loft" From 5210d8beeeb3e15f8fa2731eaa2eb52d633f8798 Mon Sep 17 00:00:00 2001 From: Glenn Clarke Date: Wed, 13 Nov 2024 14:50:13 +0000 Subject: [PATCH 09/16] PC-1364: Update tests with new copy --- tests/test_frontdoor.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test_frontdoor.py b/tests/test_frontdoor.py index ebcb6d80..3e631db7 100644 --- a/tests/test_frontdoor.py +++ b/tests/test_frontdoor.py @@ -172,7 +172,7 @@ def _answer_house_questions( page = _check_page(page, "loft-access", "loft_access", "Yes, there is access to my loft") assert page.has_one("h1:contains('How much loft insulation do you have?')") - page = _check_page(page, "loft-insulation", "loft_insulation", "I have up to 100mm of loft insulation") + page = _check_page(page, "loft-insulation", "loft_insulation", "I have less than or equal to 100mm of loft insulation") else: page = _check_page( page, "loft", "loft", "No, I do not have a loft or my loft has been converted into a room" @@ -875,7 +875,7 @@ def test_epc_lookup_failure(): page = _check_page(page, "loft-access", "loft_access", "Yes, there is access to my loft") assert page.has_one("h1:contains('How much loft insulation do you have?')") - page = _check_page(page, "loft-insulation", "loft_insulation", "I have up to 100mm of loft insulation") + page = _check_page(page, "loft-insulation", "loft_insulation", "I have less than or equal to 100mm of loft insulation") assert page.has_one("h1:contains('Check your answers')") form = page.get_form() From 149bd3cffe62e62db539f9472d2034a91d081d92 Mon Sep 17 00:00:00 2001 From: Glenn Clarke Date: Wed, 13 Nov 2024 16:39:39 +0000 Subject: [PATCH 10/16] PC-1364: Update tests & add additional references to new answer --- help_to_heat/frontdoor/interface.py | 7 +++++++ help_to_heat/locale/cy/LC_MESSAGES/django.po | 2 +- tests/routing/__init__.py | 2 ++ tests/routing/test_forwards_routing.py | 2 ++ tests/test_frontdoor.py | 12 +++++++++--- 5 files changed, 21 insertions(+), 4 deletions(-) diff --git a/help_to_heat/frontdoor/interface.py b/help_to_heat/frontdoor/interface.py index 0311c940..25afe123 100644 --- a/help_to_heat/frontdoor/interface.py +++ b/help_to_heat/frontdoor/interface.py @@ -24,6 +24,8 @@ loft_field, loft_field_no, loft_insulation_field, + loft_insulation_field_less_than_threshold, + loft_insulation_field_no_insulation, loft_insulation_field_no_loft, park_home_main_residence_field, property_subtype_field, @@ -250,6 +252,11 @@ def create_referral(self, session_id): given_answers[loft_access_field] = loft_access_field_no_loft given_answers[loft_insulation_field] = loft_insulation_field_no_loft + # override "no insulation" to "less than threshold" + loft_insulation = given_answers.get(loft_insulation_field) + if loft_insulation == given_answers.get(loft_insulation_field_no_insulation): + given_answers[loft_insulation_field] = loft_insulation_field_less_than_threshold + # ensure not found EPCs are displayed as such # this will normally be set as an answer on pressing submit on 'address' page # though this is not guaranteed, ie if user presses to enter manually diff --git a/help_to_heat/locale/cy/LC_MESSAGES/django.po b/help_to_heat/locale/cy/LC_MESSAGES/django.po index bf457433..e7aec9ec 100644 --- a/help_to_heat/locale/cy/LC_MESSAGES/django.po +++ b/help_to_heat/locale/cy/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-11-13 14:20+0000\n" +"POT-Creation-Date: 2024-11-13 16:38+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/tests/routing/__init__.py b/tests/routing/__init__.py index f0daa9d9..7df7f519 100644 --- a/tests/routing/__init__.py +++ b/tests/routing/__init__.py @@ -46,6 +46,7 @@ loft_insulation_field_dont_know, loft_insulation_field_less_than_threshold, loft_insulation_field_more_than_threshold, + loft_insulation_field_no_insulation, no_epc_field, number_of_bedrooms_field, number_of_bedrooms_field_one, @@ -521,6 +522,7 @@ def get_loft_insulation_answers(): answers = next(get_loft_access_answers()) yield {**answers, loft_insulation_field: loft_insulation_field_more_than_threshold} yield {**answers, loft_insulation_field: loft_insulation_field_less_than_threshold} + yield {**answers, loft_insulation_field: loft_insulation_field_no_insulation} yield {**answers, loft_insulation_field: loft_insulation_field_dont_know} diff --git a/tests/routing/test_forwards_routing.py b/tests/routing/test_forwards_routing.py index 42a08619..e7c2ee26 100644 --- a/tests/routing/test_forwards_routing.py +++ b/tests/routing/test_forwards_routing.py @@ -57,6 +57,7 @@ loft_insulation_field_dont_know, loft_insulation_field_less_than_threshold, loft_insulation_field_more_than_threshold, + loft_insulation_field_no_insulation, loft_insulation_page, loft_page, no_epc_page, @@ -736,6 +737,7 @@ def test_loft_access_next_page(loft_access): [ loft_insulation_field_more_than_threshold, loft_insulation_field_less_than_threshold, + loft_insulation_field_no_insulation, loft_insulation_field_dont_know, ], ) diff --git a/tests/test_frontdoor.py b/tests/test_frontdoor.py index 3e631db7..aa05b550 100644 --- a/tests/test_frontdoor.py +++ b/tests/test_frontdoor.py @@ -172,7 +172,9 @@ def _answer_house_questions( page = _check_page(page, "loft-access", "loft_access", "Yes, there is access to my loft") assert page.has_one("h1:contains('How much loft insulation do you have?')") - page = _check_page(page, "loft-insulation", "loft_insulation", "I have less than or equal to 100mm of loft insulation") + page = _check_page( + page, "loft-insulation", "loft_insulation", "I have less than or equal to 100mm of loft insulation" + ) else: page = _check_page( page, "loft", "loft", "No, I do not have a loft or my loft has been converted into a room" @@ -875,7 +877,9 @@ def test_epc_lookup_failure(): page = _check_page(page, "loft-access", "loft_access", "Yes, there is access to my loft") assert page.has_one("h1:contains('How much loft insulation do you have?')") - page = _check_page(page, "loft-insulation", "loft_insulation", "I have less than or equal to 100mm of loft insulation") + page = _check_page( + page, "loft-insulation", "loft_insulation", "I have less than or equal to 100mm of loft insulation" + ) assert page.has_one("h1:contains('Check your answers')") form = page.get_form() @@ -1598,7 +1602,9 @@ def test_on_check_page_back_button_goes_to_correct_location(has_loft_insulation) page = _check_page(page, "loft-access", "loft_access", "Yes, there is access to my loft") assert page.has_one("h1:contains('How much loft insulation do you have?')") - page = _check_page(page, "loft-insulation", "loft_insulation", "I have up to 100mm of loft insulation") + page = _check_page( + page, "loft-insulation", "loft_insulation", "I have less than or equal to 100mm of loft insulation" + ) else: page = _check_page(page, "loft", "loft", "No, I do not have a loft or my loft has been converted into a room") From c2ac62e643dae2cd2f4514a0b5a8ec3b250336a9 Mon Sep 17 00:00:00 2001 From: Glenn Clarke Date: Wed, 13 Nov 2024 17:22:57 +0000 Subject: [PATCH 11/16] PC-1364: Add further context on override --- help_to_heat/frontdoor/interface.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/help_to_heat/frontdoor/interface.py b/help_to_heat/frontdoor/interface.py index 25afe123..44e8393a 100644 --- a/help_to_heat/frontdoor/interface.py +++ b/help_to_heat/frontdoor/interface.py @@ -252,7 +252,9 @@ def create_referral(self, session_id): given_answers[loft_access_field] = loft_access_field_no_loft given_answers[loft_insulation_field] = loft_insulation_field_no_loft - # override "no insulation" to "less than threshold" + # Users are given the option to select "no insulation" to improve question usability + # This and "below threshold" are functionally identical from the supplier point of view. + # They will be combined before the suppliers see it to improve supplier usability loft_insulation = given_answers.get(loft_insulation_field) if loft_insulation == given_answers.get(loft_insulation_field_no_insulation): given_answers[loft_insulation_field] = loft_insulation_field_less_than_threshold From 4a86cf367b3cc440285dd3c3918a3f39e0d44770 Mon Sep 17 00:00:00 2001 From: Samuel Young Date: Wed, 6 Nov 2024 13:35:00 +0000 Subject: [PATCH 12/16] PC-1116: account for None responses from EPC API --- help_to_heat/frontdoor/interface.py | 2 ++ help_to_heat/frontdoor/views.py | 10 ++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/help_to_heat/frontdoor/interface.py b/help_to_heat/frontdoor/interface.py index 44e8393a..bb55828c 100644 --- a/help_to_heat/frontdoor/interface.py +++ b/help_to_heat/frontdoor/interface.py @@ -606,6 +606,8 @@ def get_epc_scotland(self, uprn): def get_address_and_epc_lmk(self, building_name_or_number, postcode): epc_api = EPCApi() data = epc_api.search_epc_details(building_name_or_number, postcode) + if data is None: + return [] address_and_epc_details = data["rows"] return address_and_epc_details diff --git a/help_to_heat/frontdoor/views.py b/help_to_heat/frontdoor/views.py index 4a39e461..13620f78 100644 --- a/help_to_heat/frontdoor/views.py +++ b/help_to_heat/frontdoor/views.py @@ -622,10 +622,16 @@ def save_post_data(self, data, session_id, page_name): building_name_or_number = data.get(address_building_name_or_number_field) postcode = data.get(address_postcode_field) try: - data[address_choice_field] = address_choice_field_write_address if country != country_field_scotland: address_and_lmk_details = interface.api.epc.get_address_and_epc_lmk(building_name_or_number, postcode) - data[address_all_address_and_lmk_details_field] = address_and_lmk_details + + if len(address_and_lmk_details) > 0: + data[address_all_address_and_lmk_details_field] = address_and_lmk_details + data[address_choice_field] = address_choice_field_write_address + else: + data[address_choice_field] = address_choice_field_epc_api_fail + else: + data[address_choice_field] = address_choice_field_write_address except Exception as e: # noqa: B902 logger.exception(f"An error occurred: {e}") data[address_choice_field] = address_choice_field_epc_api_fail From 836104cb220e914e32ee420460b82b1275a8242c Mon Sep 17 00:00:00 2001 From: Glenn Clarke Date: Thu, 14 Nov 2024 10:27:59 +0000 Subject: [PATCH 13/16] PC-1116: Update extract translations --- help_to_heat/locale/cy/LC_MESSAGES/django.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/help_to_heat/locale/cy/LC_MESSAGES/django.po b/help_to_heat/locale/cy/LC_MESSAGES/django.po index e7aec9ec..d0a2ffa4 100644 --- a/help_to_heat/locale/cy/LC_MESSAGES/django.po +++ b/help_to_heat/locale/cy/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-11-13 16:38+0000\n" +"POT-Creation-Date: 2024-11-14 10:27+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -671,7 +671,7 @@ msgstr "Fflat" msgid "Maisonette" msgstr "Fflat deulawr" -#: help_to_heat/frontdoor/views.py:661 help_to_heat/frontdoor/views.py:731 +#: help_to_heat/frontdoor/views.py:667 help_to_heat/frontdoor/views.py:737 msgid "I cannot find my address, I want to enter it manually" msgstr "Dwi'n methu gweld fy nghyfeiriad i. Hoffwn ei roi fy hunan." From 0e97605b125447636bb32c185b36e2f43e51e50d Mon Sep 17 00:00:00 2001 From: Glenn Clarke Date: Thu, 14 Nov 2024 14:30:53 +0000 Subject: [PATCH 14/16] PC-1423: Update month names for new dump --- help_to_heat/utils.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/help_to_heat/utils.py b/help_to_heat/utils.py index 66328ee2..a9e96382 100644 --- a/help_to_heat/utils.py +++ b/help_to_heat/utils.py @@ -240,11 +240,12 @@ def get_current_and_next_month_names(month_names): return current_month, next_month -# Q1 january -> april -# Q2 april -> july -# Q3 july -> october -# Q4 october -> january +# Q1 january -> may +# Q2 april -> august +# Q3 july -> november +# Q4 october -> february # we update the month names manually on each scottish data dump # this is to tell the user the month of the last dump, and expected month of next dump +# the quarters overlap by one month, as the dump takes place roughly at the end of a month def get_current_and_next_quarter_month_names(month_names): - return month_names[6], month_names[9] + return month_names[9], month_names[1] From c30d23f1fd6947dc6c6699fa764a333fcf1322d6 Mon Sep 17 00:00:00 2001 From: Glenn Clarke Date: Fri, 15 Nov 2024 16:04:50 +0000 Subject: [PATCH 15/16] PC-1423: Update comment & function name for clarity --- help_to_heat/frontdoor/views.py | 8 ++++++-- help_to_heat/utils.py | 14 +++++++------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/help_to_heat/frontdoor/views.py b/help_to_heat/frontdoor/views.py index 13620f78..a5f81dcf 100644 --- a/help_to_heat/frontdoor/views.py +++ b/help_to_heat/frontdoor/views.py @@ -887,7 +887,9 @@ def build_extra_context(self, request, session_id, page_name, data, is_change_pa gds_epc_date = None current_month, next_month = utils.get_current_and_next_month_names(month_names) - current_quarter_month, next_quarter_month = utils.get_current_and_next_quarter_month_names(month_names) + current_quarter_month, next_quarter_month = utils.get_current_scottish_epc_cutoff_and_next_dump_month_names( + month_names + ) context = { "epc_rating": epc_band.upper() if epc_band else "", @@ -921,7 +923,9 @@ def build_extra_context(self, request, session_id, page_name, data, is_change_pa country = session_data.get(country_field) current_month, next_month = utils.get_current_and_next_month_names(month_names) - current_quarter_month, next_quarter_month = utils.get_current_and_next_quarter_month_names(month_names) + current_quarter_month, next_quarter_month = utils.get_current_scottish_epc_cutoff_and_next_dump_month_names( + month_names + ) show_month_wording = country in [country_field_england, country_field_wales] diff --git a/help_to_heat/utils.py b/help_to_heat/utils.py index a9e96382..88aa8bfe 100644 --- a/help_to_heat/utils.py +++ b/help_to_heat/utils.py @@ -240,12 +240,12 @@ def get_current_and_next_month_names(month_names): return current_month, next_month -# Q1 january -> may -# Q2 april -> august -# Q3 july -> november -# Q4 october -> february +# Latest Quarter in current dump -> epc cutoff month, next expected dump month +# Q1 -> april, august +# Q2 -> july, november +# Q3 -> october, february +# Q4 -> january, may # we update the month names manually on each scottish data dump -# this is to tell the user the month of the last dump, and expected month of next dump -# the quarters overlap by one month, as the dump takes place roughly at the end of a month -def get_current_and_next_quarter_month_names(month_names): +# this is to tell the user the first month we have no EPCs for, and the next month we expect to perform a dump +def get_current_scottish_epc_cutoff_and_next_dump_month_names(month_names): return month_names[9], month_names[1] From a6a078f0b42e9e7abe756274ed412c0541e06cb0 Mon Sep 17 00:00:00 2001 From: Glenn Clarke Date: Fri, 15 Nov 2024 17:46:42 +0000 Subject: [PATCH 16/16] PC-1423: Update further variables in line with function name change --- help_to_heat/frontdoor/views.py | 22 +++++++------- help_to_heat/locale/cy/LC_MESSAGES/django.mo | Bin 96020 -> 96060 bytes help_to_heat/locale/cy/LC_MESSAGES/django.po | 29 ++++++++++--------- help_to_heat/templates/frontdoor/epc.html | 2 +- help_to_heat/templates/frontdoor/no-epc.html | 2 +- 5 files changed, 29 insertions(+), 26 deletions(-) diff --git a/help_to_heat/frontdoor/views.py b/help_to_heat/frontdoor/views.py index a5f81dcf..4728128f 100644 --- a/help_to_heat/frontdoor/views.py +++ b/help_to_heat/frontdoor/views.py @@ -887,9 +887,10 @@ def build_extra_context(self, request, session_id, page_name, data, is_change_pa gds_epc_date = None current_month, next_month = utils.get_current_and_next_month_names(month_names) - current_quarter_month, next_quarter_month = utils.get_current_scottish_epc_cutoff_and_next_dump_month_names( - month_names - ) + ( + scottish_epc_cutoff_month, + next_scottish_dump_month, + ) = utils.get_current_scottish_epc_cutoff_and_next_dump_month_names(month_names) context = { "epc_rating": epc_band.upper() if epc_band else "", @@ -897,8 +898,8 @@ def build_extra_context(self, request, session_id, page_name, data, is_change_pa "epc_date": epc_date, "current_month": current_month, "next_month": next_month, - "current_quarter_month": current_quarter_month, - "next_quarter_month": next_quarter_month, + "scottish_epc_cutoff_month": scottish_epc_cutoff_month, + "next_scottish_dump_month": next_scottish_dump_month, "property_type": property_type, "epc_display_options": schemas.epc_display_options_map, "address": address, @@ -923,17 +924,18 @@ def build_extra_context(self, request, session_id, page_name, data, is_change_pa country = session_data.get(country_field) current_month, next_month = utils.get_current_and_next_month_names(month_names) - current_quarter_month, next_quarter_month = utils.get_current_scottish_epc_cutoff_and_next_dump_month_names( - month_names - ) + ( + scottish_epc_cutoff_month, + next_scottish_dump_month, + ) = utils.get_current_scottish_epc_cutoff_and_next_dump_month_names(month_names) show_month_wording = country in [country_field_england, country_field_wales] return { "current_month": current_month, "next_month": next_month, - "current_quarter_month": current_quarter_month, - "next_quarter_month": next_quarter_month, + "scottish_epc_cutoff_month": scottish_epc_cutoff_month, + "next_scottish_dump_month": next_scottish_dump_month, "show_month_wording": show_month_wording, } diff --git a/help_to_heat/locale/cy/LC_MESSAGES/django.mo b/help_to_heat/locale/cy/LC_MESSAGES/django.mo index 3755f9ce346fb26cba25a8de3cb96a8c53d799fe..e38181c786cab9a171f5fb6619c3ac4ef03a8cfe 100644 GIT binary patch delta 8142 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 HXqEdfT|-Ob delta 8117 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 diff --git a/help_to_heat/locale/cy/LC_MESSAGES/django.po b/help_to_heat/locale/cy/LC_MESSAGES/django.po index d0a2ffa4..787e6cd7 100644 --- a/help_to_heat/locale/cy/LC_MESSAGES/django.po +++ b/help_to_heat/locale/cy/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-11-14 10:27+0000\n" +"POT-Creation-Date: 2024-11-15 17:05+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1577,17 +1577,18 @@ msgstr "" #: help_to_heat/templates/frontdoor/epc.html:26 #, python-format msgid "" -"If your property has had a new EPC issued since 1 %(current_quarter_month)s, " -"we may not be able to find it in our database because it is only updated " -"quarterly. If you do not recognise the EPC below as your most recent one, " -"please return to this service after 1 %(next_quarter_month)s when we expect " -"the database to have been updated." +"If your property has had a new EPC issued since 1 " +"%(scottish_epc_cutoff_month)s, we may not be able to find it in our database " +"because it is only updated quarterly. If you do not recognise the EPC below " +"as your most recent one, please return to this service after 1 " +"%(next_scottish_dump_month)s when we expect the database to have been " +"updated." msgstr "" "Os oes EPC newydd wedi'i rhoi i’ch eiddo chi ers 1 " -"%(current_quarter_month)s, efallai na fyddwn yn gallu dod o hyd iddi yn ein " +"%(scottish_epc_cutoff_month)s, efallai na fyddwn yn gallu dod o hyd iddi yn ein " "cronfa ddata am mai dim ond bob chwarter y bydd honno’n cael ei diweddaru. " "Os nad ydych chi’n adnabod yr EPC isod fel eich un ddiweddaraf chi, dewch yn " -"ôl i'r gwasanaeth yma ar ôl 1 %(next_quarter_month)s pan ydyn ni’n disgwyl y " +"ôl i'r gwasanaeth yma ar ôl 1 %(next_scottish_dump_month)s pan ydyn ni’n disgwyl y " "bydd y gronfa ddata wedi'i diweddaru." #: help_to_heat/templates/frontdoor/epc.html:29 @@ -2114,15 +2115,15 @@ msgstr "" #: help_to_heat/templates/frontdoor/no-epc.html:24 #, python-format msgid "" -"If your property was issued an EPC since 1 %(current_quarter_month)s, we may " -"not be able to find it in our database because it is updated quarterly. " -"Please return to this service after 1 %(next_quarter_month)s when we expect " -"the database to have been updated." +"If your property was issued an EPC since 1 %(scottish_epc_cutoff_month)s, we " +"may not be able to find it in our database because it is updated quarterly. " +"Please return to this service after 1 %(next_scottish_dump_month)s when we " +"expect the database to have been updated." msgstr "" -"Os yw’ch eiddo wedi cael EPC ers 1 %(current_quarter_month)s, efallai na " +"Os yw’ch eiddo wedi cael EPC ers 1 %(scottish_epc_cutoff_month)s, efallai na " "fyddwn yn gallu dod o hyd iddi yn ein cronfa ddata am mai bob chwarter y " "bydd honno’n cael ei diweddaru. Dewch yn ôl i’r gwasanaeth yma ar ôl 1 " -"%(next_quarter_month)s pan ydyn ni’n disgwyl y bydd y gronfa ddata wedi'i " +"%(next_scottish_dump_month)s pan ydyn ni’n disgwyl y bydd y gronfa ddata wedi'i " "diweddaru." #: help_to_heat/templates/frontdoor/no-epc.html:27 diff --git a/help_to_heat/templates/frontdoor/epc.html b/help_to_heat/templates/frontdoor/epc.html index 4f65e0cb..7a1228e8 100644 --- a/help_to_heat/templates/frontdoor/epc.html +++ b/help_to_heat/templates/frontdoor/epc.html @@ -23,7 +23,7 @@

{{_("We found an Energy Performance Certificate that {% if show_monthly_epc_update_details %} {{_("If your property has had a new EPC issued since 1 %(current_month)s, we may not be able to find it in our database because it is only updated monthly. If you do not recognise the EPC below as your most recent one, please return to this service after 1 %(next_month)s when we expect the database to have been updated.") % { "current_month": current_month, "next_month": next_month }}} {% else %} - {{_("If your property has had a new EPC issued since 1 %(current_quarter_month)s, we may not be able to find it in our database because it is only updated quarterly. If you do not recognise the EPC below as your most recent one, please return to this service after 1 %(next_quarter_month)s when we expect the database to have been updated.") % { "current_quarter_month": current_quarter_month, "next_quarter_month": next_quarter_month }}} + {{_("If your property has had a new EPC issued since 1 %(scottish_epc_cutoff_month)s, we may not be able to find it in our database because it is only updated quarterly. If you do not recognise the EPC below as your most recent one, please return to this service after 1 %(next_scottish_dump_month)s when we expect the database to have been updated.") % { "scottish_epc_cutoff_month": scottish_epc_cutoff_month, "next_scottish_dump_month": next_scottish_dump_month }}} {% endif %}
{{_("You can continue with your old EPC but the energy supplier you have selected may not be able to help based on an out-of-date EPC")}} diff --git a/help_to_heat/templates/frontdoor/no-epc.html b/help_to_heat/templates/frontdoor/no-epc.html index 4e6968a2..65efcf91 100644 --- a/help_to_heat/templates/frontdoor/no-epc.html +++ b/help_to_heat/templates/frontdoor/no-epc.html @@ -21,7 +21,7 @@

{{_("We could not find an Energy Performance Certifi {% if show_month_wording %}

{{_("If your property has had a new EPC issued since 1 %(current_month)s, we may not be able to find it in our database because it is only updated monthly. Please return to this service after 1 %(next_month)s when we expect the database to have been updated.") % { "current_month": current_month, "next_month": next_month }}}

{% else %} -

{{_("If your property was issued an EPC since 1 %(current_quarter_month)s, we may not be able to find it in our database because it is updated quarterly. Please return to this service after 1 %(next_quarter_month)s when we expect the database to have been updated.") % { "current_quarter_month": current_quarter_month, "next_quarter_month": next_quarter_month }}}

+

{{_("If your property was issued an EPC since 1 %(scottish_epc_cutoff_month)s, we may not be able to find it in our database because it is updated quarterly. Please return to this service after 1 %(next_scottish_dump_month)s when we expect the database to have been updated.") % { "scottish_epc_cutoff_month": scottish_epc_cutoff_month, "next_scottish_dump_month": next_scottish_dump_month }}}

{% endif %}

{{_("You may continue using this service without an EPC.")}}