Link AK List in dashboard

adjust other buttons
re-generate translations

AKDashboard/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-01-13 11:43+0000\n"
+"POT-Creation-Date: 2020-05-10 16:22+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,72 +17,76 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: models.py:10
+#: AKDashboard/models.py:10
 msgid "Dashboard Button"
 msgstr "Dashboard-Button"
 
-#: models.py:11
+#: AKDashboard/models.py:11
 msgid "Dashboard Buttons"
 msgstr "Dashboard-Buttons"
 
-#: models.py:21
+#: AKDashboard/models.py:21
 msgid "Text"
 msgstr "Text"
 
-#: models.py:22
+#: AKDashboard/models.py:22
 msgid "Text that will be shown on the button"
 msgstr "Text, der auf dem Button angezeigt wird"
 
-#: models.py:23
+#: AKDashboard/models.py:23
 msgid "Link URL"
 msgstr "Link URL"
 
-#: models.py:23
+#: AKDashboard/models.py:23
 msgid "URL this button links to"
 msgstr "URL auf die der Button verweist"
 
-#: models.py:24
+#: AKDashboard/models.py:24
 msgid "Icon"
 msgstr "Symbol"
 
-#: models.py:26
+#: AKDashboard/models.py:26
 msgid "Button Style"
 msgstr "Stil des Buttons"
 
-#: models.py:26
+#: AKDashboard/models.py:26
 msgid "Style (Color) of this button (bootstrap class)"
 msgstr "Stiel (Farbe) des Buttons (Bootstrap-Klasse)"
 
-#: models.py:28
+#: AKDashboard/models.py:28
 msgid "Event"
 msgstr "Veranstaltung"
 
-#: models.py:28
+#: AKDashboard/models.py:28
 msgid "Event this button belongs to"
 msgstr "Veranstaltung, zu der dieser Button gehört"
 
-#: templates/AKDashboard/dashboard.html:31
+#: AKDashboard/templates/AKDashboard/dashboard.html:30
+msgid "AK List"
+msgstr "AK Liste"
+
+#: AKDashboard/templates/AKDashboard/dashboard.html:40
 msgid "Current AKs"
 msgstr "Aktuelle AKs"
 
-#: templates/AKDashboard/dashboard.html:38
+#: AKDashboard/templates/AKDashboard/dashboard.html:47
 msgid "AK Wall"
 msgstr "AK-Wall"
 
-#: templates/AKDashboard/dashboard.html:47
+#: AKDashboard/templates/AKDashboard/dashboard.html:56
 msgid "AK Submission"
 msgstr "AK-Submission"
 
-#: templates/AKDashboard/dashboard.html:63
+#: AKDashboard/templates/AKDashboard/dashboard.html:72
 msgid "Write to organizers of this event for questions and comments"
 msgstr ""
 "Kontaktiere die Organisator*innen des Events bei Fragen oder Kommentaren"
 
-#: templates/AKDashboard/dashboard.html:70
+#: AKDashboard/templates/AKDashboard/dashboard.html:79
 msgid "Currently, there are no Events!"
 msgstr "Aktuell gibt es keine Events!"
 
-#: templates/AKDashboard/dashboard.html:73
+#: AKDashboard/templates/AKDashboard/dashboard.html:82
 msgid "Please contact an administrator if you want to use AKPlanning."
 msgstr ""
 "Bitte kontaktiere eine*n Administrator*in, falls du AKPlanning verwenden "

AKDashboard/templates/AKDashboard/dashboard.html

@@ -22,12 +22,21 @@
         <div class="dashboard-row">
             <h2> {{ event.name }} </h2>
             <div class="row">
+                {% if 'AKSubmission'|check_app_installed %}
+                    <a class="dashboard-box btn btn-primary"
+                       href="{% url 'submit:ak_list' event_slug=event.slug %}">
+                        <div class="col-sm-12 col-md-3 col-lg-2 dashboard-button">
+                            <span class="fa fa-list-ul"></span>
+                            <span class='text'>{% trans 'AK List' %}</span>
+                        </div>
+                    </a>
+                {% endif %}
                 {% if 'AKPlan'|check_app_installed %}
 
                     <a class="dashboard-box btn btn-primary"
                        href="{% url 'plan:plan_overview' event_slug=event.slug %}">
                         <div class="col-sm-12 col-md-3 col-lg-2 dashboard-button">
-                            <span class="fa fa-list-ul"></span>
+                            <span class="fa fa-clock"></span>
                             <span class='text'>{% trans 'Current AKs' %}</span>
                         </div>
                     </a>
@@ -35,7 +44,7 @@
                        href="{% url 'plan:plan_wall' event_slug=event.slug %}">
                         <div class="col-sm-12 col-md-3 col-lg-2 dashboard-button">
                             <span class="fa fa-calendar"></span>
-                            <span class='text'>{% trans "AK Wall" %}</span>
+                            <span class='text'>{% trans 'AK Wall' %}</span>
                         </div>
                     </a>
                 {% endif %}

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-03-01 14:21+0000\n"
+"POT-Creation-Date: 2020-05-10 16:22+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,152 +11,155 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: admin.py:21
+#: AKModel/admin.py:32
 msgid "Wish"
 msgstr "AK-Wunsch"
 
-#: admin.py:27
+#: AKModel/admin.py:38
 msgid "Is wish"
 msgstr "Ist ein Wunsch"
 
-#: admin.py:28
+#: AKModel/admin.py:39
 msgid "Is not a wish"
 msgstr "Ist kein Wunsch"
 
-#: admin.py:54
+#: AKModel/admin.py:65
 msgid "Export to wiki syntax"
 msgstr "In Wiki-Syntax exportieren"
 
-#: availability.py:38 models.py:37 models.py:58 models.py:110 models.py:128
-#: models.py:159 models.py:208 models.py:244 models.py:274
+#: AKModel/availability.py:38 AKModel/models.py:37 AKModel/models.py:57
+#: AKModel/models.py:109 AKModel/models.py:128 AKModel/models.py:160
+#: AKModel/models.py:210 AKModel/models.py:246 AKModel/models.py:276
 msgid "Event"
 msgstr "Event"
 
-#: availability.py:39 models.py:59 models.py:111 models.py:129 models.py:160
-#: models.py:209 models.py:245 models.py:275
+#: AKModel/availability.py:39 AKModel/models.py:58 AKModel/models.py:110
+#: AKModel/models.py:129 AKModel/models.py:161 AKModel/models.py:211
+#: AKModel/models.py:247 AKModel/models.py:277
 msgid "Associated event"
 msgstr "Zugehöriges Event"
 
-#: availability.py:47
+#: AKModel/availability.py:47
 msgid "Person"
 msgstr "Person"
 
-#: availability.py:48
+#: AKModel/availability.py:48
 msgid "Person whose availability this is"
 msgstr "Person deren Verfügbarkeit hier abgebildet wird"
 
-#: availability.py:56 models.py:248 models.py:267
+#: AKModel/availability.py:56 AKModel/models.py:250 AKModel/models.py:269
 msgid "Room"
 msgstr "Raum"
 
-#: availability.py:57
+#: AKModel/availability.py:57
 msgid "Room whose availability this is"
 msgstr "Raum dessen Verfügbarkeit hier abgebildet wird"
 
-#: availability.py:65 models.py:212 models.py:266
+#: AKModel/availability.py:65 AKModel/models.py:214 AKModel/models.py:268
 msgid "AK"
 msgstr "AK"
 
-#: availability.py:66
+#: AKModel/availability.py:66
 msgid "AK whose availability this is"
 msgstr "Verfügbarkeiten"
 
-#: availability.py:74 models.py:114
+#: AKModel/availability.py:74 AKModel/models.py:113
 msgid "AK Category"
 msgstr "AK Kategorie"
 
-#: availability.py:75
+#: AKModel/availability.py:75
 msgid "AK Category whose availability this is"
 msgstr "AK Kategorie dessen Verfügbarkeit hier abgebildet wird"
 
-#: availability.py:235
+#: AKModel/availability.py:235
 msgid "Availability"
 msgstr "Verfügbarkeit"
 
-#: availability.py:236
+#: AKModel/availability.py:236
 msgid "Availabilities"
 msgstr "Verfügbarkeiten"
 
-#: models.py:14 models.py:105 models.py:125 models.py:143 models.py:157
-#: models.py:174 models.py:237
+#: AKModel/models.py:14 AKModel/models.py:104 AKModel/models.py:125
+#: AKModel/models.py:144 AKModel/models.py:158 AKModel/models.py:176
+#: AKModel/models.py:239
 msgid "Name"
 msgstr "Name"
 
-#: models.py:15
+#: AKModel/models.py:15
 msgid "Name or iteration of the event"
 msgstr "Name oder Iteration des Events"
 
-#: models.py:16
+#: AKModel/models.py:16
 msgid "Short Form"
 msgstr "Kurzer Name"
 
-#: models.py:17
+#: AKModel/models.py:17
 msgid "Short name of letters/numbers/dots/dashes/underscores used in URLs."
 msgstr ""
 "Kurzname bestehend aus Buchstaben, Nummern, Punkten und Unterstrichen zur "
 "Nutzung in URLs"
 
-#: models.py:19
+#: AKModel/models.py:19
 msgid "Place"
 msgstr "Ort"
 
-#: models.py:20
+#: AKModel/models.py:20
 msgid "City etc. the event takes place in"
 msgstr "Stadt o.ä. in der das Event stattfindet"
 
-#: models.py:22
+#: AKModel/models.py:22
 msgid "Time Zone"
 msgstr "Zeitzone"
 
-#: models.py:22
+#: AKModel/models.py:22
 msgid "Time Zone where this event takes place in"
 msgstr "Zeitzone in der das Event stattfindet"
 
-#: models.py:23
+#: AKModel/models.py:23
 msgid "Start"
 msgstr "Start"
 
-#: models.py:23
+#: AKModel/models.py:23
 msgid "Time the event begins"
 msgstr "Zeit zu der das Event beginnt"
 
-#: models.py:24
+#: AKModel/models.py:24
 msgid "End"
 msgstr "Ende"
 
-#: models.py:24
+#: AKModel/models.py:24
 msgid "Time the event ends"
 msgstr "Zeit zu der das Event endet"
 
-#: models.py:26
+#: AKModel/models.py:26
 msgid "Active State"
 msgstr "Aktiver Status"
 
-#: models.py:26
+#: AKModel/models.py:26
 msgid "Marks currently active events"
 msgstr "Markiert aktuell aktive Events"
 
-#: models.py:28
+#: AKModel/models.py:28
 msgid "Base URL"
 msgstr "URL-Prefix"
 
-#: models.py:28
+#: AKModel/models.py:28
 msgid "Prefix for wiki link construction"
 msgstr "Prefix für die automatische Generierung von Wiki-Links"
 
-#: models.py:29
+#: AKModel/models.py:29
 msgid "Default Slot Length"
 msgstr "Standardslotlänge"
 
-#: models.py:30
+#: AKModel/models.py:30
 msgid "Default length in hours that is assumed for AKs in this event."
 msgstr "Standardlänge von Slots (in Stunden) für dieses Event"
 
-#: models.py:32
+#: AKModel/models.py:32
 msgid "Contact email address"
 msgstr "E-Mail Kontaktadresse"
 
-#: models.py:34
+#: AKModel/models.py:34
 msgid ""
 "An email address that is displayed on every page and can be used for all "
 "kinds of questions"
@@ -164,292 +167,292 @@ msgstr ""
 "Eine Mailadresse die auf jeder Seite angezeigt wird und für alle Arten von "
 "Fragen genutzt werden kann"
 
-#: models.py:38
+#: AKModel/models.py:38
 msgid "Events"
 msgstr "Events"
 
-#: models.py:52
+#: AKModel/models.py:52
 msgid "Nickname"
 msgstr "Spitzname"
 
-#: models.py:52
+#: AKModel/models.py:52
 msgid "Name to identify an AK owner by"
 msgstr "Name durch den eine AK Leitung identifiziert wird"
 
-#: models.py:53
+#: AKModel/models.py:53
 msgid "Slug"
 msgstr "Slug"
 
-#: models.py:54
+#: AKModel/models.py:53
 msgid "Slug for URL generation"
 msgstr "Slug für URL-Generierung"
 
-#: models.py:55
+#: AKModel/models.py:54
 msgid "Institution"
 msgstr "Instutution"
 
-#: models.py:55
+#: AKModel/models.py:54
 msgid "Uni etc."
 msgstr "Universität o.ä."
 
-#: models.py:56 models.py:183
+#: AKModel/models.py:55 AKModel/models.py:185
 msgid "Web Link"
 msgstr "Internet Link"
 
-#: models.py:56
+#: AKModel/models.py:55
 msgid "Link to Homepage"
 msgstr "Link zu Homepage oder Webseite"
 
-#: models.py:62
+#: AKModel/models.py:61
 msgid "AK Owner"
 msgstr "AK Leitung"
 
-#: models.py:63
+#: AKModel/models.py:62
 msgid "AK Owners"
 msgstr "AK Leitungen"
 
-#: models.py:105
+#: AKModel/models.py:104
 msgid "Name of the AK Category"
 msgstr "Name des AK Kategorie"
 
-#: models.py:106 models.py:126
+#: AKModel/models.py:105 AKModel/models.py:126
 msgid "Color"
 msgstr "Farbe"
 
-#: models.py:106 models.py:126
+#: AKModel/models.py:105 AKModel/models.py:126
 msgid "Color for displaying"
 msgstr "Farbe für die Anzeige"
 
-#: models.py:107 models.py:177
+#: AKModel/models.py:106 AKModel/models.py:179
 msgid "Description"
 msgstr "Beschreibung"
 
-#: models.py:108
+#: AKModel/models.py:107
 msgid "Short description of this AK Category"
 msgstr "Beschreibung der AK-Kategorie"
 
-#: models.py:115
+#: AKModel/models.py:114
 msgid "AK Categories"
 msgstr "AK Kategorien"
 
-#: models.py:125
+#: AKModel/models.py:125
 msgid "Name of the AK Track"
 msgstr "Name des AK Tracks"
 
-#: models.py:132
+#: AKModel/models.py:132
 msgid "AK Track"
 msgstr "AK Track"
 
-#: models.py:133
+#: AKModel/models.py:133
 msgid "AK Tracks"
 msgstr "AK Tracks"
 
-#: models.py:143
+#: AKModel/models.py:144
 msgid "Name of the AK Tag"
 msgstr "Name das AK Tags"
 
-#: models.py:146
+#: AKModel/models.py:147
 msgid "AK Tag"
 msgstr "AK Tag"
 
-#: models.py:147
+#: AKModel/models.py:148
 msgid "AK Tags"
 msgstr "AK Tags"
 
-#: models.py:157
+#: AKModel/models.py:158
 msgid "Name of the Requirement"
 msgstr "Name der Anforderung"
 
-#: models.py:163
+#: AKModel/models.py:164
 msgid "AK Requirement"
 msgstr "AK Anforderung"
 
-#: models.py:164
+#: AKModel/models.py:165
 msgid "AK Requirements"
 msgstr "AK Anforderungen"
 
-#: models.py:174
+#: AKModel/models.py:176
 msgid "Name of the AK"
 msgstr "Name des AKs"
 
-#: models.py:175
+#: AKModel/models.py:177
 msgid "Short Name"
 msgstr "Kurzer Name"
 
-#: models.py:176
+#: AKModel/models.py:178
 msgid "Name displayed in the schedule"
 msgstr "Name zur Anzeige im AK Plan"
 
-#: models.py:177
+#: AKModel/models.py:179
 msgid "Description of the AK"
 msgstr "Beschreibung des AKs"
 
-#: models.py:179
+#: AKModel/models.py:181
 msgid "Owners"
 msgstr "Leitungen"
 
-#: models.py:180
+#: AKModel/models.py:182
 msgid "Those organizing the AK"
 msgstr "Menschen, die den AK organisieren und halten"
 
-#: models.py:183
+#: AKModel/models.py:185
 msgid "Link to wiki page"
 msgstr "Link zur Wiki Seite"
 
-#: models.py:185
+#: AKModel/models.py:187
 msgid "Category"
 msgstr "Kategorie"
 
-#: models.py:186
+#: AKModel/models.py:188
 msgid "Category of the AK"
 msgstr "Kategorie des AKs"
 
-#: models.py:187
+#: AKModel/models.py:189
 msgid "Tags"
 msgstr "Tags"
 
-#: models.py:187
+#: AKModel/models.py:189
 msgid "Tags provided by owners"
 msgstr "Tags, die durch die AK Leitung vergeben wurden"
 
-#: models.py:188
+#: AKModel/models.py:190
 msgid "Track"
 msgstr "Track"
 
-#: models.py:189
+#: AKModel/models.py:191
 msgid "Track the AK belongs to"
 msgstr "Track zu dem der AK gehört"
 
-#: models.py:191
+#: AKModel/models.py:193
 msgid "Resolution Intention"
 msgstr "Resolutionsabsicht"
 
-#: models.py:192
+#: AKModel/models.py:194
 msgid "Intends to submit a resolution"
 msgstr "Beabsichtigt eine Resolution einzureichen"
 
-#: models.py:193
+#: AKModel/models.py:195
 msgid "Present this AK"
 msgstr "AK Präsentieren"
 
-#: models.py:194
+#: AKModel/models.py:196
 msgid "Present results of this AK"
 msgstr "Die Ergebnisse dieses AKs vorstellen"
 
-#: models.py:196
+#: AKModel/models.py:198
 msgid "Requirements"
 msgstr "Anforderungen"
 
-#: models.py:197
+#: AKModel/models.py:199
 msgid "AK's Requirements"
 msgstr "Anforderungen des AKs"
 
-#: models.py:199
+#: AKModel/models.py:201
 msgid "Conflicting AKs"
 msgstr "AK Konflikte"
 
-#: models.py:200
+#: AKModel/models.py:202
 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"
 
-#: models.py:201
+#: AKModel/models.py:203
 msgid "Prerequisite AKs"
 msgstr "Vorausgesetzte AKs"
 
-#: models.py:202
+#: AKModel/models.py:204
 msgid "AKs that should precede this AK in the schedule"
 msgstr "AKS die im AK Plan vor diesem AK stattfinden müssen"
 
-#: models.py:204
+#: AKModel/models.py:206
 msgid "Internal Notes"
 msgstr "Interne Notizen"
 
-#: models.py:204
+#: AKModel/models.py:206
 msgid "Notes to organizers"
 msgstr "Notizen an die Organisator*innen"
 
-#: models.py:206
+#: AKModel/models.py:208
 msgid "Interest"
 msgstr "Interesse"
 
-#: models.py:206
+#: AKModel/models.py:208
 msgid "Expected number of people"
 msgstr "Erwartete Personenzahl"
 
-#: models.py:213
+#: AKModel/models.py:215
 msgid "AKs"
 msgstr "AKs"
 
-#: models.py:237
+#: AKModel/models.py:239
 msgid "Name or number of the room"
 msgstr "Name oder Nummer des Raums"
 
-#: models.py:238
+#: AKModel/models.py:240
 msgid "Building"
 msgstr "Gebäude"
 
-#: models.py:239
+#: AKModel/models.py:241
 msgid "Name or number of the building"
 msgstr "Name oder Nummer des Gebäudes"
 
-#: models.py:240
+#: AKModel/models.py:242
 msgid "Capacity"
 msgstr "Kapazität"
 
-#: models.py:240
+#: AKModel/models.py:242
 msgid "Maximum number of people"
 msgstr "Maximale Personenzahl"
 
-#: models.py:241
+#: AKModel/models.py:243
 msgid "Properties"
 msgstr "Eigenschaften"
 
-#: models.py:242
+#: AKModel/models.py:244
 msgid "AK requirements fulfilled by the room"
 msgstr "AK Anforderungen, die dieser Raum erfüllt"
 
-#: models.py:249
+#: AKModel/models.py:251
 msgid "Rooms"
 msgstr "Räume"
 
-#: models.py:266
+#: AKModel/models.py:268
 msgid "AK being mapped"
 msgstr "AK, der zugeordnet wird"
 
-#: models.py:268
+#: AKModel/models.py:270
 msgid "Room the AK will take place in"
 msgstr "Raum in dem der AK stattfindet"
 
-#: models.py:269
+#: AKModel/models.py:271
 msgid "Slot Begin"
 msgstr "Beginn des Slots"
 
-#: models.py:269
+#: AKModel/models.py:271
 msgid "Time and date the slot begins"
 msgstr "Zeit und Datum zu der der AK beginnt"
 
-#: models.py:271
+#: AKModel/models.py:273
 msgid "Duration"
 msgstr "Dauer"
 
-#: models.py:272
+#: AKModel/models.py:274
 msgid "Length in hours"
 msgstr "Länge in Stunden"
 
-#: models.py:277
+#: AKModel/models.py:279
 msgid "Last update"
 msgstr "Letzte Aktualisierung"
 
-#: models.py:280
+#: AKModel/models.py:282
 msgid "AK Slot"
 msgstr "AK Slot"
 
-#: models.py:281
+#: AKModel/models.py:283
 msgid "AK Slots"
 msgstr "AK Slot"
 
-#: models.py:295
+#: AKModel/models.py:297
 msgid "Not scheduled yet"
 msgstr "Noch nicht geplant"
 

AKPlan/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-03-04 00:53+0000\n"
+"POT-Creation-Date: 2020-05-10 16:22+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,51 +17,58 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: templates/AKPlan/plan_base.html:24
+#: AKPlan/templates/AKPlan/plan_base.html:24
 msgid "Write to organizers of this event for questions and comments"
 msgstr "Fragen oder Kommentare? Schreib den Orgas dieses Events eine Mail"
 
-#: templates/AKPlan/plan_breadcrumbs.html:13
+#: AKPlan/templates/AKPlan/plan_breadcrumbs.html:13
 msgid "AK Plan"
 msgstr "AK-Plan"
 
-#: templates/AKPlan/plan_index.html:40
+#: AKPlan/templates/AKPlan/plan_index.html:40
 msgid "Day"
 msgstr "Tag"
 
-#: templates/AKPlan/plan_index.html:50
+#: AKPlan/templates/AKPlan/plan_index.html:50
 msgid "Event"
 msgstr "Veranstaltung"
 
-#: templates/AKPlan/plan_index.html:59 templates/AKPlan/plan_room.html:8
-#: templates/AKPlan/plan_room.html:44 templates/AKPlan/plan_wall.html:64
+#: AKPlan/templates/AKPlan/plan_index.html:59
+#: AKPlan/templates/AKPlan/plan_room.html:8
+#: AKPlan/templates/AKPlan/plan_room.html:44
+#: AKPlan/templates/AKPlan/plan_wall.html:64
 msgid "Room"
 msgstr "Raum"
 
-#: templates/AKPlan/plan_index.html:80 templates/AKPlan/plan_room.html:34
+#: AKPlan/templates/AKPlan/plan_index.html:80
+#: AKPlan/templates/AKPlan/plan_room.html:34
 msgid "Rooms"
 msgstr "Räume"
 
-#: templates/AKPlan/plan_index.html:88 templates/AKPlan/plan_track.html:34
+#: AKPlan/templates/AKPlan/plan_index.html:88
+#: AKPlan/templates/AKPlan/plan_track.html:34
 msgid "Tracks"
 msgstr "Tracks"
 
-#: templates/AKPlan/plan_index.html:96
+#: AKPlan/templates/AKPlan/plan_index.html:96
 msgid "AK Wall"
 msgstr "AK-Wall"
 
-#: templates/AKPlan/plan_index.html:106 templates/AKPlan/plan_wall.html:88
+#: AKPlan/templates/AKPlan/plan_index.html:106
+#: AKPlan/templates/AKPlan/plan_wall.html:88
 msgid "Current AKs"
 msgstr "Aktuelle AKs"
 
-#: templates/AKPlan/plan_index.html:113 templates/AKPlan/plan_wall.html:93
+#: AKPlan/templates/AKPlan/plan_index.html:113
+#: AKPlan/templates/AKPlan/plan_wall.html:93
 msgid "Next AKs"
 msgstr "Nächste AKs"
 
-#: templates/AKPlan/plan_track.html:8 templates/AKPlan/plan_track.html:44
+#: AKPlan/templates/AKPlan/plan_track.html:8
+#: AKPlan/templates/AKPlan/plan_track.html:44
 msgid "Track"
 msgstr "Track"
 
-#: templates/AKPlan/slots_table.html:12
+#: AKPlan/templates/AKPlan/slots_table.html:12
 msgid "No AKs"
 msgstr "Keine AKs"

AKPlanning/locale/de_DE/LC_MESSAGES/django.po

@@ -2,13 +2,13 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-29 14:50+0000\n"
+"POT-Creation-Date: 2020-05-10 16:22+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"

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-01-08 21:38+0000\n"
+"POT-Creation-Date: 2020-05-10 16:22+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,20 +17,20 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: forms.py:43
+#: AKSubmission/forms.py:43
 msgid "Separate multiple tags with semicolon"
 msgstr "Mehrere Tags mit Semikolon trennen"
 
-#: forms.py:67
+#: AKSubmission/forms.py:69
 #, python-format
 msgid "\"%(duration)s\" is not a valid duration"
 msgstr "\"%(duration)s\" ist keine gültige Dauer"
 
-#: forms.py:110
+#: AKSubmission/forms.py:112
 msgid "Duration(s)"
 msgstr "Dauer(n)"
 
-#: forms.py:112
+#: AKSubmission/forms.py:114
 msgid ""
 "Enter at least one planned duration (in hours). If your AK should have "
 "multiple slots, use multiple lines"
@@ -38,242 +38,259 @@ msgstr ""
 "Mindestens eine geplante Dauer (in Stunden) angeben. Wenn der AK mehrere "
 "Slots haben soll, mehrere Zeilen verwenden"
 
-#: templates/AKSubmission/ak_detail.html:8
-#: templates/AKSubmission/ak_edit.html:8 templates/AKSubmission/ak_list.html:8
-#: templates/AKSubmission/ak_list.html:23
-#: templates/AKSubmission/akowner_create_update.html:7
-#: templates/AKSubmission/akslot_add_update.html:7
-#: templates/AKSubmission/akslot_delete.html:7
-#: templates/AKSubmission/submission_overview.html:6
-#: templates/AKSubmission/submission_overview.html:23
-#: templates/AKSubmission/submit_new.html:8
-#: templates/AKSubmission/submit_new_wish.html:5
+#: AKSubmission/templates/AKSubmission/ak_detail.html:10
+#: AKSubmission/templates/AKSubmission/ak_edit.html:8
+#: AKSubmission/templates/AKSubmission/ak_list.html:8
+#: AKSubmission/templates/AKSubmission/akowner_create_update.html:7
+#: AKSubmission/templates/AKSubmission/akslot_add_update.html:7
+#: AKSubmission/templates/AKSubmission/akslot_delete.html:7
+#: AKSubmission/templates/AKSubmission/submission_overview.html:6
+#: AKSubmission/templates/AKSubmission/submission_overview.html:23
+#: AKSubmission/templates/AKSubmission/submit_new.html:8
+#: AKSubmission/templates/AKSubmission/submit_new_wish.html:5
 msgid "AKs"
 msgstr "AKs"
 
-#: templates/AKSubmission/ak_detail.html:8
-#: templates/AKSubmission/akslot_delete.html:31
+#: AKSubmission/templates/AKSubmission/ak_detail.html:10
+#: AKSubmission/templates/AKSubmission/akslot_delete.html:31
 msgid "AK"
 msgstr "AK"
 
-#: templates/AKSubmission/ak_detail.html:13
-#: templates/AKSubmission/ak_edit.html:13
-#: templates/AKSubmission/ak_list.html:22
-#: templates/AKSubmission/ak_list.html:27
-#: templates/AKSubmission/akowner_create_update.html:12
-#: templates/AKSubmission/akslot_add_update.html:12
-#: templates/AKSubmission/akslot_delete.html:12
-#: templates/AKSubmission/submission_overview.html:6
-#: templates/AKSubmission/submission_overview.html:19
-#: templates/AKSubmission/submit_new.html:18
-#: templates/AKSubmission/submit_new_wish.html:10
+#: AKSubmission/templates/AKSubmission/ak_detail.html:15
+#: AKSubmission/templates/AKSubmission/ak_edit.html:13
+#: AKSubmission/templates/AKSubmission/ak_list.html:22
+#: AKSubmission/templates/AKSubmission/akowner_create_update.html:12
+#: AKSubmission/templates/AKSubmission/akslot_add_update.html:12
+#: AKSubmission/templates/AKSubmission/akslot_delete.html:12
+#: AKSubmission/templates/AKSubmission/submission_overview.html:6
+#: AKSubmission/templates/AKSubmission/submission_overview.html:19
+#: AKSubmission/templates/AKSubmission/submit_new.html:18
+#: AKSubmission/templates/AKSubmission/submit_new_wish.html:10
 msgid "AK Submission"
 msgstr "AK-Eintragung"
 
-#: templates/AKSubmission/ak_detail.html:29
-#: templates/AKSubmission/ak_list_table.html:32
+#: AKSubmission/templates/AKSubmission/ak_detail.html:37
+#: AKSubmission/templates/AKSubmission/ak_list_table.html:32
 msgid "AK Wish"
 msgstr "AK-Wunsch"
 
-#: templates/AKSubmission/ak_detail.html:33
-#: templates/AKSubmission/ak_list_table.html:10
+#: AKSubmission/templates/AKSubmission/ak_detail.html:41
+#: AKSubmission/templates/AKSubmission/ak_list_table.html:10
 msgid "Who?"
 msgstr "Wer?"
 
-#: templates/AKSubmission/ak_detail.html:37
-#: templates/AKSubmission/ak_list_table.html:11
+#: AKSubmission/templates/AKSubmission/ak_detail.html:45
+#: AKSubmission/templates/AKSubmission/ak_list_table.html:11
 msgid "Category"
 msgstr "Kategorie"
 
-#: templates/AKSubmission/ak_detail.html:43
+#: AKSubmission/templates/AKSubmission/ak_detail.html:51
 msgid "Present this AK"
 msgstr "Diesen AK vorstellen"
 
-#: templates/AKSubmission/ak_detail.html:47
-#: templates/AKSubmission/ak_list.html:35
-#: templates/AKSubmission/ak_list_table.html:12
+#: AKSubmission/templates/AKSubmission/ak_detail.html:55
+#: AKSubmission/templates/AKSubmission/ak_list.html:35
+#: AKSubmission/templates/AKSubmission/ak_list_table.html:12
 msgid "Tags"
 msgstr "Tags"
 
-#: templates/AKSubmission/ak_detail.html:53
+#: AKSubmission/templates/AKSubmission/ak_detail.html:61
 msgid "Reso?"
 msgstr "Reso?"
 
-#: templates/AKSubmission/ak_detail.html:67
+#: AKSubmission/templates/AKSubmission/ak_detail.html:68
+msgid "Requirements"
+msgstr "Anforderungen"
+
+#: AKSubmission/templates/AKSubmission/ak_detail.html:81
+msgid "Conflicting AKs"
+msgstr "AK Konflikte"
+
+#: AKSubmission/templates/AKSubmission/ak_detail.html:89
+msgid "Prerequisite AKs"
+msgstr "AK Voraussetzungen"
+
+#: AKSubmission/templates/AKSubmission/ak_detail.html:108
 msgid "When?"
 msgstr "Wann?"
 
-#: templates/AKSubmission/ak_detail.html:68
-#: templates/AKSubmission/akslot_delete.html:35
+#: AKSubmission/templates/AKSubmission/ak_detail.html:109
+#: AKSubmission/templates/AKSubmission/akslot_delete.html:35
 msgid "Duration"
 msgstr "Dauer"
 
-#: templates/AKSubmission/ak_detail.html:69
+#: AKSubmission/templates/AKSubmission/ak_detail.html:110
 msgid "Room"
 msgstr "Raum"
 
-#: templates/AKSubmission/ak_detail.html:95
+#: AKSubmission/templates/AKSubmission/ak_detail.html:136
 msgid "Add another slot"
 msgstr "Einen neuen AK-Slot hinzufügen"
 
-#: templates/AKSubmission/ak_edit.html:8 templates/AKSubmission/ak_edit.html:21
+#: AKSubmission/templates/AKSubmission/ak_edit.html:8
+#: AKSubmission/templates/AKSubmission/ak_edit.html:21
 msgid "Edit AK"
 msgstr "AK bearbeiten"
 
-#: templates/AKSubmission/ak_edit.html:16
+#: AKSubmission/templates/AKSubmission/ak_edit.html:16
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: templates/AKSubmission/ak_list.html:29
+#: AKSubmission/templates/AKSubmission/ak_list.html:23
+#: AKSubmission/templates/AKSubmission/ak_list.html:27
+msgid "AK List"
+msgstr "AK Liste"
+
+#: AKSubmission/templates/AKSubmission/ak_list.html:29
 msgid "Categories"
 msgstr "Kategorie"
 
-#: templates/AKSubmission/ak_list_table.html:9
+#: AKSubmission/templates/AKSubmission/ak_list_table.html:9
 msgid "Name"
 msgstr "Name"
 
-#: templates/AKSubmission/ak_list_table.html:23
+#: AKSubmission/templates/AKSubmission/ak_list_table.html:23
 msgid "present this AK"
 msgstr "Diesen AK vorstellen"
 
-#: templates/AKSubmission/ak_list_table.html:27
+#: AKSubmission/templates/AKSubmission/ak_list_table.html:27
 msgid "Reso"
 msgstr "Reso"
 
-#: templates/AKSubmission/akowner_create_update.html:7
-#: templates/AKSubmission/akowner_create_update.html:13
-#: templates/AKSubmission/akowner_create_update.html:18
+#: AKSubmission/templates/AKSubmission/akowner_create_update.html:7
+#: AKSubmission/templates/AKSubmission/akowner_create_update.html:13
+#: AKSubmission/templates/AKSubmission/akowner_create_update.html:18
 msgid "AK Owner"
 msgstr "AK-Leitung"
 
-#: templates/AKSubmission/akowner_create_update.html:24
-#: templates/AKSubmission/akslot_add_update.html:26
-#: templates/AKSubmission/submit_new.html:34
+#: AKSubmission/templates/AKSubmission/akowner_create_update.html:24
+#: AKSubmission/templates/AKSubmission/akslot_add_update.html:26
+#: AKSubmission/templates/AKSubmission/submit_new.html:34
 msgid "Reset"
 msgstr "Zurücksetzen"
 
-#: templates/AKSubmission/akowner_create_update.html:28
-#: templates/AKSubmission/akslot_add_update.html:30
-#: templates/AKSubmission/akslot_delete.html:42
-#: templates/AKSubmission/submit_new.html:38
+#: AKSubmission/templates/AKSubmission/akowner_create_update.html:28
+#: AKSubmission/templates/AKSubmission/akslot_add_update.html:30
+#: AKSubmission/templates/AKSubmission/akslot_delete.html:42
+#: AKSubmission/templates/AKSubmission/submit_new.html:38
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: templates/AKSubmission/akowner_create_update.html:31
-#: templates/AKSubmission/akslot_add_update.html:33
+#: AKSubmission/templates/AKSubmission/akowner_create_update.html:31
+#: AKSubmission/templates/AKSubmission/akslot_add_update.html:33
 msgid "Continue"
 msgstr "Weiter"
 
-#: templates/AKSubmission/akslot_add_update.html:7
-#: templates/AKSubmission/akslot_add_update.html:15
-#: templates/AKSubmission/akslot_add_update.html:20
-#: templates/AKSubmission/akslot_delete.html:7
-#: templates/AKSubmission/akslot_delete.html:15
-#: templates/AKSubmission/akslot_delete.html:20
+#: AKSubmission/templates/AKSubmission/akslot_add_update.html:7
+#: AKSubmission/templates/AKSubmission/akslot_add_update.html:15
+#: AKSubmission/templates/AKSubmission/akslot_add_update.html:20
+#: AKSubmission/templates/AKSubmission/akslot_delete.html:7
+#: AKSubmission/templates/AKSubmission/akslot_delete.html:15
+#: AKSubmission/templates/AKSubmission/akslot_delete.html:20
 msgid "AK Duration(s)"
 msgstr "AK-Dauer(n)"
 
-#: templates/AKSubmission/akslot_delete.html:25
+#: AKSubmission/templates/AKSubmission/akslot_delete.html:25
 msgid "Do you really want to delete this AK Slot?"
 msgstr "Willst du diesen AK-Slot wirklich löschen?"
 
-#: templates/AKSubmission/akslot_delete.html:45
+#: AKSubmission/templates/AKSubmission/akslot_delete.html:45
 msgid "Confirm"
 msgstr "Bestätigen"
 
-#: templates/AKSubmission/submission_base.html:13
+#: AKSubmission/templates/AKSubmission/submission_base.html:13
 msgid "Write to organizers of this event for questions and comments"
 msgstr "Fragen oder Kommentare? Schreib den Orgas dieses Events eine Mail"
 
-#: templates/AKSubmission/submission_overview.html:27
+#: AKSubmission/templates/AKSubmission/submission_overview.html:27
 msgid ""
 "On this page you can see a list of current AKs, change them and add new ones."
 msgstr ""
 "Auf dieser Seite kannst du eine Liste von aktuellen AKs sehen, diese "
 "bearbeiten und neue hinzufügen."
 
-#: templates/AKSubmission/submission_overview.html:34
-#: templates/AKSubmission/submit_new_wish.html:5
-#: templates/AKSubmission/submit_new_wish.html:11
-#: templates/AKSubmission/submit_new_wish.html:15
+#: AKSubmission/templates/AKSubmission/submission_overview.html:34
+#: AKSubmission/templates/AKSubmission/submit_new_wish.html:5
+#: AKSubmission/templates/AKSubmission/submit_new_wish.html:11
+#: AKSubmission/templates/AKSubmission/submit_new_wish.html:15
 msgid "New AK Wish"
 msgstr "Neuer AK-Wunsch"
 
-#: templates/AKSubmission/submission_overview.html:38
+#: AKSubmission/templates/AKSubmission/submission_overview.html:38
 msgid "Who"
 msgstr "Wer"
 
-#: templates/AKSubmission/submission_overview.html:41
+#: AKSubmission/templates/AKSubmission/submission_overview.html:41
 msgid "I do not own AKs yet"
 msgstr "Ich leite bisher keine AKs"
 
-#: templates/AKSubmission/submission_overview.html:49
-#: templates/AKSubmission/submit_new.html:8
-#: templates/AKSubmission/submit_new.html:21
-#: templates/AKSubmission/submit_new.html:28
+#: AKSubmission/templates/AKSubmission/submission_overview.html:49
+#: AKSubmission/templates/AKSubmission/submit_new.html:8
+#: AKSubmission/templates/AKSubmission/submit_new.html:21
+#: AKSubmission/templates/AKSubmission/submit_new.html:28
 msgid "New AK"
 msgstr "Neuer AK"
 
-#: templates/AKSubmission/submission_overview.html:55
+#: AKSubmission/templates/AKSubmission/submission_overview.html:55
 msgid "Edit Person Info"
 msgstr "Personen-Info bearbeiten"
 
-#: templates/AKSubmission/submission_overview.html:62
+#: AKSubmission/templates/AKSubmission/submission_overview.html:62
 msgid "This event is not active. You cannot add or change AKs"
 msgstr ""
 "Dieses Event is nicht aktiv. Es können keine AKs hinzugefügt oder bearbeitet "
 "werden"
 
-#: templates/AKSubmission/submission_overview.html:66
+#: AKSubmission/templates/AKSubmission/submission_overview.html:66
 msgid "Current AKs"
 msgstr "Aktuelle AKs"
 
-#: templates/AKSubmission/submit_new.html:41
+#: AKSubmission/templates/AKSubmission/submit_new.html:41
 msgid "Submit"
 msgstr "Eintragen"
 
-#: views.py:43
+#: AKSubmission/views.py:42
 msgid "Wishes"
 msgstr "Wünsche"
 
-#: views.py:43
+#: AKSubmission/views.py:42
 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"
 
-#: views.py:104
+#: AKSubmission/views.py:103
 msgid "AK successfully created"
 msgstr "AK erfolgreich angelegt"
 
-#: views.py:157
+#: AKSubmission/views.py:156
 msgid "AK successfully updated"
 msgstr "AK erfolgreich aktualisiert"
 
-#: views.py:215
+#: AKSubmission/views.py:211
 msgid "Person Info successfully updated"
 msgstr "Personen-Info erfolgreich aktualisiert"
 
-#: views.py:228
+#: AKSubmission/views.py:224
 msgid "No user selected"
 msgstr "Keine Person ausgewählt"
 
-#: views.py:254
+#: AKSubmission/views.py:250
 msgid "AK Slot successfully added"
 msgstr "AK-Slot erfolgreich angelegt"
 
-#: views.py:266
+#: AKSubmission/views.py:264
 msgid "You cannot edit a slot that has already been scheduled"
 msgstr "Bereits geplante AK-Slots können nicht mehr bearbeitet werden"
 
-#: views.py:276
+#: AKSubmission/views.py:274
 msgid "AK Slot successfully updated"
 msgstr "AK-Slot erfolgreich aktualisiert"
 
-#: views.py:287
+#: AKSubmission/views.py:287
 msgid "You cannot delete a slot that has already been scheduled"
 msgstr "Bereits geplante AK-Slots können nicht mehr gelöscht werden"
 
-#: views.py:297
+#: AKSubmission/views.py:297
 msgid "AK Slot successfully deleted"
 msgstr "AK-Slot erfolgreich angelegt"

AKSubmission/templates/AKSubmission/ak_list.html

@@ -20,11 +20,11 @@
     {% include "AKSubmission/submission_breadcrumbs.html" %}
     <li class="breadcrumb-item"><a
             href="{% url 'submit:submission_overview' event_slug=event.slug %}">{% trans "AK Submission" %}</a></li>
-    <li class="breadcrumb-item active">{% trans "AKs" %}</li>
+    <li class="breadcrumb-item active">{% trans "AK List" %}</li>
 {% endblock %}
 
 {% block content %}
-    <h1>{{ event.name }}: {% trans "AK Submission" %}</h1>
+    <h1>{{ event.name }}: {% trans "AK List" %}</h1>
 
     <b>{% trans 'Categories' %}:</b>
     {% category_list categories event.slug %}

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: 2019-10-29 14:50+0000\n"
+"POT-Creation-Date: 2020-05-10 16:22+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"
@@ -18,10 +18,10 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: templates/base.html:73
+#: templates/base.html:76
 msgid "Impress"
 msgstr "Impressum"
 
-#: templates/base.html:74
+#: templates/base.html:79
 msgid "This software is open source"
 msgstr "Diese Software ist Open Source"