Skip to content

Commit

Permalink
Clarify candidate deselection text
Browse files Browse the repository at this point in the history
  • Loading branch information
VirginiaDooley committed May 2, 2024
1 parent dbc0914 commit d408212
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 12 deletions.
16 changes: 12 additions & 4 deletions locale/cy/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-05-02 10:33+0000\n"
"POT-Creation-Date: 2024-05-02 18:02+0000\n"
"PO-Revision-Date: 2022-03-24 09:04+0000\n"
"Last-Translator: Sym Roe <[email protected]>, 2022\n"
"Language-Team: Welsh (https://www.transifex.com/democracy-club/teams/61326/"
Expand Down Expand Up @@ -467,8 +467,8 @@ msgstr "Etholwyd"
#: wcivf/apps/elections/templates/elections/includes/_person_card.html:23
#: wcivf/apps/people/templates/people/includes/_person_intro_card.html:42
msgid ""
"This candidate has been deselected by their party, but will remain on the "
"ballot paper."
"This candidate has been deselected by their party, but their original party "
"description will remain on the ballot paper."
msgstr ""

#: wcivf/apps/elections/templates/elections/includes/_person_card.html:24
Expand Down Expand Up @@ -2082,7 +2082,15 @@ msgstr ""
msgid "Position"
msgstr "Sefyllfa"

#: wcivf/apps/people/templates/people/includes/_person_previous_elections_card.html:42
#: wcivf/apps/people/templates/people/includes/_person_previous_elections_card.html:43
msgid "We do not collect voting data for Supplementary Vote elections."
msgstr ""

#: wcivf/apps/people/templates/people/includes/_person_previous_elections_card.html:45
msgid "We do not collect voting data for Single Transferable Vote election"
msgstr ""

#: wcivf/apps/people/templates/people/includes/_person_previous_elections_card.html:47
msgid "Position not available"
msgstr "Nid yw'r cyfrif pleidleisiau ar gael"

Expand Down
16 changes: 12 additions & 4 deletions locale/en/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-05-02 10:33+0000\n"
"POT-Creation-Date: 2024-05-02 18:01+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down Expand Up @@ -372,8 +372,8 @@ msgstr ""
#: wcivf/apps/elections/templates/elections/includes/_person_card.html:23
#: wcivf/apps/people/templates/people/includes/_person_intro_card.html:42
msgid ""
"This candidate has been deselected by their party, but will remain on the "
"ballot paper."
"This candidate has been deselected by their party, but their original party "
"description will remain on the ballot paper."
msgstr ""

#: wcivf/apps/elections/templates/elections/includes/_person_card.html:24
Expand Down Expand Up @@ -1743,7 +1743,15 @@ msgstr ""
msgid "Position"
msgstr ""

#: wcivf/apps/people/templates/people/includes/_person_previous_elections_card.html:42
#: wcivf/apps/people/templates/people/includes/_person_previous_elections_card.html:43
msgid "We do not collect voting data for Supplementary Vote elections."
msgstr ""

#: wcivf/apps/people/templates/people/includes/_person_previous_elections_card.html:45
msgid "We do not collect voting data for Single Transferable Vote election"
msgstr ""

#: wcivf/apps/people/templates/people/includes/_person_previous_elections_card.html:47
msgid "Position not available"
msgstr ""

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ <h6 class="ds-candidate-name ds-h5">
{% endif %}
{% if person_post.deselected %}
<p>
{% trans "This candidate has been deselected by their party, but will remain on the ballot paper." %}
{% trans "This candidate has been deselected by their party, but their original party description will remain on the ballot paper." %}
<a href="{{ person_post.deselected_source }}" target="_blank">{% trans "Learn more" %}.</a>
</p>
{% endif %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ <h5>{{ object.name }}
{% for candidacy in object.future_candidacies %}
{% if candidacy.deselected %}
<p>
{% trans "This candidate has been deselected by their party, but will remain on the ballot paper." %}
{% trans "This candidate has been deselected by their party, but their original party description will remain on the ballot paper." %}
<a href="{{ candidacy.deselected_source }}" target="_blank">{% trans "Learn more" %}.</a>
</p>
{% endif %}
Expand Down
4 changes: 2 additions & 2 deletions wcivf/apps/people/tests/test_person_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -681,7 +681,7 @@ def test_deselected(self):
response = self.client.get(self.person_url, follow=True)
self.assertContains(
response,
"This candidate has been deselected by their party, but will remain on the ballot paper.",
"This candidate has been deselected by their party, but their original party description will remain on the ballot paper.",
)
self.assertContains(response, "www.candidate-party-page.co.uk")

Expand All @@ -690,7 +690,7 @@ def test_deselected(self):
)
self.assertContains(
response,
"This candidate has been deselected by their party, but will remain on the ballot paper.",
"This candidate has been deselected by their party, but their original party description will remain on the ballot paper.",
)
self.assertContains(response, "www.candidate-party-page.co.uk")

Expand Down

0 comments on commit d408212

Please sign in to comment.