diff --git a/wcivf/apps/elections/templates/elections/election_view.html b/wcivf/apps/elections/templates/elections/election_view.html index f88e7cd96..ecf442b2b 100644 --- a/wcivf/apps/elections/templates/elections/election_view.html +++ b/wcivf/apps/elections/templates/elections/election_view.html @@ -5,9 +5,9 @@ {% block page_title %}{{ object.name }}{% endblock page_title %} {% block og_title_content %}{{ object.name }}{% endblock og_title_content %} {% block og_description_content %} - {% blocktrans trimmed with was_or_will_be=object.in_past|yesno:"was, will be" election=object.name date=object.election_date %}The {{ election }} {{ was_or_will_be }} held on {{ date }}.{% endblocktrans %}{% endblock og_description_content %} + {% blocktrans trimmed with was_or_will_be=object.in_past|yesno:"was, will be" election=object.name date=object.election_date|date:"j M Y" %}The {{ election }} {{ was_or_will_be }} held on {{ date }}.{% endblocktrans %}{% endblock og_description_content %} {% block twitter_title_content %}{{ object.name }}{% endblock twitter_title_content %}> -{% block twitter_description_content %}{% blocktrans trimmed with was_or_will_be=object.in_past|yesno:"was, will be" election=object.name date=object.election_date %}The {{ election }} {{ was_or_will_be }} held on {{ date }}.{% endblocktrans %}{% endblock twitter_description_content %}/> +{% block twitter_description_content %}{% blocktrans trimmed with was_or_will_be=object.in_past|yesno:"was, will be" election=object.name date=object.election_date|date:"j M Y" %}The {{ election }} {{ was_or_will_be }} held on {{ date }}.{% endblocktrans %}{% endblock twitter_description_content %}/> {% block content %} diff --git a/wcivf/apps/elections/templates/elections/includes/_election_list.html b/wcivf/apps/elections/templates/elections/includes/_election_list.html index ee02c559d..3a30a8044 100644 --- a/wcivf/apps/elections/templates/elections/includes/_election_list.html +++ b/wcivf/apps/elections/templates/elections/includes/_election_list.html @@ -1,8 +1,10 @@ {% load i18n %} + {% regroup elections by election_date as elections_by_type %} {% for election_group in elections_by_type %}

- {{ election_group.grouper }} + {{ election_group.grouper|date:"j F Y" }} +

{% for election in election_group.list %} diff --git a/wcivf/apps/elections/templates/elections/includes/_post_meta_description.html b/wcivf/apps/elections/templates/elections/includes/_post_meta_description.html index 1a7c7e10f..544fcf6e5 100644 --- a/wcivf/apps/elections/templates/elections/includes/_post_meta_description.html +++ b/wcivf/apps/elections/templates/elections/includes/_post_meta_description.html @@ -4,7 +4,7 @@ {% blocktrans with election_name=object.election.name %}{{ election_name }}: This election has been cancelled. {% endblocktrans %} {% elif postelection.people|length %} {% autoescape off %} - {% blocktrans trimmed with election_name=object.election.name num_candidates=postelection.people|length election_date=object.election.election_date %} + {% blocktrans trimmed with election_name=object.election.name num_candidates=postelection.people|length election_date=object.election.election_date|date:"j M Y" %} See all {{ num_candidates }} candidates in the {{ election_name }} on {{ election_date }}:{% endblocktrans %} {% for pp in postelection.people %} {{ pp.person.name|safe }} ({{ pp.party_name }}) diff --git a/wcivf/apps/elections/templates/elections/includes/_registration_details.html b/wcivf/apps/elections/templates/elections/includes/_registration_details.html index 14bb7be4e..65db904ca 100644 --- a/wcivf/apps/elections/templates/elections/includes/_registration_details.html +++ b/wcivf/apps/elections/templates/elections/includes/_registration_details.html @@ -22,7 +22,7 @@

{% if postelection %}

- {% blocktrans trimmed with registration_deadline=postelection.registration_deadline election_date=postelection.election.election_date%} + {% blocktrans trimmed with registration_deadline=postelection.registration_deadline election_date=postelection.election.election_date|date:"j M Y" %} Register before midnight on {{ registration_deadline }} to vote on {{ election_date }}. {% endblocktrans %}