summaryrefslogtreecommitdiff
path: root/djangoproject/templates/foundation
diff options
context:
space:
mode:
Diffstat (limited to 'djangoproject/templates/foundation')
-rw-r--r--djangoproject/templates/foundation/banner_preview.html2
-rw-r--r--djangoproject/templates/foundation/coreawardcohort_list.html5
-rw-r--r--djangoproject/templates/foundation/meeting_archive.html5
-rw-r--r--djangoproject/templates/foundation/meeting_archive_day.html5
-rw-r--r--djangoproject/templates/foundation/meeting_archive_month.html3
-rw-r--r--djangoproject/templates/foundation/meeting_archive_year.html3
-rw-r--r--djangoproject/templates/foundation/meeting_detail.html3
-rw-r--r--djangoproject/templates/foundation/meeting_snippet.html2
8 files changed, 17 insertions, 11 deletions
diff --git a/djangoproject/templates/foundation/banner_preview.html b/djangoproject/templates/foundation/banner_preview.html
index ff3a4894..d371a026 100644
--- a/djangoproject/templates/foundation/banner_preview.html
+++ b/djangoproject/templates/foundation/banner_preview.html
@@ -6,4 +6,4 @@
(last updated by {{ banner.updated_by }} on {{ banner.updated_at|date:"N j, Y, P" }})
</p>
{% include "foundation/banner.html" %}
-{% endblock %}
+{% endblock billboard %}
diff --git a/djangoproject/templates/foundation/coreawardcohort_list.html b/djangoproject/templates/foundation/coreawardcohort_list.html
index 66979a88..b6fb0fcf 100644
--- a/djangoproject/templates/foundation/coreawardcohort_list.html
+++ b/djangoproject/templates/foundation/coreawardcohort_list.html
@@ -2,6 +2,7 @@
{% load i18n %}
{% block og_title %}{% translate "Django Core Developers" %}{% endblock %}
+
{% block og_description %}{% translate "Former Django Core Team dissolved on March 12, 2020." %}{% endblock %}
{% block content %}
@@ -21,10 +22,10 @@
<ul>
{% for recipient in cohort.recipients.all %}
<li>
- {% if recipient.link %}<a href="{{ recipient.link }}">{% endif %}{{ recipient}}{% if recipient.link %}</a>{% endif %}
+ {% if recipient.link %}<a href="{{ recipient.link }}">{% endif %}{{ recipient }}{% if recipient.link %}</a>{% endif %}
{% if recipient.description %} &mdash; {{ recipient.description }}{% endif %}
</li>
{% endfor %}
</ul>
{% endfor %}
-{% endblock %}
+{% endblock content %}
diff --git a/djangoproject/templates/foundation/meeting_archive.html b/djangoproject/templates/foundation/meeting_archive.html
index bf69e9b8..8e3cfc60 100644
--- a/djangoproject/templates/foundation/meeting_archive.html
+++ b/djangoproject/templates/foundation/meeting_archive.html
@@ -2,11 +2,12 @@
{% load i18n %}
{% block og_title %}{% translate "Meeting minutes archive" %}{% endblock %}
+
{% block og_description %}{% translate "View meeting minutes" %}{% endblock %}
{% block head_extra %}
<link rel="alternate" type="application/rss+xml" title="RSS" href="{% url 'foundation-minutes-feed' %}" />
-{% endblock %}
+{% endblock head_extra %}
{% block content %}
<h1>{% translate "Meeting minutes archive" %}</h1>
@@ -22,4 +23,4 @@
<li><a href="{% url 'foundation_meeting_archive_year' year=year.year %}">{{ year.year }}</a></li>
{% endfor %}
</ul>
-{% endblock %}
+{% endblock content %}
diff --git a/djangoproject/templates/foundation/meeting_archive_day.html b/djangoproject/templates/foundation/meeting_archive_day.html
index 0cdc2ce4..989df63b 100644
--- a/djangoproject/templates/foundation/meeting_archive_day.html
+++ b/djangoproject/templates/foundation/meeting_archive_day.html
@@ -2,8 +2,9 @@
{% load i18n %}
{% block og_title %}{% translate "Meeting minutes archive" %}{% endblock %}
+
{% block og_description %}{% blocktranslate trimmed with day=day|date:"DATE_FORMAT" %}
- View meeting minutes for {{ day }}{% endblocktranslate %}{% endblock %}
+ View meeting minutes for {{ day }}{% endblocktranslate %}{% endblock og_description %}
{% block content %}
<h1>{% blocktranslate trimmed with day=day|date:"DATE_FORMAT" %}
@@ -14,4 +15,4 @@
<li><a href="{{ meeting.get_absolute_url }}">{{ meeting }}</a></li>
{% endfor %}
</ul>
-{% endblock %}
+{% endblock content %}
diff --git a/djangoproject/templates/foundation/meeting_archive_month.html b/djangoproject/templates/foundation/meeting_archive_month.html
index 9c8ac61c..720d921e 100644
--- a/djangoproject/templates/foundation/meeting_archive_month.html
+++ b/djangoproject/templates/foundation/meeting_archive_month.html
@@ -2,6 +2,7 @@
{% load i18n %}
{% block og_title %}{% translate "Meeting minutes archive" %}{% endblock %}
+
{% block og_description %}{% blocktranslate with month=month|date:"F, Y" %}View meeting minutes for {{ month }}{% endblocktranslate %}{% endblock %}
{% block content %}
@@ -12,4 +13,4 @@
<li><a href="{{ meeting.get_absolute_url }}">{{ meeting }}</a></li>
{% endfor %}
</ul>
-{% endblock %}
+{% endblock content %}
diff --git a/djangoproject/templates/foundation/meeting_archive_year.html b/djangoproject/templates/foundation/meeting_archive_year.html
index b869455f..136cfd4c 100644
--- a/djangoproject/templates/foundation/meeting_archive_year.html
+++ b/djangoproject/templates/foundation/meeting_archive_year.html
@@ -2,6 +2,7 @@
{% load i18n %}
{% block og_title %}{% translate "Meeting minutes archive" %}{% endblock %}
+
{% block og_description %}{% blocktranslate with year=year|date:"Y" %}View meeting minutes for {{ year }}{% endblocktranslate %}{% endblock %}
{% block content %}
@@ -12,4 +13,4 @@
<li><a href="{{ meeting.get_absolute_url }}">{{ meeting }}</a></li>
{% endfor %}
</ul>
-{% endblock %}
+{% endblock content %}
diff --git a/djangoproject/templates/foundation/meeting_detail.html b/djangoproject/templates/foundation/meeting_detail.html
index 8f767b8e..bbd67600 100644
--- a/djangoproject/templates/foundation/meeting_detail.html
+++ b/djangoproject/templates/foundation/meeting_detail.html
@@ -2,6 +2,7 @@
{% load i18n %}
{% block og_title %}{% blocktranslate %}Meeting minutes: {{ meeting }}{% endblocktranslate %}{% endblock %}
+
{% block og_description %}{% blocktranslate %}Meeting minutes for {{ meeting }}{% endblocktranslate %}{% endblock %}
{% block content %}
@@ -103,4 +104,4 @@
{% endfor %}
</ul>
{% endif %}
-{% endblock %}
+{% endblock content %}
diff --git a/djangoproject/templates/foundation/meeting_snippet.html b/djangoproject/templates/foundation/meeting_snippet.html
index 0e72198e..7d6e6f30 100644
--- a/djangoproject/templates/foundation/meeting_snippet.html
+++ b/djangoproject/templates/foundation/meeting_snippet.html
@@ -5,7 +5,7 @@
<h4>
<a href="{{ m.get_absolute_url }}">{{ m }}</a>
</h4>
- {% with m.business.all as businesses %}
+ {% with businesses=m.business.all %}
{% if businesses %}
<div class="meta">
<b>{% translate "New and Ongoing business" %}</b>