diff --git a/AKModel/admin.py b/AKModel/admin.py index 649ab4e512f279613bda9b96ec620ff771f6af49..ad55accba8067851b09767b1dfc726ed9962f1bf 100644 --- a/AKModel/admin.py +++ b/AKModel/admin.py @@ -1,3 +1,4 @@ +from django.apps import apps from django.contrib import admin from django.contrib.admin import SimpleListFilter from django.db.models import Count, F @@ -23,10 +24,10 @@ class EventAdmin(admin.ModelAdmin): def get_urls(self): urls = super().get_urls() - my_urls = [ + custom_urls = [ path('<slug:slug>/status/', self.admin_site.admin_view(EventStatusView.as_view()), name="event_status") ] - return my_urls + urls + return custom_urls + urls def status_url(self, obj): return format_html("<a href='{url}'>{text}</a>", @@ -179,6 +180,18 @@ class AKSlotAdmin(admin.ModelAdmin): readonly_fields = ['updated'] + def get_urls(self): + urls = super().get_urls() + custom_urls = [] + if apps.is_installed("AKScheduling"): + from AKScheduling.views import UnscheduledSlotsAdminView + + custom_urls.extend([ + path('<slug:event_slug>/unscheduled/', self.admin_site.admin_view(UnscheduledSlotsAdminView.as_view()), + name="slots_unscheduled") + ]) + return custom_urls + urls + def get_form(self, request, obj=None, change=False, **kwargs): # Use timezone of associated event if obj is not None and obj.event.timezone: diff --git a/AKModel/locale/de_DE/LC_MESSAGES/django.po b/AKModel/locale/de_DE/LC_MESSAGES/django.po index 5bb9eae145e5a932fa185858f86ffedddc49a0a0..8035108806cb181f600b2409e63e33825e1abbbd 100644 --- a/AKModel/locale/de_DE/LC_MESSAGES/django.po +++ b/AKModel/locale/de_DE/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-18 09:42+0000\n" +"POT-Creation-Date: 2020-05-19 06:38+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -11,24 +11,24 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: AKModel/admin.py:33 AKModel/admin.py:34 -#: AKModel/templates/admin/AKModel/status.html:6 +#: AKModel/admin.py:34 AKModel/admin.py:35 +#: AKModel/templates/admin/AKModel/status.html:7 msgid "Status" msgstr "Status" -#: AKModel/admin.py:112 +#: AKModel/admin.py:113 msgid "Wish" msgstr "AK-Wunsch" -#: AKModel/admin.py:118 +#: AKModel/admin.py:119 msgid "Is wish" msgstr "Ist ein Wunsch" -#: AKModel/admin.py:119 +#: AKModel/admin.py:120 msgid "Is not a wish" msgstr "Ist kein Wunsch" -#: AKModel/admin.py:146 +#: AKModel/admin.py:147 msgid "Export to wiki syntax" msgstr "In Wiki-Syntax exportieren" @@ -54,9 +54,9 @@ msgstr "Die eingegebene Verfügbarkeit enthält ein ungültiges Datum." msgid "Please fill in your availabilities!" msgstr "Bitte Verfügbarkeiten eintragen!" -#: AKModel/availability/models.py:38 AKModel/models.py:40 AKModel/models.py:69 -#: AKModel/models.py:121 AKModel/models.py:140 AKModel/models.py:172 -#: AKModel/models.py:225 AKModel/models.py:267 AKModel/models.py:297 +#: AKModel/availability/models.py:38 AKModel/models.py:39 AKModel/models.py:68 +#: AKModel/models.py:120 AKModel/models.py:139 AKModel/models.py:171 +#: AKModel/models.py:224 AKModel/models.py:266 AKModel/models.py:296 msgid "Event" msgstr "Event" @@ -224,176 +224,176 @@ msgstr "Universität o.ä." msgid "Web Link" msgstr "Internet Link" -#: AKModel/models.py:67 +#: AKModel/models.py:66 msgid "Link to Homepage" msgstr "Link zu Homepage oder Webseite" -#: AKModel/models.py:73 +#: AKModel/models.py:72 msgid "AK Owner" msgstr "AK Leitung" -#: AKModel/models.py:74 +#: AKModel/models.py:73 msgid "AK Owners" msgstr "AK Leitungen" -#: AKModel/models.py:116 +#: AKModel/models.py:115 msgid "Name of the AK Category" msgstr "Name des AK Kategorie" -#: AKModel/models.py:117 AKModel/models.py:138 +#: AKModel/models.py:116 AKModel/models.py:137 msgid "Color" msgstr "Farbe" -#: AKModel/models.py:117 AKModel/models.py:138 +#: AKModel/models.py:116 AKModel/models.py:137 msgid "Color for displaying" msgstr "Farbe für die Anzeige" -#: AKModel/models.py:118 AKModel/models.py:191 +#: AKModel/models.py:117 AKModel/models.py:190 msgid "Description" msgstr "Beschreibung" -#: AKModel/models.py:119 +#: AKModel/models.py:118 msgid "Short description of this AK Category" msgstr "Beschreibung der AK-Kategorie" -#: AKModel/models.py:126 +#: AKModel/models.py:125 msgid "AK Categories" msgstr "AK Kategorien" -#: AKModel/models.py:137 +#: AKModel/models.py:136 msgid "Name of the AK Track" msgstr "Name des AK Tracks" -#: AKModel/models.py:144 +#: AKModel/models.py:143 msgid "AK Track" msgstr "AK Track" -#: AKModel/models.py:145 +#: AKModel/models.py:144 msgid "AK Tracks" msgstr "AK Tracks" -#: AKModel/models.py:156 +#: AKModel/models.py:155 msgid "Name of the AK Tag" msgstr "Name das AK Tags" -#: AKModel/models.py:159 +#: AKModel/models.py:158 msgid "AK Tag" msgstr "AK Tag" -#: AKModel/models.py:160 +#: AKModel/models.py:159 msgid "AK Tags" msgstr "AK Tags" -#: AKModel/models.py:170 +#: AKModel/models.py:169 msgid "Name of the Requirement" msgstr "Name der Anforderung" -#: AKModel/models.py:176 +#: AKModel/models.py:175 msgid "AK Requirement" msgstr "AK Anforderung" -#: AKModel/models.py:177 +#: AKModel/models.py:176 msgid "AK Requirements" msgstr "AK Anforderungen" -#: AKModel/models.py:188 +#: AKModel/models.py:187 msgid "Name of the AK" msgstr "Name des AKs" -#: AKModel/models.py:189 +#: AKModel/models.py:188 msgid "Short Name" msgstr "Kurzer Name" -#: AKModel/models.py:190 +#: AKModel/models.py:189 msgid "Name displayed in the schedule" msgstr "Name zur Anzeige im AK Plan" -#: AKModel/models.py:191 +#: AKModel/models.py:190 msgid "Description of the AK" msgstr "Beschreibung des AKs" -#: AKModel/models.py:193 +#: AKModel/models.py:192 msgid "Owners" msgstr "Leitungen" -#: AKModel/models.py:194 +#: AKModel/models.py:193 msgid "Those organizing the AK" msgstr "Menschen, die den AK organisieren und halten" -#: AKModel/models.py:197 +#: AKModel/models.py:196 msgid "Link to wiki page" msgstr "Link zur Wiki Seite" -#: AKModel/models.py:199 +#: AKModel/models.py:198 msgid "Category" msgstr "Kategorie" -#: AKModel/models.py:200 +#: AKModel/models.py:199 msgid "Category of the AK" msgstr "Kategorie des AKs" -#: AKModel/models.py:201 +#: AKModel/models.py:200 msgid "Tags" msgstr "Tags" -#: AKModel/models.py:201 +#: AKModel/models.py:200 msgid "Tags provided by owners" msgstr "Tags, die durch die AK Leitung vergeben wurden" -#: AKModel/models.py:202 +#: AKModel/models.py:201 msgid "Track" msgstr "Track" -#: AKModel/models.py:203 +#: AKModel/models.py:202 msgid "Track the AK belongs to" msgstr "Track zu dem der AK gehört" -#: AKModel/models.py:205 +#: AKModel/models.py:204 msgid "Resolution Intention" msgstr "Resolutionsabsicht" -#: AKModel/models.py:206 +#: AKModel/models.py:205 msgid "Intends to submit a resolution" msgstr "Beabsichtigt eine Resolution einzureichen" -#: AKModel/models.py:207 +#: AKModel/models.py:206 msgid "Present this AK" msgstr "AK Präsentieren" -#: AKModel/models.py:208 +#: AKModel/models.py:207 msgid "Present results of this AK" msgstr "Die Ergebnisse dieses AKs vorstellen" -#: AKModel/models.py:210 +#: AKModel/models.py:209 msgid "Requirements" msgstr "Anforderungen" -#: AKModel/models.py:211 +#: AKModel/models.py:210 msgid "AK's Requirements" msgstr "Anforderungen des AKs" -#: AKModel/models.py:213 +#: AKModel/models.py:212 msgid "Conflicting AKs" msgstr "AK Konflikte" -#: AKModel/models.py:214 +#: AKModel/models.py:213 msgid "AKs that conflict and thus must not take place at the same time" msgstr "" "AKs, die Konflikte haben und deshalb nicht gleichzeitig stattfinden dürfen" -#: AKModel/models.py:215 +#: AKModel/models.py:214 msgid "Prerequisite AKs" msgstr "Vorausgesetzte AKs" -#: AKModel/models.py:216 +#: AKModel/models.py:215 msgid "AKs that should precede this AK in the schedule" msgstr "AKS die im AK Plan vor diesem AK stattfinden müssen" -#: AKModel/models.py:218 +#: AKModel/models.py:217 msgid "Organizational Notes" msgstr "Notizen zur Organisation" -#: AKModel/models.py:219 +#: AKModel/models.py:218 msgid "" "Notes to organizers. These are public. For private notes, please send an e-" "mail." @@ -401,28 +401,28 @@ msgstr "" "Notizen an die Organisator*innen. Diese sind öffentlich, für private " "Anmerkungen bitte eine E-Mail schicken." -#: AKModel/models.py:221 +#: AKModel/models.py:220 msgid "Interest" msgstr "Interesse" -#: AKModel/models.py:221 +#: AKModel/models.py:220 msgid "Expected number of people" msgstr "Erwartete Personenzahl" -#: AKModel/models.py:222 +#: AKModel/models.py:221 msgid "Interest Counter" msgstr "Interessenszähler" -#: AKModel/models.py:223 +#: AKModel/models.py:222 msgid "People who have indicated interest online" msgstr "Anzahl Personen, die online Interesse bekundet haben" -#: AKModel/models.py:232 AKModel/templates/admin/AKModel/status.html:46 -#: AKModel/templates/admin/AKModel/status.html:53 +#: AKModel/models.py:231 AKModel/templates/admin/AKModel/status.html:47 +#: AKModel/templates/admin/AKModel/status.html:54 msgid "AKs" msgstr "AKs" -#: AKModel/models.py:260 +#: AKModel/models.py:259 msgid "Name or number of the room" msgstr "Name oder Nummer des Raums" @@ -438,59 +438,59 @@ msgstr "Name oder Nummer des Ortes" msgid "Capacity" msgstr "Kapazität" -#: AKModel/models.py:263 +#: AKModel/models.py:262 msgid "Maximum number of people" msgstr "Maximale Personenzahl" -#: AKModel/models.py:264 +#: AKModel/models.py:263 msgid "Properties" msgstr "Eigenschaften" -#: AKModel/models.py:265 +#: AKModel/models.py:264 msgid "AK requirements fulfilled by the room" msgstr "AK Anforderungen, die dieser Raum erfüllt" -#: AKModel/models.py:272 AKModel/templates/admin/AKModel/status.html:30 +#: AKModel/models.py:271 AKModel/templates/admin/AKModel/status.html:31 msgid "Rooms" msgstr "Räume" -#: AKModel/models.py:289 +#: AKModel/models.py:288 msgid "AK being mapped" msgstr "AK, der zugeordnet wird" -#: AKModel/models.py:291 +#: AKModel/models.py:290 msgid "Room the AK will take place in" msgstr "Raum in dem der AK stattfindet" -#: AKModel/models.py:292 +#: AKModel/models.py:291 msgid "Slot Begin" msgstr "Beginn des Slots" -#: AKModel/models.py:292 +#: AKModel/models.py:291 msgid "Time and date the slot begins" msgstr "Zeit und Datum zu der der AK beginnt" -#: AKModel/models.py:294 +#: AKModel/models.py:293 msgid "Duration" msgstr "Dauer" -#: AKModel/models.py:295 +#: AKModel/models.py:294 msgid "Length in hours" msgstr "Länge in Stunden" -#: AKModel/models.py:300 +#: AKModel/models.py:299 msgid "Last update" msgstr "Letzte Aktualisierung" -#: AKModel/models.py:303 +#: AKModel/models.py:302 msgid "AK Slot" msgstr "AK Slot" -#: AKModel/models.py:304 +#: AKModel/models.py:303 msgid "AK Slots" msgstr "AK Slot" -#: AKModel/models.py:318 +#: AKModel/models.py:317 msgid "Not scheduled yet" msgstr "Noch nicht geplant" @@ -498,43 +498,56 @@ msgstr "Noch nicht geplant" msgid "Administration" msgstr "Verwaltung" +#: AKModel/templates/AKModel/user.html:31 +msgid "Hello" +msgstr "Hallo" + +#: AKModel/templates/AKModel/user.html:34 +msgid "Go to backend" +msgstr "Zum Backend" + +#: AKModel/templates/AKModel/user.html:37 +msgid "Please wait for an administrator to confirm your account" +msgstr "" +"Bitte warte darauf, dass ein*e Administrator*in deinen Account bestätigt" + #: AKModel/templates/AKModel/user.html:40 msgid "Logout" msgstr "Ausloggen" -#: AKModel/templates/admin/AKModel/status.html:13 +#: AKModel/templates/admin/AKModel/status.html:14 #, fuzzy #| msgid "AK Categories" msgid "Categories" msgstr "AK Kategorien" -#: AKModel/templates/admin/AKModel/status.html:15 +#: AKModel/templates/admin/AKModel/status.html:16 #, fuzzy #| msgid "No categories yet" msgid "No categroies yet" msgstr "Bisher keine Kategorien" -#: AKModel/templates/admin/AKModel/status.html:28 +#: AKModel/templates/admin/AKModel/status.html:29 msgid "Add category" msgstr "Kategorie hinzufügen" -#: AKModel/templates/admin/AKModel/status.html:32 +#: AKModel/templates/admin/AKModel/status.html:33 msgid "No rooms yet" msgstr "Bisher keine Räume" -#: AKModel/templates/admin/AKModel/status.html:44 +#: AKModel/templates/admin/AKModel/status.html:45 msgid "Add Room" msgstr "Raum hinzufügen" -#: AKModel/templates/admin/AKModel/status.html:48 +#: AKModel/templates/admin/AKModel/status.html:49 msgid "No AKs yet" msgstr "Bisher keine AKs" -#: AKModel/templates/admin/AKModel/status.html:56 +#: AKModel/templates/admin/AKModel/status.html:57 msgid "Slots" msgstr "Slots" -#: AKModel/templates/admin/AKModel/status.html:59 +#: AKModel/templates/admin/AKModel/status.html:60 msgid "Unscheduled Slots" msgstr "Ungeplante Slots" @@ -542,22 +555,9 @@ msgstr "Ungeplante Slots" msgid "Active Events" msgstr "Aktive Events" -#: AKModel/views.py:124 +#: AKModel/views.py:129 msgid "Event Status" msgstr "Eventstatus" #~ msgid "Notes to organizers" #~ msgstr "Notizen an die Organisator*innen" -#: AKModel/templates/AKModel/user.html:31 -msgid "Hello" -msgstr "Hallo" - -#: AKModel/templates/AKModel/user.html:34 -msgid "Go to backend" -msgstr "Zum Backend" - -#: AKModel/templates/AKModel/user.html:37 -msgid "Please wait for an administrator to confirm your account" -msgstr "" -"Bitte warte darauf, dass ein*e Administrator*in deinen Account bestätigt" - diff --git a/AKModel/templates/admin/AKModel/status.html b/AKModel/templates/admin/AKModel/status.html index 33ccaaca225a721b66bbcbe01d810a254cdc96ff..043eb85983776be171ad21db88ddcfc2ed2a7883 100644 --- a/AKModel/templates/admin/AKModel/status.html +++ b/AKModel/templates/admin/AKModel/status.html @@ -1,4 +1,5 @@ {% extends "admin_base.html" %} +{% load tags_AKModel %} {% load i18n %} {% load tz %} @@ -56,7 +57,15 @@ <td>{% trans "Slots" %}</td><td>{{ event.akslot_set.count }}</td> </tr> <tr> - <td>{% trans "Unscheduled Slots" %}</td><td>{{ unscheduled_slots_count }}</td> + <td>{% trans "Unscheduled Slots" %}</td><td> + {% if "AKScheduling"|check_app_installed %} + <a href="{% url 'admin:slots_unscheduled' event_slug=event.slug %}"> + {{ unscheduled_slots_count }} + </a> + {% else %} + {{ unscheduled_slots_count }} + {% endif %} + </td> </tr> </tbody> </table> diff --git a/AKPlanning/locale/de_DE/LC_MESSAGES/django.po b/AKPlanning/locale/de_DE/LC_MESSAGES/django.po index 0224c817bcde66200af89390dac04cc5a4667739..6f94ccd2d6a30a0eda5f7ec35e8accb86bf59ef3 100644 --- a/AKPlanning/locale/de_DE/LC_MESSAGES/django.po +++ b/AKPlanning/locale/de_DE/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-18 09:42+0000\n" +"POT-Creation-Date: 2020-05-19 06:38+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -17,10 +17,10 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: AKPlanning/settings.py:130 +#: AKPlanning/settings.py:131 msgid "German" msgstr "Deutsch" -#: AKPlanning/settings.py:131 +#: AKPlanning/settings.py:132 msgid "English" msgstr "Englisch" diff --git a/AKScheduling/templates/admin/AKScheduling/unscheduled.html b/AKScheduling/templates/admin/AKScheduling/unscheduled.html new file mode 100644 index 0000000000000000000000000000000000000000..2fc9eb71ae23b5934d04f070cd5cc7cafcb3fb57 --- /dev/null +++ b/AKScheduling/templates/admin/AKScheduling/unscheduled.html @@ -0,0 +1,35 @@ +{% extends "admin_base.html" %} +{% load tags_AKModel %} + +{% load i18n %} +{% load tz %} + +{% block title %}{% trans "Unscheduled AK Slots" %}: {{event}}{% endblock %} + +{% block content %} + + <h3>{% trans "Count" %}: {{ akslots.count }}</h3> + + {% regroup akslots by ak as unscheduled_by_ak %} + + <ul> + {% for group in unscheduled_by_ak %} + <li> + {% with group.grouper as ak %} + {% if "AKSubmission"|check_app_installed %} + <a href="{% url 'submit:ak_detail' event_slug=ak.event.slug pk=ak.pk %}">{{ ak }}</a> + {% else %} + {{ ak }} + {% endif %} + {% endwith %} + <ul> + {% for slot in group.list %} + <li><a href="{% url 'admin:AKModel_akslot_change' slot.pk %}">{{ slot.duration }}</a></li> + {% endfor %} + </ul> + </li> + {% endfor %} + </ul> + + <a href="{% url 'admin:event_status' event.slug %}">{% trans "Event Status" %}</a> +{% endblock %} diff --git a/AKScheduling/views.py b/AKScheduling/views.py index 60f00ef0ef347811e7b0c0921b7fda097acd9fcc..88523e54dad18c2083450b71c868f8417c92b6e1 100644 --- a/AKScheduling/views.py +++ b/AKScheduling/views.py @@ -1 +1,20 @@ -# Create your views here. +from django.urls import reverse_lazy +from django.views.generic import ListView +from django.utils.translation import gettext_lazy as _ + +from AKModel.models import AKSlot +from AKModel.views import AdminViewMixin, FilterByEventSlugMixin + + +class UnscheduledSlotsAdminView(AdminViewMixin, FilterByEventSlugMixin, ListView): + template_name = "admin/AKScheduling/unscheduled.html" + model = AKSlot + context_object_name = "akslots" + + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + context["title"] = f"{_('Unscheduled AK Slots')} for {context['event']}" + return context + + def get_queryset(self): + return super().get_queryset().filter(start=None) diff --git a/AKSubmission/locale/de_DE/LC_MESSAGES/django.po b/AKSubmission/locale/de_DE/LC_MESSAGES/django.po index 6eac88f8e50bd80dc3c4d619687ca763748ed8a3..bd73666157047767f6be5d7b654ad629562847ca 100644 --- a/AKSubmission/locale/de_DE/LC_MESSAGES/django.po +++ b/AKSubmission/locale/de_DE/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-18 09:42+0000\n" +"POT-Creation-Date: 2020-05-19 06:38+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -89,95 +89,95 @@ msgstr "Interesse bekunden" msgid "Open external link" msgstr "Externen Link öffnen" -#: AKSubmission/templates/AKSubmission/ak_detail.html:44 +#: AKSubmission/templates/AKSubmission/ak_detail.html:45 #: AKSubmission/templates/AKSubmission/ak_history.html:19 #: AKSubmission/templates/AKSubmission/ak_history.html:31 msgid "History" msgstr "Versionsgeschichte" -#: AKSubmission/templates/AKSubmission/ak_detail.html:47 -#: AKSubmission/templates/AKSubmission/ak_detail.html:146 +#: AKSubmission/templates/AKSubmission/ak_detail.html:48 +#: AKSubmission/templates/AKSubmission/ak_detail.html:147 #: AKSubmission/templates/AKSubmission/ak_edit.html:16 #: AKSubmission/templates/AKSubmission/ak_table.html:53 msgid "Edit" msgstr "Bearbeiten" -#: AKSubmission/templates/AKSubmission/ak_detail.html:52 +#: AKSubmission/templates/AKSubmission/ak_detail.html:53 #: AKSubmission/templates/AKSubmission/ak_history.html:31 #: AKSubmission/templates/AKSubmission/ak_table.html:35 msgid "AK Wish" msgstr "AK-Wunsch" -#: AKSubmission/templates/AKSubmission/ak_detail.html:56 +#: AKSubmission/templates/AKSubmission/ak_detail.html:57 #: AKSubmission/templates/AKSubmission/ak_table.html:10 msgid "Who?" msgstr "Wer?" -#: AKSubmission/templates/AKSubmission/ak_detail.html:62 +#: AKSubmission/templates/AKSubmission/ak_detail.html:63 #: AKSubmission/templates/AKSubmission/ak_history.html:36 #: AKSubmission/templates/AKSubmission/ak_table.html:11 msgid "Category" msgstr "Kategorie" -#: AKSubmission/templates/AKSubmission/ak_detail.html:68 +#: AKSubmission/templates/AKSubmission/ak_detail.html:69 msgid "Present this AK" msgstr "Diesen AK vorstellen" -#: AKSubmission/templates/AKSubmission/ak_detail.html:72 +#: AKSubmission/templates/AKSubmission/ak_detail.html:73 #: AKSubmission/templates/AKSubmission/ak_table.html:12 msgid "Tags" msgstr "Tags" -#: AKSubmission/templates/AKSubmission/ak_detail.html:78 +#: AKSubmission/templates/AKSubmission/ak_detail.html:79 msgid "Reso?" msgstr "Reso?" -#: AKSubmission/templates/AKSubmission/ak_detail.html:85 +#: AKSubmission/templates/AKSubmission/ak_detail.html:86 msgid "Requirements" msgstr "Anforderungen" -#: AKSubmission/templates/AKSubmission/ak_detail.html:98 +#: AKSubmission/templates/AKSubmission/ak_detail.html:99 msgid "Conflicting AKs" msgstr "AK Konflikte" -#: AKSubmission/templates/AKSubmission/ak_detail.html:106 +#: AKSubmission/templates/AKSubmission/ak_detail.html:107 msgid "Prerequisite AKs" msgstr "AK Voraussetzungen" -#: AKSubmission/templates/AKSubmission/ak_detail.html:114 +#: AKSubmission/templates/AKSubmission/ak_detail.html:115 msgid "Notes" msgstr "Notizen" -#: AKSubmission/templates/AKSubmission/ak_detail.html:131 +#: AKSubmission/templates/AKSubmission/ak_detail.html:132 msgid "When?" msgstr "Wann?" -#: AKSubmission/templates/AKSubmission/ak_detail.html:132 +#: AKSubmission/templates/AKSubmission/ak_detail.html:133 #: AKSubmission/templates/AKSubmission/akslot_delete.html:35 msgid "Duration" msgstr "Dauer" -#: AKSubmission/templates/AKSubmission/ak_detail.html:133 +#: AKSubmission/templates/AKSubmission/ak_detail.html:134 msgid "Room" msgstr "Raum" -#: AKSubmission/templates/AKSubmission/ak_detail.html:149 +#: AKSubmission/templates/AKSubmission/ak_detail.html:150 msgid "Delete" msgstr "Löschen" -#: AKSubmission/templates/AKSubmission/ak_detail.html:161 +#: AKSubmission/templates/AKSubmission/ak_detail.html:162 msgid "Add another slot" msgstr "Einen neuen AK-Slot hinzufügen" -#: AKSubmission/templates/AKSubmission/ak_detail.html:165 +#: AKSubmission/templates/AKSubmission/ak_detail.html:166 msgid "Possible Times" msgstr "Mögliche Zeiten" -#: AKSubmission/templates/AKSubmission/ak_detail.html:169 +#: AKSubmission/templates/AKSubmission/ak_detail.html:170 msgid "Start" msgstr "Start" -#: AKSubmission/templates/AKSubmission/ak_detail.html:170 +#: AKSubmission/templates/AKSubmission/ak_detail.html:171 msgid "End" msgstr "Ende" @@ -213,7 +213,7 @@ msgstr "Diesen AK vorstellen" msgid "Reso" msgstr "Reso" -#: AKSubmission/templates/AKSubmission/ak_list.html:6 AKSubmission/views.py:30 +#: AKSubmission/templates/AKSubmission/ak_list.html:6 AKSubmission/views.py:34 msgid "All AKs" msgstr "Alle AKs" @@ -282,7 +282,9 @@ msgstr "Fragen oder Kommentare? Schreib den Orgas dieses Events eine Mail" msgid "" "System is not yet configured for AK submission and listing. Please try again " "later." -msgstr "Das System ist bisher nicht für Eintragen und Anzeige von AKs konfiguriert. Bitte versuche es später wieder." +msgstr "" +"Das System ist bisher nicht für Eintragen und Anzeige von AKs konfiguriert. " +"Bitte versuche es später wieder." #: AKSubmission/templates/AKSubmission/submission_overview.html:42 msgid "" @@ -327,56 +329,56 @@ msgstr "" msgid "Submit" msgstr "Eintragen" -#: AKSubmission/views.py:50 +#: AKSubmission/views.py:65 msgid "Wishes" msgstr "Wünsche" -#: AKSubmission/views.py:50 +#: AKSubmission/views.py:65 msgid "AKs one would like to have" msgstr "" "AKs die sich gewünscht wurden, aber bei denen noch nicht klar ist, wer sie " "macht. Falls du dir das vorstellen kannst, trag dich einfach ein" -#: AKSubmission/views.py:66 +#: AKSubmission/views.py:81 msgid "Currently planned AKs" msgstr "Aktuell geplante AKs" -#: AKSubmission/views.py:141 +#: AKSubmission/views.py:157 msgid "Event inactive. Cannot create or update." msgstr "Event inaktiv. Hinzufügen/Bearbeiten nicht möglich." -#: AKSubmission/views.py:157 +#: AKSubmission/views.py:173 msgid "AK successfully created" msgstr "AK erfolgreich angelegt" -#: AKSubmission/views.py:215 +#: AKSubmission/views.py:231 msgid "AK successfully updated" msgstr "AK erfolgreich aktualisiert" -#: AKSubmission/views.py:293 +#: AKSubmission/views.py:309 msgid "Person Info successfully updated" msgstr "Personen-Info erfolgreich aktualisiert" -#: AKSubmission/views.py:313 +#: AKSubmission/views.py:329 msgid "No user selected" msgstr "Keine Person ausgewählt" -#: AKSubmission/views.py:339 +#: AKSubmission/views.py:355 msgid "AK Slot successfully added" msgstr "AK-Slot erfolgreich angelegt" -#: AKSubmission/views.py:353 +#: AKSubmission/views.py:369 msgid "You cannot edit a slot that has already been scheduled" msgstr "Bereits geplante AK-Slots können nicht mehr bearbeitet werden" -#: AKSubmission/views.py:363 +#: AKSubmission/views.py:379 msgid "AK Slot successfully updated" msgstr "AK-Slot erfolgreich aktualisiert" -#: AKSubmission/views.py:376 +#: AKSubmission/views.py:392 msgid "You cannot delete a slot that has already been scheduled" msgstr "Bereits geplante AK-Slots können nicht mehr gelöscht werden" -#: AKSubmission/views.py:386 +#: AKSubmission/views.py:402 msgid "AK Slot successfully deleted" msgstr "AK-Slot erfolgreich angelegt" diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po index cff6314d53a95eeeaa80c95f6de6f0dfea58dc0d..821d4c31f3704716f9163d208e8c73e8b7b52c06 100644 --- a/locale/de_DE/LC_MESSAGES/django.po +++ b/locale/de_DE/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-17 21:09+0000\n" +"POT-Creation-Date: 2020-05-19 06:38+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -34,6 +34,18 @@ msgstr "Virtueller Raum" msgid "Virtual Rooms" msgstr "Virtuelle Räume" +#: AKScheduling/templates/admin/AKScheduling/unscheduled.html:7 +msgid "Unscheduled AK Slots" +msgstr "Noch nicht geschedulte AK-Slots" + +#: AKScheduling/templates/admin/AKScheduling/unscheduled.html:11 +msgid "Count" +msgstr "Anzahl" + +#: AKScheduling/templates/admin/AKScheduling/unscheduled.html:34 +msgid "Event Status" +msgstr "Event-Status" + #: templates/base.html:78 msgid "Impress" msgstr "Impressum"