diff --git a/.project-dictionary.txt b/.project-dictionary.txt
index 6c6feaa3d86ff5a5975da0b158ba28556d2fcae5..c17fcebf15bfa8d3272c99c26db38071f6f207e8 100644
--- a/.project-dictionary.txt
+++ b/.project-dictionary.txt
@@ -6,6 +6,8 @@ blocktranslate
clonbares
CLUBFRIENDS
Conferencemember
+csrf
+csrfmiddlewaretoken
datatables
derefer
Dereferrer
@@ -24,6 +26,8 @@ htmlhead
JITSI
keepalive
markdownify
+merch
+Merch
metanav
msgid
msgstr
diff --git a/src/plainui/jinja2/plainui/badges/list.html.j2 b/src/plainui/jinja2/plainui/badges/list.html.j2
index 5970a532a22e3d052c9a4a4806793636a9983d1a..e99d29d6ba2832a2275d6aa234c6d8f32969d66d 100644
--- a/src/plainui/jinja2/plainui/badges/list.html.j2
+++ b/src/plainui/jinja2/plainui/badges/list.html.j2
@@ -33,7 +33,7 @@
<a href="{{ url('plainui:manage_badges') }}" class="hub-btn">{{ _("badge__manage") }}</a>
</div>
{% else %}
- {{ _("archivemode_notavailable") }}
+ {{ _("Archive_mode__not_available") }}
{% endif %}
</div>
</div>
diff --git a/src/plainui/jinja2/plainui/board.html.j2 b/src/plainui/jinja2/plainui/board.html.j2
index 56c113331176811b071e82bc93c1c439ea34bf73..a53208acd08562ccfd8aae28004718f082193020 100644
--- a/src/plainui/jinja2/plainui/board.html.j2
+++ b/src/plainui/jinja2/plainui/board.html.j2
@@ -85,6 +85,6 @@
</div>
{% else %}
{# archive mode #}
- {{ _("archivemode_notavailable") }}
+ {{ _("Archive_mode__not_available") }}
{% endif %}
{% endblock content %}
diff --git a/src/plainui/jinja2/plainui/components/buttons.html.j2 b/src/plainui/jinja2/plainui/components/buttons.html.j2
index af194370d96d22f7c0e444b7dead85bac8695d47..f6ea6398ea74ef47080c2e74270eb3dc3fc478f0 100644
--- a/src/plainui/jinja2/plainui/components/buttons.html.j2
+++ b/src/plainui/jinja2/plainui/components/buttons.html.j2
@@ -1,6 +1,6 @@
{% macro primary(label, link, icon=None) -%}
<a class="hub-btn" href="{{ link }}">
{% if icon %}<i class="bi bi-{{ icon }}"></i>{% endif %}
- {{ _("index__box-whatshappening__fahrplanlink") }}
+ {{ _("index__box-whats_happening__fahrplan_link") }}
</a>
{%- endmacro %}
diff --git a/src/plainui/jinja2/plainui/components/list_rooms.html.j2 b/src/plainui/jinja2/plainui/components/list_rooms.html.j2
index 0acb698bc1efec59b9267ce4f0d2dfc273153a8a..11f12e5abbe67be289b151305a165c72e7287a24 100644
--- a/src/plainui/jinja2/plainui/components/list_rooms.html.j2
+++ b/src/plainui/jinja2/plainui/components/list_rooms.html.j2
@@ -24,7 +24,7 @@
<li class="hub-list-item hub-grid-title-buttons">
<div class="hub-grid-title">
<span class="me-3 btn-icon-big"
- title="{{ _("roomtype") ~ ': ' ~ _(room.room_type) }}">{{ icon(room.room_type) }}</span>
+ title="{{ _("Room__type") ~ ': ' ~ _(room.room_type) }}">{{ icon(room.room_type) }}</span>
<a href="{{ link }}" title="{{ room.name }}" class="flex-grow-1">{{ room.name }}</a>
</div>
<div class="hub-grid-buttons">
diff --git a/src/plainui/jinja2/plainui/components/nav.html.j2 b/src/plainui/jinja2/plainui/components/nav.html.j2
index 6d76e9e4a979afbb9ec97e59c96898194762d676..90acccb2597d93dd9ba9d0f4fcd9238fa8e52c42 100644
--- a/src/plainui/jinja2/plainui/components/nav.html.j2
+++ b/src/plainui/jinja2/plainui/components/nav.html.j2
@@ -48,7 +48,7 @@
<a class="dropdown-item disabled text-decoration-line-through"
disabled="disabled"
href="#"
- title="{{ _('archivemode_loginlink_hint') }}">Login</a>
+ title="{{ _('archive_mode_login_link_hint') }}">Login</a>
</li>
{% elif request.user.is_authenticated %}
<li>
diff --git a/src/plainui/jinja2/plainui/fahrplan.html.j2 b/src/plainui/jinja2/plainui/fahrplan.html.j2
index fbc623201df346467b225b23eafdb84ea12000b1..c24000dc46271b98b62527ca78f51e2cc1b19d13 100644
--- a/src/plainui/jinja2/plainui/fahrplan.html.j2
+++ b/src/plainui/jinja2/plainui/fahrplan.html.j2
@@ -74,7 +74,7 @@
{{ filter_button('kall', kind == 'all', _("all") ) }}
{{ filter_button('kofficial' if kind != 'official' else 'kall', kind == 'official', _("curated only") ) }}
{{ filter_button('kassembly' if kind != 'assembly' else 'kall', kind == 'assembly', _("assembly only") ) }}
- {{ filter_button('ksos' if kind != 'sos' else 'kall', kind == 'sos', _("selforganized only") ) }}
+ {{ filter_button('ksos' if kind != 'sos' else 'kall', kind == 'sos', _("self_organized only") ) }}
</div>
<div class="hub-tags mb-2">
diff --git a/src/plainui/jinja2/plainui/index.html.j2 b/src/plainui/jinja2/plainui/index.html.j2
index 5b25fab2714e156607fe6974640b9efa8f0f8c9d..e50510cbee77dfc6aa83ac7e338f113969913c73 100644
--- a/src/plainui/jinja2/plainui/index.html.j2
+++ b/src/plainui/jinja2/plainui/index.html.j2
@@ -35,11 +35,11 @@
</div>
<div class="hub-col-325px hub-card">
- <h2 class="hub-section-title">{{ _("index__box-whatshappening__title") }}</h2>
+ <h2 class="hub-section-title">{{ _("index__box-whats_happening__title") }}</h2>
<div class="hub-vlayout-l">
{% if conf.is_running %}
<div>
- <h3 class="hub-section-title">{{ _("index__box-whatshappening__official") }}</h3>
+ <h3 class="hub-section-title">{{ _("index__box-whats_happening__official") }}</h3>
{{ list_events.list(upcoming_events_official,
is_favorite_events,
event_class='hub-event--small',
@@ -47,21 +47,21 @@
</div>
<div>
- <h3 class="hub-section-title">{{ _("index__box-whatshappening__selforganized") }}</h3>
- {{ list_events.list(upcoming_events_selforganized,
+ <h3 class="hub-section-title">{{ _("index__box-whats_happening__self_organized") }}</h3>
+ {{ list_events.list(upcoming_events_self_organized,
is_favorite_events,
event_class='hub-event--small',
hide_buttons=True) }}
</div>
{% elif conf.has_ended %}
- <p>{{ _("index__box-whatshappening__ended") }}</p>
+ <p>{{ _("index__box-whats_happening__ended") }}</p>
{% else %}
- <p>{{ _("index__box-whatshappening__waiting") }}</p>
- <p class="fs-3 fw-bold">{{ _("index__box-whatshappening__day") }} {{ conf.current_day }}</p>
+ <p>{{ _("index__box-whats_happening__waiting") }}</p>
+ <p class="fs-3 fw-bold">{{ _("index__box-whats_happening__day") }} {{ conf.current_day }}</p>
{% endif %}
</div>
<div class="d-flex justify-content-end">
- {{ buttonsMacro.primary(_('index__box-whatshappening__fahrplanlink') ,
+ {{ buttonsMacro.primary(_('index__box-whats_happening__fahrplan_link') ,
url('plainui:fahrplan'),
icon='calendar-week'
) }}
diff --git a/src/plainui/jinja2/plainui/login.html.j2 b/src/plainui/jinja2/plainui/login.html.j2
index 9f25baf47ed7664b0e2448b576106f4601a054cc..96d2fd675ad60d67fbf1b0f7fc06dd6714cb3fbc 100644
--- a/src/plainui/jinja2/plainui/login.html.j2
+++ b/src/plainui/jinja2/plainui/login.html.j2
@@ -34,7 +34,7 @@
class="btn btn-secondary"
title="{{ _('Reset Password') }}">{{ _('Reset Password') }}</a>
</div>
- <p class="mb-2 text-white">{{ _("login--cookieinfo") }}</p>
+ <p class="mb-2 text-white">{{ _("login--cookie_info") }}</p>
<hr class="hub-spacer">
<h3>{{ _("New here?") }}</h3>
@@ -46,7 +46,7 @@
</div>
</form>
{% else %}
- <p class="mb-2 text-white">{{ _("archivemode_nologin") }}</p>
+ <p class="mb-2 text-white">{{ _("archive_mode_no_login") }}</p>
{% endif %}
</div>
diff --git a/src/plainui/jinja2/plainui/redeem_token.html.j2 b/src/plainui/jinja2/plainui/redeem_token.html.j2
index 4f302082b9bae4ad47e96eb40342b6972a84fde2..241eef1b2839bdddfe716735151057d231f53437 100644
--- a/src/plainui/jinja2/plainui/redeem_token.html.j2
+++ b/src/plainui/jinja2/plainui/redeem_token.html.j2
@@ -68,7 +68,7 @@
{{ form_elements.password(form_create, 'password1') }}
{{ form_elements.password(form_create, 'password2') }}
<ul class="row row-cols-1 row-cols-lg-3 list-unstyled">
- <li class="col-auto">{{ _("login--cookieinfo") }}</li>
+ <li class="col-auto">{{ _("login--cookie_info") }}</li>
<li class="col ml-auto">
<button type="submit" class="btn btn-xl btn-block btn-primary ml-auto">
{{ _("Create a new Account with your Ticket") }}
@@ -91,7 +91,7 @@
{{ form_elements.text(form_add, 'username') }}
{{ form_elements.password(form_add, 'password') }}
<ul class="row row-cols-1 row-cols-lg-3 list-unstyled">
- <li class="col-auto">{{ _("login--cookieinfo") }}</li>
+ <li class="col-auto">{{ _("login--cookie_info") }}</li>
<li class="col ml-auto">
<button type="submit" class="btn btn-xl btn-block btn-primary ml-auto">
{{ _("Add your Ticket to this existing Account") }}
diff --git a/src/plainui/jinja2/plainui/signup.html.j2 b/src/plainui/jinja2/plainui/signup.html.j2
index 58d0f4db8829430c27491fe86229a25224c46555..8403e466121a7cd9b8b1b25572c76284cecc1486 100644
--- a/src/plainui/jinja2/plainui/signup.html.j2
+++ b/src/plainui/jinja2/plainui/signup.html.j2
@@ -34,7 +34,7 @@
</div>
</form>
{% else %}
- <p class="mb-2 text-white">{{ _("archivemode_nologin") }}</p>
+ <p class="mb-2 text-white">{{ _("archive_mode_no_login") }}</p>
{% endif %}
<hr class="hub-spacer">
diff --git a/src/plainui/locale/de/LC_MESSAGES/django.po b/src/plainui/locale/de/LC_MESSAGES/django.po
index a6539627d83a452292f20822619a40524ca6e2cf..b8649d310cd1a92de7387c2bdc3cd5927e3aa45e 100644
--- a/src/plainui/locale/de/LC_MESSAGES/django.po
+++ b/src/plainui/locale/de/LC_MESSAGES/django.po
@@ -165,7 +165,7 @@ msgstr "Einlösen"
msgid "badge__manage"
msgstr "Badge-Verwaltung"
-msgid "archivemode_notavailable"
+msgid "Archive_mode__not_available"
msgstr "Diese Funktion steht nicht mehr zur Verfügung, da die Webseite archiviert wurde."
msgid "all"
@@ -306,7 +306,7 @@ msgstr "Badge annehmen"
msgid "Save visibility"
msgstr "Sichtbarkeit speichern"
-msgid "index__box-whatshappening__fahrplanlink"
+msgid "index__box-whats_happening__fahrplan_link"
msgstr "Fahrplan anschauen"
msgid "No entries available."
@@ -391,7 +391,7 @@ msgstr "Nächste Events"
msgid "projects__list__empty"
msgstr "Keine Projekte gefunden"
-msgid "roomtype"
+msgid "Room__type"
msgstr "Raum-Typ"
msgid "capacity"
@@ -400,7 +400,7 @@ msgstr "Kapazität"
msgid "chat"
msgstr "DNs"
-msgid "archivemode_loginlink_hint"
+msgid "archive_mode_login_link_hint"
msgstr "nicht verfügbar, Seite ist archiviert"
msgid "profile"
@@ -467,22 +467,22 @@ msgstr "Liste"
msgid "fahrplan.filters.calendar"
msgstr "Kalender"
-msgid "index__box-whatshappening__title"
+msgid "index__box-whats_happening__title"
msgstr "Was findet statt?"
-msgid "index__box-whatshappening__official"
+msgid "index__box-whats_happening__official"
msgstr "offiziell"
-msgid "index__box-whatshappening__selforganized"
+msgid "index__box-whats_happening__self_organized"
msgstr "selbst organisiert"
-msgid "index__box-whatshappening__ended"
+msgid "index__box-whats_happening__ended"
msgstr "Die Konferenz ist zu Ende - schön, dass du dabei warst!"
-msgid "index__box-whatshappening__waiting"
+msgid "index__box-whats_happening__waiting"
msgstr "Die Konferenz beginnt erst noch. Aktuell ist:"
-msgid "index__box-whatshappening__day"
+msgid "index__box-whats_happening__day"
msgstr "Tag"
msgid "platform"
@@ -506,7 +506,7 @@ msgstr "Einloggen"
msgid "Reset Password"
msgstr "Passwort zurücksetzen"
-msgid "login--cookieinfo"
+msgid "login--cookie_info"
msgstr "Hinweis: Wir setzen einen Cookie um die Daten deiner Sitzung zu speichern."
msgid "New here?"
@@ -515,7 +515,7 @@ msgstr "Neu hier?"
msgid "sign up (new account)"
msgstr "Account anlegen"
-msgid "archivemode_nologin"
+msgid "archive_mode_no_login"
msgstr "Diese Webseite wurde archiviert, ein Login ist nicht mehr möglich."
msgid "Change Password"
@@ -869,7 +869,7 @@ msgstr "Nachricht gelöscht"
msgid "Thank you for your help to make this platform safer and better! Please give us some time to find a solution and keep an eye on your Messages, we may contact you."
msgstr "Danke für Deine Hilfe diese Plattform besser und sicherer zu machen. Bitte gib uns ein wenig Zeit eine Lösung zu finden und behalte deine Nachrichten hier im Auge, vielleicht kontaktieren wird dich."
-msgid "RoomView--loginrequired"
+msgid "RoomView--login_required"
msgstr "Anmeldung erforderlich."
msgid "You need an active Ticket to access this Page!"
@@ -971,7 +971,7 @@ msgstr "nur Kuratierte"
msgid "assembly only"
msgstr "nur von Assemblies"
-msgid "selforganized only"
+msgid "self_organized only"
msgstr "nur Self-organized-Sessions"
msgid "recorded only"
diff --git a/src/plainui/locale/en/LC_MESSAGES/django.po b/src/plainui/locale/en/LC_MESSAGES/django.po
index 2d35dac39491019ff976ae0a6bc658c61d15bc64..8aa86f91824b60ee667a722e7a53fdf3663caafa 100644
--- a/src/plainui/locale/en/LC_MESSAGES/django.po
+++ b/src/plainui/locale/en/LC_MESSAGES/django.po
@@ -165,7 +165,7 @@ msgstr "Redeem"
msgid "badge__manage"
msgstr "Manage badges"
-msgid "archivemode_notavailable"
+msgid "Archive_mode__not_available"
msgstr "This function is not available any more as this website has been archived."
msgid "all"
@@ -306,7 +306,7 @@ msgstr ""
msgid "Save visibility"
msgstr ""
-msgid "index__box-whatshappening__fahrplanlink"
+msgid "index__box-whats_happening__fahrplan_link"
msgstr "view the schedule"
msgid "No entries available."
@@ -391,7 +391,7 @@ msgstr ""
msgid "projects__list__empty"
msgstr "No projects found"
-msgid "roomtype"
+msgid "Room__type"
msgstr "room type"
msgid "capacity"
@@ -400,7 +400,7 @@ msgstr ""
msgid "chat"
msgstr "DMs"
-msgid "archivemode_loginlink_hint"
+msgid "archive_mode_login_link_hint"
msgstr "not available, page has been archived"
msgid "profile"
@@ -467,22 +467,22 @@ msgstr "List"
msgid "fahrplan.filters.calendar"
msgstr "Calendar"
-msgid "index__box-whatshappening__title"
+msgid "index__box-whats_happening__title"
msgstr "What's up?"
-msgid "index__box-whatshappening__official"
+msgid "index__box-whats_happening__official"
msgstr "official"
-msgid "index__box-whatshappening__selforganized"
+msgid "index__box-whats_happening__self_organized"
msgstr "self-organized"
-msgid "index__box-whatshappening__ended"
+msgid "index__box-whats_happening__ended"
msgstr "The conference has ended. It was nice having you here."
-msgid "index__box-whatshappening__waiting"
+msgid "index__box-whats_happening__waiting"
msgstr "The conference has not started yet. Currently it is:"
-msgid "index__box-whatshappening__day"
+msgid "index__box-whats_happening__day"
msgstr "day"
msgid "platform"
@@ -506,7 +506,7 @@ msgstr ""
msgid "Reset Password"
msgstr "Reset password"
-msgid "login--cookieinfo"
+msgid "login--cookie_info"
msgstr "Note: We use cookies to store your user session."
msgid "New here?"
@@ -515,7 +515,7 @@ msgstr "New here?"
msgid "sign up (new account)"
msgstr "Sign up"
-msgid "archivemode_nologin"
+msgid "archive_mode_no_login"
msgstr "This website has been archived, logging in is not possible any more."
msgid "Change Password"
@@ -869,7 +869,7 @@ msgstr ""
msgid "Thank you for your help to make this platform safer and better! Please give us some time to find a solution and keep an eye on your Messages, we may contact you."
msgstr ""
-msgid "RoomView--loginrequired"
+msgid "RoomView--login_required"
msgstr "login required"
msgid "You need an active Ticket to access this Page!"
@@ -971,7 +971,7 @@ msgstr ""
msgid "assembly only"
msgstr ""
-msgid "selforganized only"
+msgid "self_organized only"
msgstr ""
msgid "recorded only"
diff --git a/src/plainui/views/general.py b/src/plainui/views/general.py
index 7d935cb942d4d8f32a020ae60b36dc0276ecc642..bf9e14f23aaaf45b55b8abdbb5bda015cfd68a02 100644
--- a/src/plainui/views/general.py
+++ b/src/plainui/views/general.py
@@ -75,7 +75,7 @@ class IndexView(ConferenceRequiredMixin, TemplateView):
context['upcoming_events_official'] = (
Event.objects.conference_accessible(self.conf).order_by('schedule_start').filter(kind=Event.Kind.OFFICIAL).filter(schedule_end__gt=now())[:10]
)
- context['upcoming_events_selforganized'] = (
+ context['upcoming_events_self_organized'] = (
Event.objects.conference_accessible(self.conf).order_by('schedule_start').filter(kind=Event.Kind.SELF_ORGANIZED).filter(schedule_end__gt=now())[:10]
)
diff --git a/src/plainui/views/rooms.py b/src/plainui/views/rooms.py
index 766674d9ef6847dbee05d9195387b865a18cb688..ae1b7ce7155e6b6e01183103d25fb0d183486233 100644
--- a/src/plainui/views/rooms.py
+++ b/src/plainui/views/rooms.py
@@ -40,7 +40,7 @@ class RoomView(ConferenceRequiredMixin, DetailView):
if self.request.user.is_authenticated:
return HttpResponseRedirect(integrations.BigBlueButton.join_room(self.room, self.request.user, not self.request.user.show_name))
- messages.error(request, gettext('RoomView--loginrequired'))
+ messages.error(request, gettext('RoomView--login_required'))
except integrations.IntegrationError as e:
messages.error(request, str(e))