From a27c2d2de9bc686f1676157f8c02225a5ff3cf14 Mon Sep 17 00:00:00 2001
From: Sarah Boyce <42296566+sarahboyce@users.noreply.github.com>
Date: Mon, 8 Dec 2025 12:13:48 +0100
Subject: [PATCH 1/2] Fixed blog archive headers.

---
 blog/tests.py                                 | 38 +++++++++++++++++++
 .../templates/blog/entry_archive_day.html     |  4 +-
 .../templates/blog/entry_archive_month.html   |  4 +-
 3 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/blog/tests.py b/blog/tests.py
index f67bc7ea16..33198ffa3c 100644
--- a/blog/tests.py
+++ b/blog/tests.py
@@ -466,6 +466,44 @@ def test_user_cannot_see_unpublished_entries(self):
         response = self.client.get(published_url)
         self.assertEqual(response.status_code, 200)
 
+    def test_archive_view_titles(self):
+        headline = "Pride and Prejudice - Review"
+        pub_date = date(2005, 7, 21)
+        Entry.objects.create(
+            pub_date=pub_date,
+            is_active=True,
+            headline=headline,
+            slug="a",
+            author="Jane Austen",
+        )
+        year = pub_date.strftime("%Y")
+        month = pub_date.strftime("%b").lower()
+        day = pub_date.strftime("%d")
+        for testcase in [
+            {
+                "view": "weblog:archive-year",
+                "kwargs": {"year": year},
+                "header": "<h1>2005 archive</h1>",
+            },
+            {
+                "view": "weblog:archive-month",
+                "kwargs": {"year": year, "month": month},
+                "header": "<h1>July 2005 archive</h1>",
+            },
+            {
+                "view": "weblog:archive-day",
+                "kwargs": {"year": year, "month": month, "day": day},
+                "header": "<h1>July 21 archive</h1>",
+            },
+        ]:
+            with self.subTest(view=testcase["view"]):
+                response = self.client.get(
+                    reverse(testcase["view"], kwargs=testcase["kwargs"])
+                )
+                self.assertEqual(response.status_code, 200)
+                self.assertContains(response, testcase["header"])
+                self.assertContains(response, headline)
+
 
 @override_settings(
     # Caching middleware is added in the production settings file;
diff --git a/djangoproject/templates/blog/entry_archive_day.html b/djangoproject/templates/blog/entry_archive_day.html
index f30add4ede..4eb48c2572 100644
--- a/djangoproject/templates/blog/entry_archive_day.html
+++ b/djangoproject/templates/blog/entry_archive_day.html
@@ -3,11 +3,11 @@
 
 {% block title %}{{ day|date:"MONTH_DAY_FORMAT" }} | {% translate "Weblog" %}{% endblock %}
 
-{% block og_title %}{% blocktranslate %}Django news: {{ day|date:"MONTH_DAY_FORMAT" }} archive{% endblocktranslate %}{% endblock %}
+{% block og_title %}{% blocktranslate with day=day|date:"MONTH_DAY_FORMAT" %}Django news: {{ day }} archive{% endblocktranslate %}{% endblock %}
 
 {% block content %}
 
-  <h1>{% blocktranslate %}{{ day|date:"MONTH_DAY_FORMAT" }} archive{% endblocktranslate %}</h1>
+  <h1>{% blocktranslate with day=day|date:"MONTH_DAY_FORMAT" %}{{ day }} archive{% endblocktranslate %}</h1>
 
   <ul class="list-news">
 
diff --git a/djangoproject/templates/blog/entry_archive_month.html b/djangoproject/templates/blog/entry_archive_month.html
index 939d2e7045..c2df7b8e1c 100644
--- a/djangoproject/templates/blog/entry_archive_month.html
+++ b/djangoproject/templates/blog/entry_archive_month.html
@@ -3,11 +3,11 @@
 
 {% block title %}{{ month|date:"YEAR_MONTH_FORMAT" }} | {% translate "Weblog" %}{% endblock %}
 
-{% block og_title %}{% blocktranslate %}Django news: {{ month|date:"YEAR_MONTH_FORMAT" }} archive{% endblocktranslate %}{% endblock %}
+{% block og_title %}{% blocktranslate with month=month|date:"YEAR_MONTH_FORMAT" %}Django news: {{ month }} archive{% endblocktranslate %}{% endblock %}
 
 {% block content %}
 
-  <h1>{% blocktranslate %}{{ month|date:"YEAR_MONTH_FORMAT" }} archive{% endblocktranslate %}</h1>
+  <h1>{% blocktranslate with month=month|date:"YEAR_MONTH_FORMAT" %}{{ month }} archive{% endblocktranslate %}</h1>
 
   <ul class="list-news">
 

From ce6fb0ac52d53fcc6b8ee9876ecf87082a0257e5 Mon Sep 17 00:00:00 2001
From: Sarah Boyce <42296566+sarahboyce@users.noreply.github.com>
Date: Thu, 18 Dec 2025 08:18:21 +0100
Subject: [PATCH 2/2] Included year in blog day archive header.

---
 blog/tests.py                                       | 2 +-
 djangoproject/templates/blog/entry_archive_day.html | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/blog/tests.py b/blog/tests.py
index 33198ffa3c..89f749e59c 100644
--- a/blog/tests.py
+++ b/blog/tests.py
@@ -493,7 +493,7 @@ def test_archive_view_titles(self):
             {
                 "view": "weblog:archive-day",
                 "kwargs": {"year": year, "month": month, "day": day},
-                "header": "<h1>July 21 archive</h1>",
+                "header": "<h1>July 21, 2005 archive</h1>",
             },
         ]:
             with self.subTest(view=testcase["view"]):
diff --git a/djangoproject/templates/blog/entry_archive_day.html b/djangoproject/templates/blog/entry_archive_day.html
index 4eb48c2572..ef3696f188 100644
--- a/djangoproject/templates/blog/entry_archive_day.html
+++ b/djangoproject/templates/blog/entry_archive_day.html
@@ -1,13 +1,13 @@
 {% extends "base_weblog.html" %}
 {% load i18n %}
 
-{% block title %}{{ day|date:"MONTH_DAY_FORMAT" }} | {% translate "Weblog" %}{% endblock %}
+{% block title %}{{ day|date:"DATE_FORMAT" }} | {% translate "Weblog" %}{% endblock %}
 
-{% block og_title %}{% blocktranslate with day=day|date:"MONTH_DAY_FORMAT" %}Django news: {{ day }} archive{% endblocktranslate %}{% endblock %}
+{% block og_title %}{% blocktranslate with day=day|date:"DATE_FORMAT" %}Django news: {{ day }} archive{% endblocktranslate %}{% endblock %}
 
 {% block content %}
 
-  <h1>{% blocktranslate with day=day|date:"MONTH_DAY_FORMAT" %}{{ day }} archive{% endblocktranslate %}</h1>
+  <h1>{% blocktranslate with day=day|date:"DATE_FORMAT" %}{{ day }} archive{% endblocktranslate %}</h1>
 
   <ul class="list-news">