diff --git a/src/fellchensammlung/templates/fellchensammlung/about.html b/src/fellchensammlung/templates/fellchensammlung/about.html index 29e463e..7ec6747 100644 --- a/src/fellchensammlung/templates/fellchensammlung/about.html +++ b/src/fellchensammlung/templates/fellchensammlung/about.html @@ -17,6 +17,15 @@

{% translate "Regeln" %}

{% include "fellchensammlung/lists/list-rules.html" %} + {% if faq %} +
+

{{ faq.title }}

+

+ {{ faq.content | render_markdown }} +

+
+ {% endif %} + {% if privacy_statement %}

{{ privacy_statement.title }}

diff --git a/src/fellchensammlung/views.py b/src/fellchensammlung/views.py index 4bafee4..f088112 100644 --- a/src/fellchensammlung/views.py +++ b/src/fellchensammlung/views.py @@ -359,7 +359,7 @@ def about(request): lang = Language.objects.get(languagecode=language_code) legal = {} - for text_code in ["terms_of_service", "privacy_statement", "imprint", "about_us"]: + for text_code in ["terms_of_service", "privacy_statement", "imprint", "about_us", "faq"]: try: legal[text_code] = Text.objects.get(text_code=text_code, language=lang, ) except Text.DoesNotExist: