dnscms: start adding locales, set and translate verbose names for events

dnscms/dnscms/settings/base.py

@@ -144,6 +144,8 @@ USE_L10N = True
 
 USE_TZ = True
 
+LOCALE_PATHS = [os.path.join(BASE_DIR, "locale")]
+
 
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/4.2/howto/static-files/

dnscms/dnscms/wagtail_hooks.py

@@ -6,7 +6,6 @@ from wagtail import hooks
 from wagtail.admin.menu import MenuItem
 
 from associations.models import AssociationIndex
-from events.models import EventIndex
 from news.models import NewsIndex
 
 
@@ -15,15 +14,6 @@ def enable_additional_rich_text_features(features):
     features.default_features.extend(["h5", "h6", "blockquote"])
 
 
-@hooks.register("register_admin_menu_item")
-def register_events_menu_item():
-    page = EventIndex.objects.first()
-    events_url = "#"
-    if page:
-        events_url = reverse("wagtailadmin_explore", args=(quote(page.pk),))
-    return MenuItem("Arrangementer", events_url, icon_name="date", order=1)
-
-
 @hooks.register("register_admin_menu_item")
 def register_associations_menu_item():
     page = AssociationIndex.objects.first()
@@ -34,7 +24,7 @@ def register_associations_menu_item():
 
 
 @hooks.register("register_admin_menu_item")
-def register_associations_menu_item():
+def register_news_menu_item():
     page = NewsIndex.objects.first()
     news_url = "#"
     if page:

dnscms/events/admin.py

@@ -0,0 +1,86 @@
+from urllib.parse import urlencode
+
+from django.urls import reverse
+from django.utils import timezone
+from wagtail.admin.ui.tables import Column, DateColumn
+from wagtail.admin.ui.tables.pages import PageStatusColumn, PageTitleColumn
+from wagtail.admin.views.pages.choose_parent import ChooseParentView
+from wagtail.admin.views.pages.listing import IndexView
+from wagtail.admin.viewsets.pages import PageListingViewSet
+
+from events.models import EventPage
+
+
+class EventDateColumn(Column):
+    def get_value(self, instance):
+        occurrences = list(instance.occurrences.order_by("start"))
+        if not occurrences:
+            return "—"
+        if len(occurrences) == 1:
+            local = timezone.localtime(occurrences[0].start)
+            return local.strftime("%Y-%m-%d kl %H:%M")
+        return f"{len(occurrences)} forekomster"
+
+
+class OrganizersColumn(Column):
+    def get_value(self, instance):
+        names = list(instance.organizers.values_list("name", flat=True))
+        if not names:
+            return "—"
+        if len(names) == 1:
+            return names[0]
+        return f"{names[0]} (+{len(names) - 1})"
+
+
+class EventPageIndexView(IndexView):
+    def annotate_queryset(self, pages):
+        pages = super().annotate_queryset(pages)
+        return pages.prefetch_related(
+            "occurrences",
+            "organizer_links__organizer",
+        )
+
+
+class EventChooseParentView(ChooseParentView):
+    """Redirect newly-created EventPages back to the events listing."""
+
+    def _with_next(self, response):
+        if response.status_code != 302:
+            return response
+        url = response["Location"]
+        sep = "&" if "?" in url else "?"
+        response["Location"] = f"{url}{sep}{urlencode({'next': reverse('events:index')})}"
+        return response
+
+    def get(self, request, *args, **kwargs):
+        return self._with_next(super().get(request, *args, **kwargs))
+
+    def form_valid(self, form):
+        return self._with_next(super().form_valid(form))
+
+
+class EventPageListingViewSet(PageListingViewSet):
+    model = EventPage
+    index_view_class = EventPageIndexView
+    choose_parent_view_class = EventChooseParentView
+    icon = "date"
+    menu_label = "Arrangementer"
+    menu_order = 1
+    add_to_admin_menu = True
+    ordering = "-latest_revision_created_at"
+
+    columns = [
+        PageTitleColumn("title", label="Tittel", sort_key="title", classname="title"),
+        EventDateColumn("event_date", label="Dato", width="13%"),
+        OrganizersColumn("organizers", label="Arrangører", width="12%"),
+        DateColumn(
+            "latest_revision_created_at",
+            label="Oppdatert",
+            sort_key="latest_revision_created_at",
+            width="10%",
+        ),
+        PageStatusColumn("status", label="Status", sort_key="live", width="10%"),
+    ]
+
+
+event_page_listing_viewset = EventPageListingViewSet("events")

dnscms/events/migrations/0054_alter_eventpage_options.py

@@ -0,0 +1,17 @@
+# Generated by Django 6.0.5 on 2026-05-19 18:40
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('events', '0053_eventpage_lead'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='eventpage',
+            options={'verbose_name': 'event', 'verbose_name_plural': 'events'},
+        ),
+    ]

dnscms/events/models.py

@@ -391,6 +391,10 @@ class EventPage(HeadlessMixin, WPImportedPageMixin, Page):
 
     search_fields = Page.search_fields + [index.SearchField("body")]
 
+    class Meta:
+        verbose_name = _("event")
+        verbose_name_plural = _("events")
+
     def clean(self):
         super().clean()
 

dnscms/events/wagtail_hooks.py

@@ -1,8 +1,14 @@
 from wagtail import hooks
 
+from .admin import event_page_listing_viewset
 from .views import event_organizer_chooser_viewset
 
 
 @hooks.register("register_admin_viewset")
 def register_viewset():
     return event_organizer_chooser_viewset
+
+
+@hooks.register("register_admin_viewset")
+def register_event_page_listing_viewset():
+    return event_page_listing_viewset

dnscms/home/templates/home/home_page.html

@@ -1,21 +0,0 @@
-{% extends "base.html" %}
-{% load static %}
-
-{% block body_class %}template-homepage{% endblock %}
-
-{% block extra_css %}
-
-{% comment %}
-Delete the line below if you're just getting started and want to remove the welcome screen!
-{% endcomment %}
-<link rel="stylesheet" href="{% static 'css/welcome_page.css' %}">
-{% endblock extra_css %}
-
-{% block content %}
-
-{% comment %}
-Delete the line below if you're just getting started and want to remove the welcome screen!
-{% endcomment %}
-{% include 'home/welcome_page.html' %}
-
-{% endblock content %}

dnscms/home/templates/home/welcome_page.html

@@ -1,52 +0,0 @@
-{% load i18n wagtailcore_tags %}
-
-<header class="header">
-    <div class="logo">
-        <a href="https://wagtail.org/">
-            <svg class="figure-logo" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 342.5 126.2"><title>{% trans "Visit the Wagtail website" %}</title><path fill="#FFF" d="M84 1.9v5.7s-10.2-3.8-16.8 3.1c-4.8 5-5.2 10.6-3 18.1 21.6 0 25 12.1 25 12.1L87 27l6.8-8.3c0-9.8-8.1-16.3-9.8-16.8z"/><circle cx="85.9" cy="15.9" r="2.6"/><path d="M89.2 40.9s-3.3-16.6-24.9-12.1c-2.2-7.5-1.8-13 3-18.1C73.8 3.8 84 7.6 84 7.6V1.9C80.4.3 77 0 73.2 0 59.3 0 51.6 10.4 48.3 17.4L9.2 89.3l11-2.1-20.2 39 14.1-2.5L24.9 93c30.6 0 69.8-11 64.3-52.1z"/><path d="M102.4 27l-8.6-8.3L87 27z"/><path fill="#FFF" d="M30 84.1s1-.2 2.8-.6c1.8-.4 4.3-1 7.3-1.8 1.5-.4 3.1-.9 4.8-1.5 1.7-.6 3.5-1.2 5.2-2 1.8-.7 3.6-1.6 5.4-2.6 1.8-1 3.5-2.1 5.1-3.4.4-.3.8-.6 1.2-1l1.2-1c.7-.7 1.5-1.4 2.2-2.2.7-.7 1.3-1.5 1.9-2.3l.9-1.2.4-.6.4-.6c.2-.4.5-.8.7-1.2.2-.4.4-.8.7-1.2l.3-.6.3-.6c.2-.4.4-.8.5-1.2l.9-2.4c.2-.8.5-1.6.7-2.3.2-.7.3-1.5.5-2.1.1-.7.2-1.3.3-2 .1-.6.2-1.2.2-1.7.1-.5.1-1 .2-1.5.1-1.8.1-2.8.1-2.8l1.6.1s-.1 1.1-.2 2.9c-.1.5-.1 1-.2 1.5-.1.6-.1 1.2-.3 1.8-.1.6-.3 1.3-.4 2-.2.7-.4 1.4-.6 2.2-.2.8-.5 1.5-.8 2.4-.3.8-.6 1.6-1 2.5l-.6 1.2-.3.6-.3.6c-.2.4-.5.8-.7 1.3-.3.4-.5.8-.8 1.2-.1.2-.3.4-.4.6l-.4.6-.9 1.2c-.7.8-1.3 1.6-2.1 2.3-.7.8-1.5 1.4-2.3 2.2l-1.2 1c-.4.3-.8.6-1.3.9-1.7 1.2-3.5 2.3-5.3 3.3-1.8.9-3.7 1.8-5.5 2.5-1.8.7-3.6 1.3-5.3 1.8-1.7.5-3.3 1-4.9 1.3-3 .7-5.6 1.3-7.4 1.6-1.6.6-2.6.8-2.6.8z"/><g fill="#231F20"><path d="M127 83.9h-8.8l-12.6-36.4h7.9l9 27.5 9-27.5h7.9l9 27.5 9-27.5h7.9L153 83.9h-8.8L135.6 59 127 83.9zM200.1 83.9h-7V79c-3 3.6-7 5.4-12.1 5.4-3.8 0-6.9-1.1-9.4-3.2s-3.7-5-3.7-8.6c0-3.6 1.3-6.3 4-8 2.6-1.8 6.2-2.7 10.7-2.7h9.9v-1.4c0-4.8-2.7-7.3-8.1-7.3-3.4 0-6.9 1.2-10.5 3.7l-3.4-4.8c4.4-3.5 9.4-5.3 15.1-5.3 4.3 0 7.8 1.1 10.5 3.2 2.7 2.2 4.1 5.6 4.1 10.2v23.7zm-7.7-13.6v-3.1h-8.6c-5.5 0-8.3 1.7-8.3 5.2 0 1.8.7 3.1 2.1 4.1 1.4.9 3.3 1.4 5.7 1.4 2.4 0 4.6-.7 6.4-2.1 1.8-1.3 2.7-3.1 2.7-5.5zM241.7 47.5v31.7c0 6.4-1.7 11.3-5.2 14.5-3.5 3.2-8 4.8-13.4 4.8-5.5 0-10.4-1.7-14.8-5.1l3.6-5.8c3.6 2.7 7.1 4 10.8 4 3.6 0 6.5-.9 8.6-2.8 2.1-1.9 3.2-4.9 3.2-9v-4.7c-1.1 2.1-2.8 3.9-4.9 5.1-2.1 1.3-4.5 1.9-7.1 1.9-4.8 0-8.8-1.7-11.9-5.1-3.1-3.4-4.7-7.6-4.7-12.6s1.6-9.2 4.7-12.6c3.1-3.4 7.1-5.1 11.9-5.1 4.8 0 8.7 2 11.7 6v-5.4h7.5zm-28.4 16.8c0 3 .9 5.6 2.8 7.7 1.8 2.2 4.3 3.2 7.5 3.2 3.1 0 5.7-1 7.6-3.1 1.9-2.1 2.9-4.7 2.9-7.8 0-3.1-1-5.8-2.9-7.9-2-2.2-4.5-3.2-7.6-3.2-3.1 0-5.6 1.1-7.4 3.4-2 2.1-2.9 4.7-2.9 7.7zM260.9 53.6v18.5c0 1.7.5 3.1 1.4 4.1.9 1 2.2 1.5 3.8 1.5 1.6 0 3.2-.8 4.7-2.4l3.1 5.4c-2.7 2.4-5.7 3.6-8.9 3.6-3.3 0-6-1.1-8.3-3.4-2.3-2.3-3.5-5.3-3.5-9.1V53.6h-4.6v-6.2h4.6V36.1h7.7v11.4h9.6v6.2h-9.6zM309.5 83.9h-7V79c-3 3.6-7 5.4-12.1 5.4-3.8 0-6.9-1.1-9.4-3.2s-3.7-5-3.7-8.6c0-3.6 1.3-6.3 4-8 2.6-1.8 6.2-2.7 10.7-2.7h9.9v-1.4c0-4.8-2.7-7.3-8.1-7.3-3.4 0-6.9 1.2-10.5 3.7l-3.4-4.8c4.4-3.5 9.4-5.3 15.1-5.3 4.3 0 7.8 1.1 10.5 3.2 2.7 2.2 4.1 5.6 4.1 10.2v23.7zm-7.7-13.6v-3.1h-8.6c-5.5 0-8.3 1.7-8.3 5.2 0 1.8.7 3.1 2.1 4.1 1.4.9 3.3 1.4 5.7 1.4 2.4 0 4.6-.7 6.4-2.1 1.8-1.3 2.7-3.1 2.7-5.5zM319.3 40.2c-1-1-1.4-2.1-1.4-3.4 0-1.3.5-2.5 1.4-3.4 1-1 2.1-1.4 3.4-1.4 1.3 0 2.5.5 3.4 1.4 1 1 1.4 2.1 1.4 3.4 0 1.3-.5 2.5-1.4 3.4s-2.1 1.4-3.4 1.4c-1.3.1-2.4-.4-3.4-1.4zm7.2 43.7h-7.7V47.5h7.7v36.4zM342.5 83.9h-7.7V33.1h7.7v50.8z"/></g></svg>
-        </a>
-    </div>
-    <div class="header-link">
-        {% comment %}
-        This works for all cases but prerelease versions:
-        {% endcomment %}
-        <a href="{% wagtail_documentation_path %}/releases/{% wagtail_release_notes_path %}">
-            {% trans "View the release notes" %}
-        </a>
-    </div>
-</header>
-<main class="main">
-    <div class="figure">
-        <svg class="figure-space" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 300 300" aria-hidden="true">
-            <path class="egg" fill="currentColor" d="M150 250c-42.741 0-75-32.693-75-90s42.913-110 75-110c32.088 0 75 52.693 75 110s-32.258 90-75 90z"/>
-            <ellipse fill="#ddd" cx="150" cy="270" rx="40" ry="7"/>
-        </svg>
-    </div>
-    <div class="main-text">
-        <h1>{% trans "Welcome to your new Wagtail site!" %}</h1>
-        <p>{% trans 'Please feel free to <a href="https://github.com/wagtail/wagtail/wiki/Slack">join our community on Slack</a>, or get started with one of the links below.' %}</p>
-    </div>
-</main>
-<footer class="footer" role="contentinfo">
-    <a class="option option-one" href="{% wagtail_documentation_path %}/">
-        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true"><path d="M9 21c0 .5.4 1 1 1h4c.6 0 1-.5 1-1v-1H9v1zm3-19C8.1 2 5 5.1 5 9c0 2.4 1.2 4.5 3 5.7V17c0 .5.4 1 1 1h6c.6 0 1-.5 1-1v-2.3c1.8-1.3 3-3.4 3-5.7 0-3.9-3.1-7-7-7zm2.9 11.1l-.9.6V16h-4v-2.3l-.9-.6C7.8 12.2 7 10.6 7 9c0-2.8 2.2-5 5-5s5 2.2 5 5c0 1.6-.8 3.2-2.1 4.1z"/></svg>
-        <div>
-            <h2>{% trans "Wagtail Documentation" %}</h2>
-            <p>{% trans "Topics, references, & how-tos" %}</p>
-        </div>
-    </a>
-    <a class="option option-two" href="{% wagtail_documentation_path %}/getting_started/tutorial.html">
-        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true"><path d="M0 0h24v24H0V0z" fill="none"/><path d="M9.4 16.6L4.8 12l4.6-4.6L8 6l-6 6 6 6 1.4-1.4zm5.2 0l4.6-4.6-4.6-4.6L16 6l6 6-6 6-1.4-1.4z"/></svg>
-        <div>
-            <h2>{% trans "Tutorial" %}</h2>
-            <p>{% trans "Build your first Wagtail site" %}</p>
-        </div>
-    </a>
-    <a class="option option-three" href="{% url 'wagtailadmin_home' %}">
-        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true"><path d="M0 0h24v24H0z" fill="none"/><path d="M16.5 13c-1.2 0-3.07.34-4.5 1-1.43-.67-3.3-1-4.5-1C5.33 13 1 14.08 1 16.25V19h22v-2.75c0-2.17-4.33-3.25-6.5-3.25zm-4 4.5h-10v-1.25c0-.54 2.56-1.75 5-1.75s5 1.21 5 1.75v1.25zm9 0H14v-1.25c0-.46-.2-.86-.52-1.22.88-.3 1.96-.53 3.02-.53 2.44 0 5 1.21 5 1.75v1.25zM7.5 12c1.93 0 3.5-1.57 3.5-3.5S9.43 5 7.5 5 4 6.57 4 8.5 5.57 12 7.5 12zm0-5.5c1.1 0 2 .9 2 2s-.9 2-2 2-2-.9-2-2 .9-2 2-2zm9 5.5c1.93 0 3.5-1.57 3.5-3.5S18.43 5 16.5 5 13 6.57 13 8.5s1.57 3.5 3.5 3.5zm0-5.5c1.1 0 2 .9 2 2s-.9 2-2 2-2-.9-2-2 .9-2 2-2z"/></svg>
-        <div>
-            <h2>{% trans "Admin Interface" %}</h2>
-            <p>{% trans "Create your superuser first!" %}</p>
-        </div>
-    </a>
-</footer>

dnscms/locale/nb/LC_MESSAGES/django.po

@@ -0,0 +1,43 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: dnscms\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2026-05-19 20:44+0200\n"
+"Language: nb\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: events/models.py:73 events/models.py:155
+msgid "slug"
+msgstr "permalenke"
+
+#: events/models.py:75
+msgid "The name of the category as it will appear in URLs."
+msgstr "Navnet på kategorien slik det vil vises i URL-er."
+
+#: events/models.py:157
+msgid "The name of the organizer as it will appear in URLs."
+msgstr "Navnet på arrangøren slik det vil vises i URL-er."
+
+#: events/models.py:395
+msgid "event"
+msgstr "arrangement"
+
+#: events/models.py:396
+msgid "events"
+msgstr "arrangementer"
+
+#: images/models.py:40
+msgid "image"
+msgstr "bilde"
+
+#: images/models.py:41
+msgid "images"
+msgstr "bilder"

dnscms/mise.toml

@@ -0,0 +1,8 @@
+# Translation tasks
+[tasks.compilemessages]
+description = "Compile translation files for Norwegian Bokmal"
+run = "uv run manage.py compilemessages -l nb"
+
+[tasks.makemessages]
+description = "Extract translation strings for Norwegian Bokmal"
+run = "uv run manage.py makemessages -l nb"

dnscms/tests/test_events.py

@@ -4,6 +4,7 @@ import pytest
 from django.core.exceptions import ValidationError
 from django.utils import timezone
 
+from events.admin import EventDateColumn, OrganizersColumn
 from events.models import (
     EventCategory,
     EventOccurrence,
@@ -212,6 +213,62 @@ def test_graphql_event_index_future_events_ordered_by_next_occurrence(event_inde
     assert titles.index("Sooner gig") < titles.index("Later gig")
 
 
+def test_event_date_column_no_occurrences(event_index):
+    event = EventPageFactory(parent=event_index)
+    column = EventDateColumn("event_date")
+
+    assert column.get_value(event) == "—"
+
+
+def test_event_date_column_single_occurrence(event_index):
+    event = EventPageFactory(parent=event_index)
+    start = timezone.make_aware(datetime(2025, 7, 22, 19, 30))
+    EventOccurrence.objects.create(event=event, start=start, venue_custom="X")
+    column = EventDateColumn("event_date")
+
+    assert column.get_value(event) == "2025-07-22 kl 19:30"
+
+
+def test_event_date_column_multiple_occurrences_shows_count(event_index):
+    event = EventPageFactory(parent=event_index)
+    now = timezone.now()
+    EventOccurrence.objects.create(event=event, start=now, venue_custom="X")
+    EventOccurrence.objects.create(event=event, start=now + timedelta(days=1), venue_custom="X")
+    EventOccurrence.objects.create(event=event, start=now + timedelta(days=2), venue_custom="X")
+    column = EventDateColumn("event_date")
+
+    assert column.get_value(event) == "3 forekomster"
+
+
+def test_organizers_column_no_organizers(event_index):
+    event = EventPageFactory(parent=event_index)
+    column = OrganizersColumn("organizers")
+
+    assert column.get_value(event) == "—"
+
+
+def test_organizers_column_single_organizer_shows_name(event_index):
+    org = EventOrganizer.objects.create(name="Forening A", slug="forening-a")
+    event = EventPageFactory(parent=event_index)
+    EventOrganizerLink.objects.create(event=event, organizer=org)
+    column = OrganizersColumn("organizers")
+
+    assert column.get_value(event) == "Forening A"
+
+
+def test_organizers_column_multiple_organizers_truncates_with_count(event_index):
+    org_a = EventOrganizer.objects.create(name="Forening A", slug="forening-a")
+    org_b = EventOrganizer.objects.create(name="Forening B", slug="forening-b")
+    org_c = EventOrganizer.objects.create(name="Forening C", slug="forening-c")
+    event = EventPageFactory(parent=event_index)
+    EventOrganizerLink.objects.create(event=event, organizer=org_a, sort_order=0)
+    EventOrganizerLink.objects.create(event=event, organizer=org_b, sort_order=1)
+    EventOrganizerLink.objects.create(event=event, organizer=org_c, sort_order=2)
+    column = OrganizersColumn("organizers")
+
+    assert column.get_value(event) == "Forening A (+2)"
+
+
 @pytest.fixture
 def comprehensive_event(event_index, venue, association_index):
     """A fully-populated paid EventPage exercising every field exposed via GraphQL."""