From b7a3915de3cc65290081b82acd21e609b575cb48 Mon Sep 17 00:00:00 2001
From: Lucas Brandstaetter <lucas@brandstaetter.tech>
Date: Thu, 28 Nov 2024 02:34:04 +0100
Subject: [PATCH] Add assembly description to assembly detail view
Fixes #609
---
src/backoffice/locale/de/LC_MESSAGES/django.po | 10 ++++++++++
src/backoffice/locale/en/LC_MESSAGES/django.po | 10 ++++++++++
.../assemblyteam_assembly_detail.html | 17 ++++++++++++++++-
src/core/locale/en/LC_MESSAGES/django.po | 2 +-
4 files changed, 37 insertions(+), 2 deletions(-)
diff --git a/src/backoffice/locale/de/LC_MESSAGES/django.po b/src/backoffice/locale/de/LC_MESSAGES/django.po
index 1a8e540a0..ba2a6a567 100644
--- a/src/backoffice/locale/de/LC_MESSAGES/django.po
+++ b/src/backoffice/locale/de/LC_MESSAGES/django.po
@@ -744,6 +744,16 @@ msgstr "(Noch?) Keine Daten zugeordnet."
msgid "Assembly__registration_data"
msgstr "Registrierungs-Daten"
+# use translation from core
+msgid "Assembly__description"
+msgstr ""
+
+msgid "german"
+msgstr "Deutsch"
+
+msgid "english"
+msgstr "Englisch"
+
msgid "assemblyedit_statebtn_registered"
msgstr "registriert"
diff --git a/src/backoffice/locale/en/LC_MESSAGES/django.po b/src/backoffice/locale/en/LC_MESSAGES/django.po
index 317e86584..548a9e42f 100644
--- a/src/backoffice/locale/en/LC_MESSAGES/django.po
+++ b/src/backoffice/locale/en/LC_MESSAGES/django.po
@@ -742,6 +742,16 @@ msgstr "No data assigned (yet?)."
msgid "Assembly__registration_data"
msgstr "registration data"
+# (use translation from core)
+msgid "Assembly__description"
+msgstr ""
+
+msgid "german"
+msgstr "german"
+
+msgid "english"
+msgstr "english"
+
msgid "assemblyedit_statebtn_registered"
msgstr "registered"
diff --git a/src/backoffice/templates/backoffice/assemblyteam_assembly_detail.html b/src/backoffice/templates/backoffice/assemblyteam_assembly_detail.html
index 2598f5142..cbede58d1 100644
--- a/src/backoffice/templates/backoffice/assemblyteam_assembly_detail.html
+++ b/src/backoffice/templates/backoffice/assemblyteam_assembly_detail.html
@@ -3,6 +3,7 @@
{% load i18n %}
{% load static %}
{% load c3assemblies %}
+{% load verbose_name %}
{% block content %}
<span class="float-end text-muted small">
@@ -64,7 +65,21 @@
</dl>
<div class="row">
- <div class="col-md-6"></div>
+ <div class="col-md-12">
+ <dl class="row">
+ <dt class="col-md-2">{{ object|verbose_name:"description" }} {% trans "german" %}:</dt>
+ <dd class="col-sm-10">
+ {{ object.description_de }}
+ </dd>
+ </dl>
+
+ <dl class="row">
+ <dt class="col-md-2">{{ object|verbose_name:"description" }} {% trans "english" %}</dt>
+ <dd class="col-sm-10">
+ {{ object.description_en }}
+ </dd>
+ </dl>
+ </div>
</div>
</div>
<div class="col-md-4">
diff --git a/src/core/locale/en/LC_MESSAGES/django.po b/src/core/locale/en/LC_MESSAGES/django.po
index 2ace4f5ce..8e2d4907c 100644
--- a/src/core/locale/en/LC_MESSAGES/django.po
+++ b/src/core/locale/en/LC_MESSAGES/django.po
@@ -304,7 +304,7 @@ msgid "Assembly__description__help"
msgstr "what happens in this assembly (will be shown publicly)"
msgid "Assembly__description"
-msgstr "description"
+msgstr "public description"
msgid "Assembly__registration_details__help"
msgstr "Please tell us what you have planned for your assembly, in particular whether and what you want to design yourself and what you are bringing with you. (not public, only for assembly team)"
--
GitLab