From a65535dbf02e75f3554d8f2e453800f2f6de0ef3 Mon Sep 17 00:00:00 2001 From: Beka Lewis Date: Thu, 11 May 2023 15:19:08 +0100 Subject: [PATCH 1/3] Bold text on no. candidates, seats and votes --- .../templates/elections/includes/_single_ballot.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/wcivf/apps/elections/templates/elections/includes/_single_ballot.html b/wcivf/apps/elections/templates/elections/includes/_single_ballot.html index 53c67ba66..297080a20 100644 --- a/wcivf/apps/elections/templates/elections/includes/_single_ballot.html +++ b/wcivf/apps/elections/templates/elections/includes/_single_ballot.html @@ -74,29 +74,29 @@

{% if postelection.is_london_assembly_additional %}{% trans "Additional memb {% else %} {% if postelection.winner_count and postelection.get_voting_system.slug == 'FPTP' %} {% blocktrans trimmed with winner_count=postelection.winner_count|apnumber plural=postelection.winner_count|pluralize num_candidates=postelection.people.count|apnumber plural_candidates=postelection.people|pluralize%} - You will have {{ winner_count }} vote{{ plural }}, + You will have {{ winner_count }} vote{{ plural }}, and can choose from {{ num_candidates }} candidate{{ plural_candidates }}. {% endblocktrans %} {% endif %} {% if postelection.winner_count and postelection.get_voting_system.slug == 'AMS' %} {% blocktrans trimmed with num_ballots=postelection.party_ballot_count postelection=postelection.friendly_name %} - You will have one vote, and can choose from {{ num_ballots }} + You will have one vote, and can choose from {{ num_ballots }} in the {{ postelection }}.{% endblocktrans %} {% endif %} {% if postelection.winner_count and postelection.get_voting_system.slug == 'sv' %} {% blocktrans trimmed with num_ballots=postelection.party_ballot_count postelection=postelection.friendly_name %} - You will have two votes, and can choose from {{ num_ballots }} + You will have two votes, and can choose from {{ num_ballots }} in the {{ postelection}}. {% endblocktrans %} {% endif %} {% if postelection.get_voting_system.slug == 'STV' %} {% if postelection.winner_count == 1 %} {% blocktrans trimmed with num_ballots=postelection.party_ballot_count %} - There is one seat up for election, and you can choose from {{ num_ballots }}. + There is one seat up for election, and you can choose from {{ num_ballots }}. {% endblocktrans %} {% else %} {% blocktrans trimmed with winner_count=postelection.winner_count|apnumber num_ballots=postelection.party_ballot_count %} - There are {{ winner_count }} seats up for election, and you can choose from {{ num_ballots }}. + There are {{ winner_count }} seats up for election, and you can choose from {{ num_ballots }}. {% endblocktrans %} {% endif %} {% endif %} From f530004cdc30acba27611e65aec0917826c0584b Mon Sep 17 00:00:00 2001 From: Beka Lewis Date: Thu, 11 May 2023 15:39:12 +0100 Subject: [PATCH 2/3] Fix tenses on election page ref #1280 --- wcivf/apps/elections/templates/elections/election_view.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wcivf/apps/elections/templates/elections/election_view.html b/wcivf/apps/elections/templates/elections/election_view.html index 2f67d0b25..86f156666 100644 --- a/wcivf/apps/elections/templates/elections/election_view.html +++ b/wcivf/apps/elections/templates/elections/election_view.html @@ -24,7 +24,7 @@

{{ object.nice_election_name }}

is being held today. Polls are open from{% endblocktrans %} {{ object.polls_open|time:"ga" }} {% trans "till" %} {{ object.polls_close|time:"ga" }} {% else %} {% comment %} TO DO: Change text when the election is "tomorrow" {% endcomment %} - {% blocktrans trimmed with was_will_be_in_past=postelection.election.in_past|yesno:"was,will be" election_date=object.election_date|naturalday:"\o\n l j F Y" %} {{ was_will_be_in_past }} held {{ election_date }}.{% endblocktrans %} + {% blocktrans trimmed with was_will_be_in_past=object.in_past|yesno:"was,will be" election_date=object.election_date|naturalday:"\o\n l j F Y" %} This election {{ was_will_be_in_past }} held {{ election_date }}.{% endblocktrans %} {% endif %}

From 4b3e41b815907c348ae094723e6a20b8983d3c79 Mon Sep 17 00:00:00 2001 From: Beka Lewis Date: Thu, 11 May 2023 15:40:42 +0100 Subject: [PATCH 3/3] Update translations --- locale/cy/LC_MESSAGES/django.po | 175 +++++++++++++++++++------------- 1 file changed, 102 insertions(+), 73 deletions(-) diff --git a/locale/cy/LC_MESSAGES/django.po b/locale/cy/LC_MESSAGES/django.po index a46bfab0e..8a40ce432 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: 2023-04-26 14:23+0100\n" +"POT-Creation-Date: 2023-05-11 15:40+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,21 +29,21 @@ msgstr "" msgid "Enter your postcode" msgstr "Rhowch eich cod post" -#: wcivf/apps/elections/models.py:638 +#: wcivf/apps/elections/models.py:655 msgid "First-past-the-post" msgstr "Y Cyntaf i’r Felin" -#: wcivf/apps/elections/models.py:640 +#: wcivf/apps/elections/models.py:657 #, fuzzy #| msgid "The Additional Member System" msgid "Additional Member System" msgstr "Y System Aelodau Ychwanegol" -#: wcivf/apps/elections/models.py:642 +#: wcivf/apps/elections/models.py:659 msgid "Supplementary Vote" msgstr "Pleidlais Atodol" -#: wcivf/apps/elections/models.py:644 +#: wcivf/apps/elections/models.py:661 msgid "Single Transferable Vote" msgstr "Pleidlais Sengl Drosglwyddadwy" @@ -66,9 +66,13 @@ msgid "till" msgstr "tan" #: wcivf/apps/elections/templates/elections/election_view.html:28 -#, python-format -msgid "%(was_will_be_in_past)s held %(election_date)s." +#, fuzzy, python-format +#| msgid "This election will be held %(election_date)s." +msgid "" +"This election %(was_will_be_in_past)s held %(election_date)s." msgstr "" +"Bydd yr etholiad hwn yn cael ei gynnal %(election_date)s" #: wcivf/apps/elections/templates/elections/election_view.html:40 #, python-format @@ -112,7 +116,7 @@ msgid "All Elections in the UK" msgstr "Pob Etholiad yn y DU" #: wcivf/apps/elections/templates/elections/elections_view.html:18 -#: wcivf/templates/base.html:101 +#: wcivf/templates/base.html:107 msgid "All Elections" msgstr "Pob Etholiad" @@ -225,7 +229,7 @@ msgstr "Rydych chi yma" #: wcivf/apps/parties/templates/parties/party_detail.html:17 #: wcivf/apps/parties/templates/parties/speaker_seeking_reelection.html:17 #: wcivf/apps/people/templates/people/person_detail.html:27 -#: wcivf/templates/base.html:100 +#: wcivf/templates/base.html:106 msgid "Home" msgstr "Cartref" @@ -495,8 +499,16 @@ msgstr "Darllenwch fwy am sut i bleidleisio yng Ngogledd Iwerddon" msgid "Read more about how to vote" msgstr "Darllenwch fwy am sut i bleidleisio" -#: wcivf/apps/elections/templates/elections/includes/_polling_place.html:147 -msgid "Get walking directions from" +#: wcivf/apps/elections/templates/elections/includes/_polling_place.html:148 +#, fuzzy +#| msgid "Get walking directions from" +msgid "Get directions" +msgstr "Cael cyfarwyddiadau cerdded o" + +#: wcivf/apps/elections/templates/elections/includes/_polling_place.html:152 +#, fuzzy +#| msgid "Get walking directions from" +msgid "Get directions from" msgstr "Cael cyfarwyddiadau cerdded o" #: wcivf/apps/elections/templates/elections/includes/_post_meta_description.html:4 @@ -671,10 +683,14 @@ msgstr "" "annibynnol." #: wcivf/apps/elections/templates/elections/includes/_single_ballot.html:76 -#, python-format +#, fuzzy, python-format +#| msgid "" +#| "You will have %(winner_count)s vote%(plural)s, and can choose from " +#| "%(num_candidates)s candidate%(plural_candidates)s." msgid "" -"You will have %(winner_count)s vote%(plural)s, and can choose from " -"%(num_candidates)s candidate%(plural_candidates)s." +"You will have %(winner_count)s vote%(plural)s, and can " +"choose from %(num_candidates)s candidate%(plural_candidates)s." msgstr "" "Bydd gennych %(winner_count)s bleidlais%(plural)s, a gallwch ddewis o " "%(num_candidates)s ymgeisydd%(plural_candidates)s." @@ -685,34 +701,44 @@ msgstr "" #| "You will have two votes, and can choose from %(num_ballots)s in the %(postelection)s." msgid "" -"You will have one vote, and can choose from %(num_ballots)s " -"in the %(postelection)s." +"You will have one vote, and can choose from " +"%(num_ballots)s in the %(postelection)s." msgstr "" "Bydd gennych ddwy bleidlais, a gallwch ddewis o %(num_ballots)s yn yr %(postelection)s." #: wcivf/apps/elections/templates/elections/includes/_single_ballot.html:87 -#, python-format +#, fuzzy, python-format +#| msgid "" +#| "You will have two votes, and can choose from %(num_ballots)s in the %(postelection)s." msgid "" -"You will have two votes, and can choose from %(num_ballots)s in the %(postelection)s." +"You will have two votes, and can choose from " +"%(num_ballots)s in the %(postelection)s." msgstr "" "Bydd gennych ddwy bleidlais, a gallwch ddewis o %(num_ballots)s yn yr %(postelection)s." #: wcivf/apps/elections/templates/elections/includes/_single_ballot.html:94 -#, python-format +#, fuzzy, python-format +#| msgid "" +#| "There is one seat up for election, and you can choose from " +#| "%(num_ballots)s." msgid "" -"There is one seat up for election, and you can choose from %(num_ballots)s." +"There is one seat up for election, and you can choose from " +"%(num_ballots)s." msgstr "" "Mae yna un sedd ar gael yn yr etholiad, a gallwch ddewis o %(num_ballots)s " "ymgeisydd." #: wcivf/apps/elections/templates/elections/includes/_single_ballot.html:98 -#, python-format +#, fuzzy, python-format +#| msgid "" +#| "There are %(winner_count)s seats up for election, and you can choose from " +#| "%(num_ballots)s." msgid "" -"There are %(winner_count)s seats up for election, and you can choose from " -"%(num_ballots)s." +"There are %(winner_count)s seats up for election, and you " +"can choose from %(num_ballots)s." msgstr "" "Mae yna %(winner_count)s seddi sedd ar gael yn yr etholiad, a gallwch ddewis " "o %(num_ballots)s ymgeisydd." @@ -817,15 +843,15 @@ msgstr "Gweld y canlyniadau" msgid "We don't know of any upcoming elections." msgstr "Ni wyddwn am unrhyw etholiadau sydd i ddod" -#: wcivf/apps/elections/templates/elections/includes/inline_elections_nav_list.html:9 +#: wcivf/apps/elections/templates/elections/includes/inline_elections_nav_list.html:12 msgid "Elections in your area" msgstr "Etholiadau yn eich ardal" -#: wcivf/apps/elections/templates/elections/includes/inline_elections_nav_list.html:15 +#: wcivf/apps/elections/templates/elections/includes/inline_elections_nav_list.html:30 msgid "Recently past elections" msgstr "Etholiadau diweddar yn y gorffennol" -#: wcivf/apps/elections/templates/elections/includes/inline_elections_nav_list.html:28 +#: wcivf/apps/elections/templates/elections/includes/inline_elections_nav_list.html:43 #, python-format msgid "" "You will have %(num_ballots)s ballot paper%(ballots_pluralised)s to fill out." @@ -833,27 +859,27 @@ 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:44 +#: wcivf/apps/elections/templates/elections/includes/inline_elections_nav_list.html:59 #, 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:54 +#: wcivf/apps/elections/templates/elections/includes/inline_elections_nav_list.html:69 msgid "(uncontested)" msgstr "(dim cystadleuaeth)" -#: wcivf/apps/elections/templates/elections/includes/inline_elections_nav_list.html:55 +#: wcivf/apps/elections/templates/elections/includes/inline_elections_nav_list.html:70 msgid "(may be contested)" msgstr "(efallai y bydd cystadleuaeth)" -#: wcivf/apps/elections/templates/elections/includes/inline_elections_nav_list.html:70 +#: wcivf/apps/elections/templates/elections/includes/inline_elections_nav_list.html:85 msgid "" "There may also be parish, town or community council elections in some areas." msgstr "" "Efallai y bydd etholiadau cyngor plwyf, tref neu gymunedol mewn rhai " "ardaloedd." -#: wcivf/apps/elections/templates/elections/includes/inline_elections_nav_list.html:73 +#: wcivf/apps/elections/templates/elections/includes/inline_elections_nav_list.html:88 msgid "Where do I vote?" msgstr "Ble rydw i'n pleidleisio?" @@ -926,38 +952,39 @@ msgstr "heddiw" msgid "due to take place on" msgstr "Mae disgwyl iddo gael ei gynnal ar" -#: wcivf/apps/elections/templates/elections/postcode_view.html:58 +#: wcivf/apps/elections/templates/elections/postcode_view.html:60 #, python-format msgid "Add future elections in %(postcode)s to your calendar" msgstr "Ychwanegwch etholiadau'r dyfodol yn %(postcode)s at eich calendr" -#: wcivf/apps/elections/templates/elections/postcode_view.html:61 -msgid "Subscribe to the iCal feed" -msgstr "Tanysgrifiwch i ffrwd iCal" - -#: wcivf/apps/elections/templates/elections/postcode_view.html:62 +#: wcivf/apps/elections/templates/elections/postcode_view.html:63 +#, fuzzy +#| msgid "" +#| "Or manually subscribe by following these simple steps for your chosen " +#| "calendar tool:" msgid "" -"Or manually subscribe by following these simple steps for your chosen " -"calendar tool:" +"Manually subscribe by following these simple steps for your chosen calendar " +"tool:" msgstr "" "Neu tanysgrifiwch â llaw drwy ddilyn y camau syml hyn ar gyfer eich offeryn " "calendr dewisol:" -#: wcivf/apps/elections/templates/elections/postcode_view.html:65 +#: wcivf/apps/elections/templates/elections/postcode_view.html:66 msgid "" "In your calendar app settings, choose the option for adding a new calendar." msgstr "" "Yng ngosodiadau eich ap calendr, dewiswch yr opsiwn ar gyfer ychwanegu " "calendr newydd." -#: wcivf/apps/elections/templates/elections/postcode_view.html:68 +#: wcivf/apps/elections/templates/elections/postcode_view.html:69 msgid "" "If presented with the option to choose a calendar type, choose web calendar." msgstr "" "Os cewch eich cyflwyno â'r opsiwn i ddewis math o galendr, dewiswch galendr " "y we." -#: wcivf/apps/elections/templates/elections/postcode_view.html:71 +#: wcivf/apps/elections/templates/elections/postcode_view.html:73 +#: wcivf/apps/elections/templates/elections/postcode_view.html:75 msgid "Enter this URL and save" msgstr "Rhowch yr URL hwn a'i arbed" @@ -969,25 +996,25 @@ msgstr "Ie" msgid "No" msgstr "Na" -#: wcivf/apps/feedback/templates/feedback/feedback_form.html:10 +#: wcivf/apps/feedback/templates/feedback/feedback_form.html:20 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:19 +#: wcivf/apps/feedback/templates/feedback/feedback_form.html:29 msgid "Has this information made you more likely to vote?" msgstr "A yw'r wybodaeth hon wedi eich gwneud chi'n fwy tebygol o bleidleisio?" -#: wcivf/apps/feedback/templates/feedback/feedback_form.html:27 +#: wcivf/apps/feedback/templates/feedback/feedback_form.html:37 msgid "What other websites/sources have you used to research the election?" msgstr "" "Pa wefannau/ffynonellau eraill rydych chi wedi'u defnyddio i ymchwilio i'r " "etholiad?" -#: wcivf/apps/feedback/templates/feedback/feedback_form.html:32 +#: wcivf/apps/feedback/templates/feedback/feedback_form.html:42 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:35 +#: wcivf/apps/feedback/templates/feedback/feedback_form.html:45 msgid "Send feedback" msgstr "Anfonwch adborth" @@ -1382,7 +1409,6 @@ msgid "online" msgstr "Ar-lein" #: wcivf/apps/people/templates/people/includes/_person_contact_card.html:10 -#: wcivf/templates/base.html:110 msgid "Facebook" msgstr "Facebook" @@ -1411,7 +1437,7 @@ msgid "%(person_name)s's home page" msgstr "Hafan %(person_name)s" #: wcivf/apps/people/templates/people/includes/_person_contact_card.html:54 -#: wcivf/templates/base.html:108 +#: wcivf/templates/base.html:114 msgid "Blog" msgstr "Blog" @@ -2012,62 +2038,62 @@ msgstr "Dim canlyniadau eto" msgid "Language:" msgstr "Iaith:" -#: wcivf/templates/base.html:102 +#: wcivf/templates/base.html:108 msgid "Standing as a candidate?" msgstr "Sefyll fel ymgeisydd?" -#: wcivf/templates/base.html:103 +#: wcivf/templates/base.html:109 #, python-format msgid "About %(SITE_TITLE)s" msgstr "Ynglŷn %(SITE_TITLE)s" -#: wcivf/templates/base.html:104 +#: wcivf/templates/base.html:110 msgid "Privacy" msgstr "Preifatrwydd" -#: wcivf/templates/base.html:105 +#: wcivf/templates/base.html:111 msgid "Source code" msgstr "Cod ffynhonnell" -#: wcivf/templates/base.html:106 +#: wcivf/templates/base.html:112 msgid "About Democracy Club" msgstr "Ynglŷn â'r Clwb Democratiaeth" -#: wcivf/templates/base.html:107 +#: wcivf/templates/base.html:113 msgid "Contact Us" msgstr "Cysylltwch â Ni" -#: wcivf/templates/base.html:109 +#: wcivf/templates/base.html:115 msgid "Twitter" msgstr "Trydar" -#: wcivf/templates/base.html:111 +#: wcivf/templates/base.html:116 msgid "GitHub" msgstr "GitHub" -#: wcivf/templates/base.html:118 +#: wcivf/templates/base.html:123 msgid "democracy" msgstr "democratiaeth" -#: wcivf/templates/base.html:118 +#: wcivf/templates/base.html:123 msgid "club" msgstr "clwb" -#: wcivf/templates/base.html:124 wcivf/templates/home.html:5 +#: wcivf/templates/base.html:129 wcivf/templates/home.html:5 #: wcivf/templates/home.html:6 msgid "Who Can I Vote For?" msgstr "Pwy alla i bleidleisio ar gyfer?" -#: wcivf/templates/base.html:128 +#: wcivf/templates/base.html:133 #, python-format msgid "Copyright © %(current_year)s" msgstr "Hawlfraint © %(current_year)s" -#: wcivf/templates/base.html:129 +#: wcivf/templates/base.html:134 msgid "Democracy Club Community Interest Company" msgstr "Cwmni Buddiannau Cymunedol y Clwb Democratiaeth" -#: wcivf/templates/base.html:130 +#: wcivf/templates/base.html:135 msgid "" "Company No: 09461226" @@ -2075,7 +2101,7 @@ msgstr "" "Rhif y Cwmni: 09461226" -#: wcivf/templates/base.html:132 +#: wcivf/templates/base.html:137 msgid "" "Democracy Club is a UK-based Community Interest Company that builds the " "digital infrastructure needed for a 21st century democracy" @@ -2094,44 +2120,44 @@ msgstr "" "Mae'n flin gennym, ond nid ydym yn gwybod y cod post %(postcode)s . A oes un " "arall y gallwch chi ei ddefnyddio?" -#: wcivf/templates/home.html:32 +#: wcivf/templates/home.html:38 #, fuzzy #| msgid "You will need photographic identification." msgid "Photographic identification" msgstr "Bydd angen dull adnabod ffotograffig arnoch." -#: wcivf/templates/home.html:34 +#: wcivf/templates/home.html:40 msgid "" "Photographic identification will be required to vote in English local " "elections, and parliamentary elections across the UK, on and after 4 May " "2023." msgstr "" -#: wcivf/templates/home.html:35 +#: wcivf/templates/home.html:41 msgid "" "Learn more about photographic identification for voters on the website of " "the Electoral Commission." msgstr "" -#: wcivf/templates/home.html:35 +#: wcivf/templates/home.html:41 msgid "Learn more on the website of the Electoral Commission." msgstr "" -#: wcivf/templates/home.html:37 +#: wcivf/templates/home.html:43 msgid "" "You can apply for a free 'Voter Authority Certificate' if you do not already " "possess a valid ID." msgstr "" -#: wcivf/templates/home.html:38 +#: wcivf/templates/home.html:44 msgid "Apply for free voter ID." msgstr "" -#: wcivf/templates/home.html:39 +#: wcivf/templates/home.html:45 msgid "You do not need photo ID to vote by post." msgstr "" -#: wcivf/templates/home.html:45 +#: wcivf/templates/home.html:52 msgid "Upcoming Elections" msgstr "Etholiadau i ddod" @@ -2139,6 +2165,9 @@ msgstr "Etholiadau i ddod" msgid "Join our mailing list" msgstr "Ymunwch â'n rhestr bostio" +#~ msgid "Subscribe to the iCal feed" +#~ msgstr "Tanysgrifiwch i ffrwd iCal" + #, fuzzy #~| msgid "Find your candidates" #~ msgid "Number of candidates"