Update translation keys in plainui

The translation keys have been updated to use split words with
underscores, this allows cspell to recognize them as separate words.

.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

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>

src/plainui/jinja2/plainui/board.html.j2

@@ -85,6 +85,6 @@
     </div>
   {% else %}
     {# archive mode #}
-    {{ _("archivemode_notavailable") }}
+    {{ _("Archive_mode__not_available") }}
   {% endif %}
 {% endblock content %}

src/plainui/jinja2/plainui/components/buttons.html.j2

 {% 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 %}

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">

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>

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">

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'
           ) }}

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>
 

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") }}

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">

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"

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"

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]
         )
 

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))