From e3940a7ec0f28de5066d9df3d0c84a24485873cc Mon Sep 17 00:00:00 2001 From: Virginia Dooley Date: Wed, 26 Jun 2024 12:03:04 +0100 Subject: [PATCH 1/3] Help users give feedback or report a problem --- wcivf/apps/feedback/templates/feedback/feedback_form.html | 1 + 1 file changed, 1 insertion(+) diff --git a/wcivf/apps/feedback/templates/feedback/feedback_form.html b/wcivf/apps/feedback/templates/feedback/feedback_form.html index 3334f1409..141ba48e2 100644 --- a/wcivf/apps/feedback/templates/feedback/feedback_form.html +++ b/wcivf/apps/feedback/templates/feedback/feedback_form.html @@ -22,6 +22,7 @@ {% csrf_token %} {{ feedback_form.token }} {{ feedback_form.source_url }} + {% trans "The data on this website is crowd-sourced and may not be complete (or may contain inaccuracies). If you find an error, please report the problem below." %}
{% trans "Did you find what you were looking for?" %} From f74bd65d197b3d3675352c5d735fee79aaace05a Mon Sep 17 00:00:00 2001 From: Virginia Dooley Date: Wed, 26 Jun 2024 12:07:38 +0100 Subject: [PATCH 2/3] Help users understand why they see an address picker --- .../elections/includes/inline_elections_nav_list.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/wcivf/apps/elections/templates/elections/includes/inline_elections_nav_list.html b/wcivf/apps/elections/templates/elections/includes/inline_elections_nav_list.html index f0a8fd8b5..31b8a59a7 100644 --- a/wcivf/apps/elections/templates/elections/includes/inline_elections_nav_list.html +++ b/wcivf/apps/elections/templates/elections/includes/inline_elections_nav_list.html @@ -9,6 +9,9 @@

{% trans "We don't know of any upcoming elections in your area." %}

{% regroup postelections by election.election_date as header_elections_by_date %} {% if address_picker %}

{% trans "Select your address" %}

+ {% trans "The postcode you have entered is split across more than one administrative or electoral boundary." %} +
{% trans "Please select your address to get the correct information." %} + {% else %}

{% trans "Elections in your area" %}

{% endif %} From 9bee2811f3328f399f8f837386bc6335f8dd8371 Mon Sep 17 00:00:00 2001 From: Virginia Dooley Date: Wed, 26 Jun 2024 12:07:53 +0100 Subject: [PATCH 3/3] Update Welsh translations --- locale/cy/LC_MESSAGES/django.po | 101 ++++++++++++++++++++------------ locale/en/LC_MESSAGES/django.po | 97 ++++++++++++++++++------------ 2 files changed, 126 insertions(+), 72 deletions(-) diff --git a/locale/cy/LC_MESSAGES/django.po b/locale/cy/LC_MESSAGES/django.po index b2937c474..2c42244b9 100644 --- a/locale/cy/LC_MESSAGES/django.po +++ b/locale/cy/LC_MESSAGES/django.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-24 14:27+0100\n" +"POT-Creation-Date: 2024-06-26 12:05+0100\n" "PO-Revision-Date: 2022-03-24 09:04+0000\n" "Last-Translator: Sym Roe , 2022\n" "Language-Team: Welsh (https://www.transifex.com/democracy-club/teams/61326/" @@ -29,19 +29,19 @@ msgstr "" msgid "Enter your postcode" msgstr "Rhowch eich côd post" -#: wcivf/apps/elections/models.py:760 +#: wcivf/apps/elections/models.py:756 msgid "First-past-the-post" msgstr "Y Cyntaf i’r Felin" -#: wcivf/apps/elections/models.py:762 +#: wcivf/apps/elections/models.py:758 msgid "Additional Member System" msgstr "Y System Aelodau Ychwanegol" -#: wcivf/apps/elections/models.py:764 +#: wcivf/apps/elections/models.py:760 msgid "Supplementary Vote" msgstr "Pleidlais Atodol" -#: wcivf/apps/elections/models.py:766 +#: wcivf/apps/elections/models.py:762 msgid "Single Transferable Vote" msgstr "Pleidlais Sengl Drosglwyddadwy" @@ -429,7 +429,7 @@ msgstr "Llun o %(person_name)s" #: wcivf/apps/elections/templates/elections/includes/_polling_place.html:9 #: wcivf/apps/elections/templates/elections/includes/_single_ballot.html:124 -#: wcivf/apps/elections/templates/elections/includes/inline_elections_nav_list.html:82 +#: wcivf/apps/elections/templates/elections/includes/inline_elections_nav_list.html:85 msgid "Where to vote" msgstr "Ble i bleidleisio" @@ -687,7 +687,7 @@ msgstr[0] "" #: wcivf/apps/elections/templates/elections/includes/_registration_details.html:10 #: wcivf/apps/elections/templates/elections/includes/_single_ballot.html:132 -#: wcivf/apps/elections/templates/elections/includes/inline_elections_nav_list.html:90 +#: wcivf/apps/elections/templates/elections/includes/inline_elections_nav_list.html:93 msgid "Register to vote" msgstr "Cofrestru i bleidleisio" @@ -836,12 +836,12 @@ msgstr "" "o %(num_ballots)s ymgeisydd." #: wcivf/apps/elections/templates/elections/includes/_single_ballot.html:121 -#: wcivf/apps/elections/templates/elections/includes/inline_elections_nav_list.html:79 +#: wcivf/apps/elections/templates/elections/includes/inline_elections_nav_list.html:82 msgid "Get ready to vote" msgstr "Ble i bleidleisio" #: wcivf/apps/elections/templates/elections/includes/_single_ballot.html:128 -#: wcivf/apps/elections/templates/elections/includes/inline_elections_nav_list.html:86 +#: wcivf/apps/elections/templates/elections/includes/inline_elections_nav_list.html:89 msgid "Voter ID requirements" msgstr "Gofynion ID Pleidleisiwr" @@ -1011,15 +1011,27 @@ msgstr "" msgid "Select your address" msgstr "Dewiswch eich cyfeiriad" +#: wcivf/apps/elections/templates/elections/includes/inline_elections_nav_list.html:12 +msgid "" +"The postcode you have entered is split across more than one administrative " +"or electoral boundary." +msgstr "" +"Mae'r cod post rydych wedi'i nodi wedi'i rannu ar draws mwy nag un ffin " +"weinyddol neu etholiadol." + #: wcivf/apps/elections/templates/elections/includes/inline_elections_nav_list.html:13 +msgid "Please select your address to get the correct information." +msgstr "Dewiswch eich cyfeiriad i gael y wybodaeth gywir." + +#: wcivf/apps/elections/templates/elections/includes/inline_elections_nav_list.html:16 msgid "Elections in your area" msgstr "Etholiadau yn eich ardal" -#: wcivf/apps/elections/templates/elections/includes/inline_elections_nav_list.html:31 +#: wcivf/apps/elections/templates/elections/includes/inline_elections_nav_list.html:34 msgid "Recently past elections" msgstr "Etholiadau diweddar yn y gorffennol" -#: wcivf/apps/elections/templates/elections/includes/inline_elections_nav_list.html:44 +#: wcivf/apps/elections/templates/elections/includes/inline_elections_nav_list.html:47 #, python-format msgid "" "You will have %(num_ballots)s ballot paper%(ballots_pluralised)s to fill out." @@ -1027,20 +1039,20 @@ msgstr "" "Bydd gennych %(num_ballots)s papur pleidleisio%(ballots_pluralised)s i'w " "lenwi." -#: wcivf/apps/elections/templates/elections/includes/inline_elections_nav_list.html:60 +#: wcivf/apps/elections/templates/elections/includes/inline_elections_nav_list.html:63 #, python-format msgid "%(ballot.short_cancelled_message_html)s" msgstr "%(ballot.short_cancelled_message_html)s" -#: wcivf/apps/elections/templates/elections/includes/inline_elections_nav_list.html:70 +#: wcivf/apps/elections/templates/elections/includes/inline_elections_nav_list.html:73 msgid "(uncontested)" msgstr "(dim cystadleuaeth)" -#: wcivf/apps/elections/templates/elections/includes/inline_elections_nav_list.html:71 +#: wcivf/apps/elections/templates/elections/includes/inline_elections_nav_list.html:74 msgid "(may be contested)" msgstr "(efallai y bydd cystadleuaeth)" -#: wcivf/apps/elections/templates/elections/includes/inline_elections_nav_list.html:102 +#: wcivf/apps/elections/templates/elections/includes/inline_elections_nav_list.html:105 msgid "" "There may also be parish, town or community council elections in some areas." msgstr "" @@ -1146,27 +1158,35 @@ msgstr "Llai tebygol" msgid "I always vote (no change)" msgstr "Dwi bob amser yn pleidleisio (dim newid)" -#: wcivf/apps/feedback/templates/feedback/feedback_form.html:27 +#: wcivf/apps/feedback/templates/feedback/feedback_form.html:25 +msgid "" +"The data on this website is crowd-sourced and may not be complete (or may " +"contain inaccuracies). If you find an error, please report the problem below." +msgstr "" +"Mae'r data ar y wefan hon yn dod o ffynhonnell torfol ac efallai na fydd yn gyflawn (neu gall " +"gynnwys gwallau). Os byddwch yn dod o hyd i wall, rhowch wybod am y broblem isod." + +#: wcivf/apps/feedback/templates/feedback/feedback_form.html:28 msgid "Did you find what you were looking for?" msgstr "A wnaethoch chi ddod o hyd i'r hyn roeddech chi'n chwilio amdano?" -#: wcivf/apps/feedback/templates/feedback/feedback_form.html:41 +#: wcivf/apps/feedback/templates/feedback/feedback_form.html:42 msgid "Has this service changed your likelihood of voting?" msgstr "A yw'r gwasanaeth hwn wedi newid eich tebygolrwydd o bleidleisio?" -#: wcivf/apps/feedback/templates/feedback/feedback_form.html:57 +#: wcivf/apps/feedback/templates/feedback/feedback_form.html:58 msgid "Please describe the problem you encountered" msgstr "Disgrifiwch y broblem y daethoch ar ei thraws" -#: wcivf/apps/feedback/templates/feedback/feedback_form.html:58 +#: wcivf/apps/feedback/templates/feedback/feedback_form.html:59 msgid "Can you tell us anything more?" msgstr "A allwch chi ddweud unrhyw beth arall i ni?" -#: wcivf/apps/feedback/templates/feedback/feedback_form.html:64 +#: wcivf/apps/feedback/templates/feedback/feedback_form.html:65 msgid "(Optional) Email address" msgstr "(Dewisol) Cyfeiriad e-bost" -#: wcivf/apps/feedback/templates/feedback/feedback_form.html:74 +#: wcivf/apps/feedback/templates/feedback/feedback_form.html:75 msgid "" "If you provide an email address, we may contact you to request more " "information or notify you of improvements related to this report. It will " @@ -1177,7 +1197,7 @@ msgstr "" "gysylltiedig â'r adroddiad hwn. Bydd yn ddim i'w ddefnyddio at ddibenion " "marchnata e-bost." -#: wcivf/apps/feedback/templates/feedback/feedback_form.html:79 +#: wcivf/apps/feedback/templates/feedback/feedback_form.html:80 msgid "Send feedback" msgstr "Anfonwch adborth" @@ -1589,45 +1609,54 @@ msgstr "" "Nid yw'r symbolau hyn bellach wedi'u cofrestru gyda'r Comisiwn Etholiadol ac " "ni ellir eu defnyddio:" -#: wcivf/apps/parties/templates/parties/regional_manifesto.html:5 +#: wcivf/apps/parties/templates/parties/regional_manifesto.html:6 #, python-format msgid "" "The %(party_name)s have also released a manifesto for Scotland." msgstr "" -#: wcivf/apps/parties/templates/parties/regional_manifesto.html:20 +#: wcivf/apps/parties/templates/parties/regional_manifesto.html:13 #, python-format msgid "" -"The %(party_name)s have also released a manifesto for Scotland." +"The %(party_name)s have also released a manifesto for Wales." msgstr "" -#: wcivf/apps/parties/templates/parties/regional_manifesto.html:25 +#: wcivf/apps/parties/templates/parties/regional_manifesto.html:23 #, python-format msgid "" -"The %(party_name)s have also released a manifesto for Wales." +"The %(party_name)s have also released a manifesto for Scotland." msgstr "" -#: wcivf/apps/parties/templates/parties/regional_manifesto.html:47 +#: wcivf/apps/parties/templates/parties/regional_manifesto.html:30 +#, python-format +msgid "" +"The %(party_name)s have also released a manifesto for Wales." +msgstr "" + +#: wcivf/apps/parties/templates/parties/regional_manifesto.html:40 #, python-format msgid "" "The %(party_name)s have also released a manifesto for Scotland." msgstr "" -#: wcivf/apps/parties/templates/parties/regional_manifesto.html:62 +#: wcivf/apps/parties/templates/parties/regional_manifesto.html:48 #, python-format msgid "" -"The %(party_name)s have also released a manifesto for Wales." +"The %(party_name)s have also released a manifesto for Wales." msgstr "" -#: wcivf/apps/parties/templates/parties/regional_manifesto.html:70 +#: wcivf/apps/parties/templates/parties/regional_manifesto.html:57 #, python-format msgid "" -"The %(party_name)s have also released a manifesto for Wales." +"The %(party_name)s have also released a manifesto for Wales." msgstr "" #: wcivf/apps/parties/templates/parties/single_manifesto.html:5 @@ -1924,7 +1953,7 @@ msgstr "yw %(a_or_an)s ymgeisydd y %(party_name)s yn yr etholiadau canlynol:" msgid "%(election)s for" msgstr "%(election)s ar gyfer" -#: wcivf/apps/people/templates/people/includes/_person_intro_card.html:56 +#: wcivf/apps/people/templates/people/includes/_person_intro_card.html:57 #, python-format msgid "profile photo of %(person)s" msgstr "Llun proffil %(person)s" diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po index 77afd387b..b0a460112 100644 --- a/locale/en/LC_MESSAGES/django.po +++ b/locale/en/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-06-24 14:26+0100\n" +"POT-Creation-Date: 2024-06-26 12:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -22,19 +22,19 @@ msgstr "" msgid "Enter your postcode" msgstr "" -#: wcivf/apps/elections/models.py:760 +#: wcivf/apps/elections/models.py:756 msgid "First-past-the-post" msgstr "" -#: wcivf/apps/elections/models.py:762 +#: wcivf/apps/elections/models.py:758 msgid "Additional Member System" msgstr "" -#: wcivf/apps/elections/models.py:764 +#: wcivf/apps/elections/models.py:760 msgid "Supplementary Vote" msgstr "" -#: wcivf/apps/elections/models.py:766 +#: wcivf/apps/elections/models.py:762 msgid "Single Transferable Vote" msgstr "" @@ -361,7 +361,7 @@ msgstr "" #: wcivf/apps/elections/templates/elections/includes/_polling_place.html:9 #: wcivf/apps/elections/templates/elections/includes/_single_ballot.html:124 -#: wcivf/apps/elections/templates/elections/includes/inline_elections_nav_list.html:82 +#: wcivf/apps/elections/templates/elections/includes/inline_elections_nav_list.html:85 msgid "Where to vote" msgstr "" @@ -579,7 +579,7 @@ msgstr[1] "" #: wcivf/apps/elections/templates/elections/includes/_registration_details.html:10 #: wcivf/apps/elections/templates/elections/includes/_single_ballot.html:132 -#: wcivf/apps/elections/templates/elections/includes/inline_elections_nav_list.html:90 +#: wcivf/apps/elections/templates/elections/includes/inline_elections_nav_list.html:93 msgid "Register to vote" msgstr "" @@ -696,12 +696,12 @@ msgid "" msgstr "" #: wcivf/apps/elections/templates/elections/includes/_single_ballot.html:121 -#: wcivf/apps/elections/templates/elections/includes/inline_elections_nav_list.html:79 +#: wcivf/apps/elections/templates/elections/includes/inline_elections_nav_list.html:82 msgid "Get ready to vote" msgstr "" #: wcivf/apps/elections/templates/elections/includes/_single_ballot.html:128 -#: wcivf/apps/elections/templates/elections/includes/inline_elections_nav_list.html:86 +#: wcivf/apps/elections/templates/elections/includes/inline_elections_nav_list.html:89 msgid "Voter ID requirements" msgstr "" @@ -830,34 +830,44 @@ msgstr "" msgid "Select your address" msgstr "" +#: wcivf/apps/elections/templates/elections/includes/inline_elections_nav_list.html:12 +msgid "" +"The postcode you have entered is split across more than one administrative " +"or electoral boundary." +msgstr "" + #: wcivf/apps/elections/templates/elections/includes/inline_elections_nav_list.html:13 +msgid "Please select your address to get the correct information." +msgstr "" + +#: wcivf/apps/elections/templates/elections/includes/inline_elections_nav_list.html:16 msgid "Elections in your area" msgstr "" -#: wcivf/apps/elections/templates/elections/includes/inline_elections_nav_list.html:31 +#: wcivf/apps/elections/templates/elections/includes/inline_elections_nav_list.html:34 msgid "Recently past elections" msgstr "" -#: wcivf/apps/elections/templates/elections/includes/inline_elections_nav_list.html:44 +#: wcivf/apps/elections/templates/elections/includes/inline_elections_nav_list.html:47 #, python-format msgid "" "You will have %(num_ballots)s ballot paper%(ballots_pluralised)s to fill out." msgstr "" -#: wcivf/apps/elections/templates/elections/includes/inline_elections_nav_list.html:60 +#: wcivf/apps/elections/templates/elections/includes/inline_elections_nav_list.html:63 #, python-format msgid "%(ballot.short_cancelled_message_html)s" msgstr "" -#: wcivf/apps/elections/templates/elections/includes/inline_elections_nav_list.html:70 +#: wcivf/apps/elections/templates/elections/includes/inline_elections_nav_list.html:73 msgid "(uncontested)" msgstr "" -#: wcivf/apps/elections/templates/elections/includes/inline_elections_nav_list.html:71 +#: wcivf/apps/elections/templates/elections/includes/inline_elections_nav_list.html:74 msgid "(may be contested)" msgstr "" -#: wcivf/apps/elections/templates/elections/includes/inline_elections_nav_list.html:102 +#: wcivf/apps/elections/templates/elections/includes/inline_elections_nav_list.html:105 msgid "" "There may also be parish, town or community council elections in some areas." msgstr "" @@ -959,34 +969,40 @@ msgstr "" msgid "I always vote (no change)" msgstr "" -#: wcivf/apps/feedback/templates/feedback/feedback_form.html:27 +#: wcivf/apps/feedback/templates/feedback/feedback_form.html:25 +msgid "" +"The data on this website is crowd-sourced and may not be complete (or may " +"contain inaccuracies). If you find an error, please report the problem below." +msgstr "" + +#: wcivf/apps/feedback/templates/feedback/feedback_form.html:28 msgid "Did you find what you were looking for?" msgstr "" -#: wcivf/apps/feedback/templates/feedback/feedback_form.html:41 +#: wcivf/apps/feedback/templates/feedback/feedback_form.html:42 msgid "Has this service changed your likelihood of voting?" msgstr "" -#: wcivf/apps/feedback/templates/feedback/feedback_form.html:57 +#: wcivf/apps/feedback/templates/feedback/feedback_form.html:58 msgid "Please describe the problem you encountered" msgstr "" -#: wcivf/apps/feedback/templates/feedback/feedback_form.html:58 +#: wcivf/apps/feedback/templates/feedback/feedback_form.html:59 msgid "Can you tell us anything more?" msgstr "" -#: wcivf/apps/feedback/templates/feedback/feedback_form.html:64 +#: wcivf/apps/feedback/templates/feedback/feedback_form.html:65 msgid "(Optional) Email address" msgstr "" -#: wcivf/apps/feedback/templates/feedback/feedback_form.html:74 +#: wcivf/apps/feedback/templates/feedback/feedback_form.html:75 msgid "" "If you provide an email address, we may contact you to request more " "information or notify you of improvements related to this report. It will " "not be used for email marketing purposes." msgstr "" -#: wcivf/apps/feedback/templates/feedback/feedback_form.html:79 +#: wcivf/apps/feedback/templates/feedback/feedback_form.html:80 msgid "Send feedback" msgstr "" @@ -1330,45 +1346,54 @@ msgid "" "cannot be used:" msgstr "" -#: wcivf/apps/parties/templates/parties/regional_manifesto.html:5 +#: wcivf/apps/parties/templates/parties/regional_manifesto.html:6 #, python-format msgid "" "The %(party_name)s have also released a manifesto for Scotland." msgstr "" -#: wcivf/apps/parties/templates/parties/regional_manifesto.html:20 +#: wcivf/apps/parties/templates/parties/regional_manifesto.html:13 #, python-format msgid "" -"The %(party_name)s have also released a manifesto for Scotland." +"The %(party_name)s have also released a manifesto for Wales." msgstr "" -#: wcivf/apps/parties/templates/parties/regional_manifesto.html:25 +#: wcivf/apps/parties/templates/parties/regional_manifesto.html:23 #, python-format msgid "" -"The %(party_name)s have also released a manifesto for Wales." +"The %(party_name)s have also released a manifesto for Scotland." msgstr "" -#: wcivf/apps/parties/templates/parties/regional_manifesto.html:47 +#: wcivf/apps/parties/templates/parties/regional_manifesto.html:30 +#, python-format +msgid "" +"The %(party_name)s have also released a manifesto for Wales." +msgstr "" + +#: wcivf/apps/parties/templates/parties/regional_manifesto.html:40 #, python-format msgid "" "The %(party_name)s have also released a manifesto for Scotland." msgstr "" -#: wcivf/apps/parties/templates/parties/regional_manifesto.html:62 +#: wcivf/apps/parties/templates/parties/regional_manifesto.html:48 #, python-format msgid "" -"The %(party_name)s have also released a manifesto for Wales." +"The %(party_name)s have also released a manifesto for Wales." msgstr "" -#: wcivf/apps/parties/templates/parties/regional_manifesto.html:70 +#: wcivf/apps/parties/templates/parties/regional_manifesto.html:57 #, python-format msgid "" -"The %(party_name)s have also released a manifesto for Wales." +"The %(party_name)s have also released a manifesto for Wales." msgstr "" #: wcivf/apps/parties/templates/parties/single_manifesto.html:5 @@ -1641,7 +1666,7 @@ msgstr "" msgid "%(election)s for" msgstr "" -#: wcivf/apps/people/templates/people/includes/_person_intro_card.html:56 +#: wcivf/apps/people/templates/people/includes/_person_intro_card.html:57 #, python-format msgid "profile photo of %(person)s" msgstr ""