From a65b10a527ed30c7ee7cbc9d3e9782fb32aa92ca Mon Sep 17 00:00:00 2001 From: Samuel Young Date: Wed, 18 Dec 2024 15:02:04 +0000 Subject: [PATCH 1/2] PC-1515: Add old copy to check_your_answers_options_map this avoids a key not found error for old users --- help_to_heat/frontdoor/schemas.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/help_to_heat/frontdoor/schemas.py b/help_to_heat/frontdoor/schemas.py index fc987323..857c792e 100644 --- a/help_to_heat/frontdoor/schemas.py +++ b/help_to_heat/frontdoor/schemas.py @@ -420,6 +420,9 @@ "Apartment, flat or maisonette": _("apartment, flat or maisonette"), } +# if wording changes, old answers should be left in this map +# otherwise, an error will be thrown on check answers page for these old users +# see loft_insulation_field for an example check_your_answers_options_map = { country_field: { country_field_england: _("England"), @@ -489,6 +492,8 @@ 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"), + # deprecated as part of PC-1364. see comment on this map + "I have up to 100mm of loft insulation": _("I have less than or equal to 100mm of loft insulation"), }, } From 3e577f41363a3df01c47487e4e827cb79a61e1e1 Mon Sep 17 00:00:00 2001 From: Samuel Young Date: Wed, 18 Dec 2024 15:20:06 +0000 Subject: [PATCH 2/2] PC-1515: Extract translations --- help_to_heat/locale/cy/LC_MESSAGES/django.po | 159 ++++++++++--------- 1 file changed, 80 insertions(+), 79 deletions(-) diff --git a/help_to_heat/locale/cy/LC_MESSAGES/django.po b/help_to_heat/locale/cy/LC_MESSAGES/django.po index 91cfc4dd..07e0667d 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-12-16 13:37+0000\n" +"POT-Creation-Date: 2024-12-19 12:28+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -114,15 +114,15 @@ msgstr "Rhif ffôn" msgid "Email" msgstr "Ebost" -#: help_to_heat/frontdoor/schemas.py:282 help_to_heat/frontdoor/schemas.py:425 +#: help_to_heat/frontdoor/schemas.py:282 help_to_heat/frontdoor/schemas.py:428 msgid "England" msgstr "Lloegr" -#: help_to_heat/frontdoor/schemas.py:286 help_to_heat/frontdoor/schemas.py:426 +#: help_to_heat/frontdoor/schemas.py:286 help_to_heat/frontdoor/schemas.py:429 msgid "Scotland" msgstr "Yr Alban" -#: help_to_heat/frontdoor/schemas.py:290 help_to_heat/frontdoor/schemas.py:427 +#: help_to_heat/frontdoor/schemas.py:290 help_to_heat/frontdoor/schemas.py:430 msgid "Wales" msgstr "Cymru" @@ -130,11 +130,11 @@ msgstr "Cymru" msgid "Northern Ireland" msgstr "Gogledd Iwerddon" -#: help_to_heat/frontdoor/schemas.py:301 help_to_heat/frontdoor/schemas.py:430 +#: help_to_heat/frontdoor/schemas.py:301 help_to_heat/frontdoor/schemas.py:433 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:305 help_to_heat/frontdoor/schemas.py:431 +#: help_to_heat/frontdoor/schemas.py:305 help_to_heat/frontdoor/schemas.py:434 msgid "No, I am a tenant" msgstr "Nac ydy. Tenant ydw i" @@ -148,11 +148,11 @@ 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:313 help_to_heat/frontdoor/schemas.py:432 +#: help_to_heat/frontdoor/schemas.py:313 help_to_heat/frontdoor/schemas.py:435 msgid "No, I am a social housing tenant" msgstr "Nac ydy. Dwi'n denant tai cymdeithasol" -#: help_to_heat/frontdoor/schemas.py:321 help_to_heat/frontdoor/schemas.py:433 +#: help_to_heat/frontdoor/schemas.py:321 help_to_heat/frontdoor/schemas.py:436 msgid "" "Yes, I am the property owner but I lease the property to one or more tenants" msgstr "" @@ -181,35 +181,35 @@ msgstr "Nage" 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:385 help_to_heat/frontdoor/schemas.py:439 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:389 help_to_heat/frontdoor/schemas.py:440 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:395 help_to_heat/frontdoor/schemas.py:443 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:399 help_to_heat/frontdoor/schemas.py:444 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:405 help_to_heat/frontdoor/schemas.py:447 #: help_to_heat/frontdoor/views.py:270 msgid "House" msgstr "Tŷ" -#: help_to_heat/frontdoor/schemas.py:409 help_to_heat/frontdoor/schemas.py:445 +#: help_to_heat/frontdoor/schemas.py:409 help_to_heat/frontdoor/schemas.py:448 #: help_to_heat/frontdoor/views.py:269 msgid "Bungalow" msgstr "Byngalo" -#: help_to_heat/frontdoor/schemas.py:413 help_to_heat/frontdoor/schemas.py:446 +#: help_to_heat/frontdoor/schemas.py:413 help_to_heat/frontdoor/schemas.py:449 msgid "Apartment, flat or maisonette" msgstr "Rhandy, fflat neu fflat ddeulawr" @@ -225,133 +225,134 @@ msgstr "fyngalo" msgid "apartment, flat or maisonette" msgstr "randy, fflat neu fflat ddeulawr" -#: help_to_heat/frontdoor/schemas.py:447 help_to_heat/frontdoor/views.py:272 +#: help_to_heat/frontdoor/schemas.py:450 help_to_heat/frontdoor/views.py:272 msgid "Park home" msgstr "Cartref mewn parc" -#: help_to_heat/frontdoor/schemas.py:450 help_to_heat/frontdoor/schemas.py:518 -#: help_to_heat/frontdoor/schemas.py:540 +#: help_to_heat/frontdoor/schemas.py:453 help_to_heat/frontdoor/schemas.py:523 +#: help_to_heat/frontdoor/schemas.py:545 msgid "Detached" msgstr "Tŷ sengl" -#: help_to_heat/frontdoor/schemas.py:451 help_to_heat/frontdoor/schemas.py:523 -#: help_to_heat/frontdoor/schemas.py:545 +#: help_to_heat/frontdoor/schemas.py:454 help_to_heat/frontdoor/schemas.py:528 +#: help_to_heat/frontdoor/schemas.py:550 msgid "Semi-detached" msgstr "Tŷ pâr" -#: help_to_heat/frontdoor/schemas.py:452 help_to_heat/frontdoor/schemas.py:528 -#: help_to_heat/frontdoor/schemas.py:550 +#: help_to_heat/frontdoor/schemas.py:455 help_to_heat/frontdoor/schemas.py:533 +#: help_to_heat/frontdoor/schemas.py:555 msgid "Terraced" msgstr "Tŷ teras" -#: help_to_heat/frontdoor/schemas.py:453 help_to_heat/frontdoor/schemas.py:533 -#: help_to_heat/frontdoor/schemas.py:555 +#: help_to_heat/frontdoor/schemas.py:456 help_to_heat/frontdoor/schemas.py:538 +#: help_to_heat/frontdoor/schemas.py:560 msgid "End terrace" msgstr "Tŷ pen teras" -#: help_to_heat/frontdoor/schemas.py:454 help_to_heat/frontdoor/schemas.py:499 +#: help_to_heat/frontdoor/schemas.py:457 help_to_heat/frontdoor/schemas.py:504 msgid "Top floor" msgstr "Llawr uchaf" -#: help_to_heat/frontdoor/schemas.py:455 help_to_heat/frontdoor/schemas.py:504 +#: help_to_heat/frontdoor/schemas.py:458 help_to_heat/frontdoor/schemas.py:509 msgid "Middle floor" msgstr "Llawr canol" -#: help_to_heat/frontdoor/schemas.py:456 help_to_heat/frontdoor/schemas.py:509 +#: help_to_heat/frontdoor/schemas.py:459 help_to_heat/frontdoor/schemas.py:514 msgid "Ground floor" msgstr "Llawr daear" -#: help_to_heat/frontdoor/schemas.py:459 help_to_heat/frontdoor/schemas.py:563 +#: help_to_heat/frontdoor/schemas.py:462 help_to_heat/frontdoor/schemas.py:568 msgid "Studio" msgstr "Stiwdio" -#: help_to_heat/frontdoor/schemas.py:460 help_to_heat/frontdoor/schemas.py:567 +#: help_to_heat/frontdoor/schemas.py:463 help_to_heat/frontdoor/schemas.py:572 msgid "One bedroom" msgstr "Un ystafell wely" -#: help_to_heat/frontdoor/schemas.py:461 help_to_heat/frontdoor/schemas.py:571 +#: help_to_heat/frontdoor/schemas.py:464 help_to_heat/frontdoor/schemas.py:576 msgid "Two bedrooms" msgstr "Dwy ystafell wely" -#: help_to_heat/frontdoor/schemas.py:462 help_to_heat/frontdoor/schemas.py:575 +#: help_to_heat/frontdoor/schemas.py:465 help_to_heat/frontdoor/schemas.py:580 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:582 +#: help_to_heat/frontdoor/schemas.py:468 help_to_heat/frontdoor/schemas.py:587 msgid "Solid walls" msgstr "Waliau solet" -#: help_to_heat/frontdoor/schemas.py:466 help_to_heat/frontdoor/schemas.py:586 +#: help_to_heat/frontdoor/schemas.py:469 help_to_heat/frontdoor/schemas.py:591 msgid "Cavity walls" msgstr "Waliau ceudod" -#: help_to_heat/frontdoor/schemas.py:467 help_to_heat/frontdoor/schemas.py:590 +#: help_to_heat/frontdoor/schemas.py:470 help_to_heat/frontdoor/schemas.py:595 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:594 +#: help_to_heat/frontdoor/schemas.py:471 help_to_heat/frontdoor/schemas.py:599 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:469 help_to_heat/frontdoor/schemas.py:475 -#: help_to_heat/frontdoor/schemas.py:490 help_to_heat/frontdoor/schemas.py:602 -#: help_to_heat/frontdoor/schemas.py:620 help_to_heat/frontdoor/schemas.py:716 +#: help_to_heat/frontdoor/schemas.py:472 help_to_heat/frontdoor/schemas.py:478 +#: help_to_heat/frontdoor/schemas.py:493 help_to_heat/frontdoor/schemas.py:607 +#: help_to_heat/frontdoor/schemas.py:625 help_to_heat/frontdoor/schemas.py:721 msgid "I do not know" msgstr "Wn i ddim" -#: help_to_heat/frontdoor/schemas.py:472 help_to_heat/frontdoor/schemas.py:608 +#: help_to_heat/frontdoor/schemas.py:475 help_to_heat/frontdoor/schemas.py:613 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:612 +#: help_to_heat/frontdoor/schemas.py:476 help_to_heat/frontdoor/schemas.py:617 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:616 +#: help_to_heat/frontdoor/schemas.py:477 help_to_heat/frontdoor/schemas.py:621 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:626 +#: help_to_heat/frontdoor/schemas.py:481 help_to_heat/frontdoor/schemas.py:631 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:630 +#: help_to_heat/frontdoor/schemas.py:482 help_to_heat/frontdoor/schemas.py:635 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:636 +#: help_to_heat/frontdoor/schemas.py:485 help_to_heat/frontdoor/schemas.py:641 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:640 +#: help_to_heat/frontdoor/schemas.py:486 help_to_heat/frontdoor/schemas.py:645 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:491 +#: help_to_heat/frontdoor/schemas.py:487 help_to_heat/frontdoor/schemas.py:494 msgid "No loft" msgstr "Dim atig" -#: help_to_heat/frontdoor/schemas.py:487 help_to_heat/frontdoor/schemas.py:704 +#: help_to_heat/frontdoor/schemas.py:490 help_to_heat/frontdoor/schemas.py:709 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:708 +#: help_to_heat/frontdoor/schemas.py:491 help_to_heat/frontdoor/schemas.py:496 +#: help_to_heat/frontdoor/schemas.py:713 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:489 help_to_heat/frontdoor/schemas.py:712 +#: help_to_heat/frontdoor/schemas.py:492 help_to_heat/frontdoor/schemas.py:717 msgid "I have no loft insulation" msgstr "Does gen i ddim inswleiddiad atig" -#: help_to_heat/frontdoor/schemas.py:500 +#: help_to_heat/frontdoor/schemas.py:505 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:505 +#: help_to_heat/frontdoor/schemas.py:510 msgid "Has another flat above, and another below" msgstr "Mae fflat arall uwchben, ac un arall odani" -#: help_to_heat/frontdoor/schemas.py:511 +#: help_to_heat/frontdoor/schemas.py:516 msgid "" "The lowest flat in the building with no flat beneath - typically at street " "level but may be a basement" @@ -359,24 +360,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:519 help_to_heat/frontdoor/schemas.py:541 +#: help_to_heat/frontdoor/schemas.py:524 help_to_heat/frontdoor/schemas.py:546 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:524 help_to_heat/frontdoor/schemas.py:546 +#: help_to_heat/frontdoor/schemas.py:529 help_to_heat/frontdoor/schemas.py:551 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:529 help_to_heat/frontdoor/schemas.py:551 +#: help_to_heat/frontdoor/schemas.py:534 help_to_heat/frontdoor/schemas.py:556 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:534 help_to_heat/frontdoor/schemas.py:556 +#: help_to_heat/frontdoor/schemas.py:539 help_to_heat/frontdoor/schemas.py:561 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:596 +#: help_to_heat/frontdoor/schemas.py:601 msgid "" "Other wall types could include cob walls, timber framed, system built, steel " "framed or other non-traditional build types" @@ -384,93 +385,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:657 +#: help_to_heat/frontdoor/schemas.py:662 msgid "Bulb, now part of Octopus Energy" msgstr "Bulb, sydd bellach yn rhan o Octopus" -#: help_to_heat/frontdoor/schemas.py:727 +#: help_to_heat/frontdoor/schemas.py:732 msgid "Completely agree" msgstr "Cytuno'n llwyr" -#: help_to_heat/frontdoor/schemas.py:731 +#: help_to_heat/frontdoor/schemas.py:736 msgid "Agree" msgstr "Cytuno" -#: help_to_heat/frontdoor/schemas.py:735 +#: help_to_heat/frontdoor/schemas.py:740 msgid "Neutral" msgstr "Niwtral" -#: help_to_heat/frontdoor/schemas.py:739 +#: help_to_heat/frontdoor/schemas.py:744 msgid "Disagree" msgstr "Anghytuno" -#: help_to_heat/frontdoor/schemas.py:743 +#: help_to_heat/frontdoor/schemas.py:748 msgid "Completely disagree" msgstr "Anghytuno'n llwyr" -#: help_to_heat/frontdoor/schemas.py:750 +#: help_to_heat/frontdoor/schemas.py:755 msgid "Very satisfied" msgstr "Bodlon iawn" -#: help_to_heat/frontdoor/schemas.py:754 +#: help_to_heat/frontdoor/schemas.py:759 msgid "Somewhat satisfied" msgstr "Eithaf bodlon" -#: help_to_heat/frontdoor/schemas.py:758 +#: help_to_heat/frontdoor/schemas.py:763 msgid "Neither satisfied nor dissatisfied" msgstr "Ddim yn fodlon nac yn anfodlon" -#: help_to_heat/frontdoor/schemas.py:762 +#: help_to_heat/frontdoor/schemas.py:767 msgid "Somewhat dissatisfied" msgstr "Eithaf anfodlon" -#: help_to_heat/frontdoor/schemas.py:766 +#: help_to_heat/frontdoor/schemas.py:771 msgid "Very dissatisfied" msgstr "Anfodlon iawn" -#: help_to_heat/frontdoor/schemas.py:773 +#: help_to_heat/frontdoor/schemas.py:778 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:777 +#: help_to_heat/frontdoor/schemas.py:782 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:781 +#: help_to_heat/frontdoor/schemas.py:786 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:785 +#: help_to_heat/frontdoor/schemas.py:790 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:789 +#: help_to_heat/frontdoor/schemas.py:794 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:793 +#: help_to_heat/frontdoor/schemas.py:798 msgid "Other" msgstr "Arall" -#: help_to_heat/frontdoor/schemas.py:885 +#: help_to_heat/frontdoor/schemas.py:890 msgid "Enter a valid UK postcode" msgstr "Rhowch god post dilys yn y Deyrnas Unedig" -#: help_to_heat/frontdoor/schemas.py:890 +#: help_to_heat/frontdoor/schemas.py:895 msgid "Invalid email format" msgstr "Fformat ebost annilys" -#: help_to_heat/frontdoor/schemas.py:900 help_to_heat/frontdoor/schemas.py:904 +#: help_to_heat/frontdoor/schemas.py:905 help_to_heat/frontdoor/schemas.py:909 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:916 +#: help_to_heat/frontdoor/schemas.py:921 msgid "Energy Company Obligation 4" msgstr "Rhwymedigaeth Cwmni Ynni 4" -#: help_to_heat/frontdoor/schemas.py:917 +#: help_to_heat/frontdoor/schemas.py:922 msgid "Great British Insulation Scheme" msgstr "Cynllun Inswleiddio Mawr Prydain"