diff --git a/AKModel/locale/de_DE/LC_MESSAGES/django.po b/AKModel/locale/de_DE/LC_MESSAGES/django.po index 762458ee98b6c2e654fa786565a0fb6c68e47ad0..b5b9ac062b7970c4744afb97ba1bf0208c26780c 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: 2019-10-25 12:36+0000\n" +"POT-Creation-Date: 2019-10-29 14:50+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,404 +11,416 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: availability.py:38 models.py:25 models.py:46 models.py:140 models.py:189 -#: models.py:221 models.py:247 +#: AKModel/availability.py:38 AKModel/models.py:30 AKModel/models.py:51 +#: AKModel/models.py:103 AKModel/models.py:121 AKModel/models.py:152 +#: AKModel/models.py:201 AKModel/models.py:233 AKModel/models.py:259 msgid "Event" msgstr "Event" -#: availability.py:39 models.py:47 models.py:141 models.py:190 models.py:222 -#: models.py:248 +#: AKModel/availability.py:39 AKModel/models.py:52 AKModel/models.py:104 +#: AKModel/models.py:122 AKModel/models.py:153 AKModel/models.py:202 +#: AKModel/models.py:234 AKModel/models.py:260 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:225 models.py:240 +#: AKModel/availability.py:56 AKModel/models.py:237 AKModel/models.py:252 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:193 models.py:239 +#: AKModel/availability.py:65 AKModel/models.py:205 AKModel/models.py:251 msgid "AK" msgstr "AK" -#: availability.py:66 +#: AKModel/availability.py:66 #, fuzzy #| msgid "Availabilities" msgid "AK whose availability this is" msgstr "Verfügbarkeiten" -#: availability.py:74 models.py:98 +#: AKModel/availability.py:74 AKModel/models.py:107 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:12 models.py:93 models.py:109 models.py:124 models.py:138 -#: models.py:155 models.py:214 +#: AKModel/models.py:12 AKModel/models.py:98 AKModel/models.py:118 +#: AKModel/models.py:136 AKModel/models.py:150 AKModel/models.py:167 +#: AKModel/models.py:226 msgid "Name" msgstr "Name" -#: models.py:13 +#: AKModel/models.py:13 msgid "Name or iteration of the event" msgstr "Name oder Iteration des Events" -#: models.py:14 +#: AKModel/models.py:14 #, fuzzy #| msgid "Short Name" msgid "Short Form" msgstr "Kurzer Name" -#: models.py:15 +#: AKModel/models.py:15 msgid "Short name of letters/numbers/dots/dashes/underscores used in URLs." msgstr "" -#: models.py:16 +#: AKModel/models.py:16 msgid "Start" msgstr "Start" -#: models.py:16 +#: AKModel/models.py:16 msgid "Time the event begins" msgstr "Zeit zu der das Event beginnt" -#: models.py:17 +#: AKModel/models.py:17 msgid "End" msgstr "Ende" -#: models.py:17 +#: AKModel/models.py:17 msgid "Time the event ends" msgstr "Zeit zu der das Event endet" -#: models.py:18 +#: AKModel/models.py:18 msgid "Place" msgstr "Ort" -#: models.py:19 +#: AKModel/models.py:19 msgid "City etc. the event takes place in" msgstr "Stadt o.ä. in der das Event stattfindet" -#: models.py:20 +#: AKModel/models.py:20 msgid "Active State" msgstr "Aktiver Status" -#: models.py:20 +#: AKModel/models.py:20 msgid "Marks currently active events" msgstr "Markiert aktuell aktive Events" -#: models.py:22 +#: AKModel/models.py:22 msgid "Base URL" msgstr "URL-Prefix" -#: models.py:22 +#: AKModel/models.py:22 msgid "Prefix for wiki link construction" msgstr "Prefix für die automatische Generierung von Wiki-Links" -#: models.py:26 +#: AKModel/models.py:26 +msgid "Contact email address" +msgstr "E-Mail Kontaktadresse" + +#: AKModel/models.py:27 +msgid "" +"An email address that is displayed on every page and can be used for all " +"kinds of questions" +msgstr "" +"Eine Mailadresse die auf jeder Seite angezeigt wird und für alle Arten von " +"Fragen genutzt werden kann" + +#: AKModel/models.py:31 msgid "Events" msgstr "Events" -#: models.py:40 +#: AKModel/models.py:45 msgid "Nickname" msgstr "Spitzname" -#: models.py:40 +#: AKModel/models.py:45 msgid "Name to identify an AK owner by" msgstr "Name durch den eine AK Leitung identifiziert wird" -#: models.py:41 +#: AKModel/models.py:46 msgid "Slug" msgstr "Slug" -#: models.py:42 +#: AKModel/models.py:47 msgid "Slug for URL generation" msgstr "Slug für URL-Generierung" -#: models.py:43 +#: AKModel/models.py:48 msgid "Institution" msgstr "Instutution" -#: models.py:43 +#: AKModel/models.py:48 msgid "Uni etc." msgstr "Universität o.ä." -#: models.py:44 models.py:164 +#: AKModel/models.py:49 AKModel/models.py:176 msgid "Web Link" msgstr "Internet Link" -#: models.py:44 +#: AKModel/models.py:49 msgid "Link to Homepage" msgstr "Link zu Homepage oder Webseite" -#: models.py:50 +#: AKModel/models.py:55 msgid "AK Owner" msgstr "AK Leitung" -#: models.py:51 +#: AKModel/models.py:56 msgid "AK Owners" msgstr "AK Leitungen" -#: models.py:93 +#: AKModel/models.py:98 msgid "Name of the AK Category" msgstr "Name des AK Kategorie" -#: models.py:94 models.py:110 +#: AKModel/models.py:99 AKModel/models.py:119 msgid "Color" msgstr "Farbe" -#: models.py:94 models.py:110 +#: AKModel/models.py:99 AKModel/models.py:119 msgid "Color for displaying" msgstr "Farbe für die Anzeige" -#: models.py:95 models.py:158 +#: AKModel/models.py:100 AKModel/models.py:170 msgid "Description" msgstr "Beschreibung" -#: models.py:95 +#: AKModel/models.py:101 msgid "Short description of this AK Category" msgstr "Beschreibung der AK-Kategorie" -#: models.py:99 +#: AKModel/models.py:108 msgid "AK Categories" msgstr "AK Kategorien" -#: models.py:109 +#: AKModel/models.py:118 msgid "Name of the AK Track" msgstr "Name des AK Tracks" -#: models.py:113 +#: AKModel/models.py:125 msgid "AK Track" msgstr "AK Track" -#: models.py:114 +#: AKModel/models.py:126 msgid "AK Tracks" msgstr "AK Tracks" -#: models.py:124 +#: AKModel/models.py:136 msgid "Name of the AK Tag" msgstr "Name das AK Tags" -#: models.py:127 +#: AKModel/models.py:139 msgid "AK Tag" msgstr "AK Tag" -#: models.py:128 +#: AKModel/models.py:140 msgid "AK Tags" msgstr "AK Tags" -#: models.py:138 +#: AKModel/models.py:150 msgid "Name of the Requirement" msgstr "Name der Anforderung" -#: models.py:144 +#: AKModel/models.py:156 msgid "AK Requirement" msgstr "AK Anforderung" -#: models.py:145 +#: AKModel/models.py:157 msgid "AK Requirements" msgstr "AK Anforderungen" -#: models.py:155 +#: AKModel/models.py:167 msgid "Name of the AK" msgstr "Name des AKs" -#: models.py:156 +#: AKModel/models.py:168 msgid "Short Name" msgstr "Kurzer Name" -#: models.py:157 +#: AKModel/models.py:169 msgid "Name displayed in the schedule" msgstr "Name zur Anzeige im AK Plan" -#: models.py:158 +#: AKModel/models.py:170 msgid "Description of the AK" msgstr "Beschreibung des AKs" -#: models.py:160 +#: AKModel/models.py:172 msgid "Owners" msgstr "Leitungen" -#: models.py:161 +#: AKModel/models.py:173 msgid "Those organizing the AK" msgstr "Menschen, die den AK organisieren und halten" -#: models.py:164 +#: AKModel/models.py:176 msgid "Link to wiki page" msgstr "Link zur Wiki Seite" -#: models.py:166 +#: AKModel/models.py:178 msgid "Category" msgstr "Kategorie" -#: models.py:167 +#: AKModel/models.py:179 msgid "Category of the AK" msgstr "Kategorie des AKs" -#: models.py:168 +#: AKModel/models.py:180 msgid "Tags" msgstr "Tags" -#: models.py:168 +#: AKModel/models.py:180 msgid "Tags provided by owners" msgstr "Tags, die durch die AK Leitung vergeben wurden" -#: models.py:169 +#: AKModel/models.py:181 msgid "Track" msgstr "Track" -#: models.py:170 +#: AKModel/models.py:182 msgid "Track the AK belongs to" msgstr "Track zu dem der AK gehört" -#: models.py:172 +#: AKModel/models.py:184 msgid "Resolution Intention" msgstr "Resolutionsabsicht" -#: models.py:173 +#: AKModel/models.py:185 msgid "Intends to submit a resolution" msgstr "Beabsichtigt eine Resolution einzureichen" -#: models.py:174 +#: AKModel/models.py:186 msgid "Present this AK" msgstr "AK Präsentieren" -#: models.py:175 +#: AKModel/models.py:187 msgid "Present results of this AK" msgstr "Die Ergebnisse dieses AKs vorstellen" -#: models.py:177 +#: AKModel/models.py:189 msgid "Requirements" msgstr "Anforderungen" -#: models.py:178 +#: AKModel/models.py:190 msgid "AK's Requirements" msgstr "Anforderungen des AKs" -#: models.py:180 +#: AKModel/models.py:192 msgid "Conflicting AKs" msgstr "AK Konflikte" -#: models.py:181 +#: AKModel/models.py:193 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:182 +#: AKModel/models.py:194 msgid "Prerequisite AKs" msgstr "Vorausgesetzte AKs" -#: models.py:183 +#: AKModel/models.py:195 msgid "AKs that should precede this AK in the schedule" msgstr "AKS die im AK Plan vor diesem AK stattfinden müssen" -#: models.py:185 +#: AKModel/models.py:197 msgid "Internal Notes" msgstr "Interne Notizen" -#: models.py:185 +#: AKModel/models.py:197 msgid "Notes to organizers" msgstr "Notizen an die Organisator*innen" -#: models.py:187 +#: AKModel/models.py:199 msgid "Interest" msgstr "Interesse" -#: models.py:187 +#: AKModel/models.py:199 msgid "Expected number of people" msgstr "Erwartete Personenzahl" -#: models.py:194 +#: AKModel/models.py:206 msgid "AKs" msgstr "AKs" -#: models.py:214 +#: AKModel/models.py:226 msgid "Name or number of the room" msgstr "Name oder Nummer des Raums" -#: models.py:215 +#: AKModel/models.py:227 msgid "Building" msgstr "Gebäude" -#: models.py:216 +#: AKModel/models.py:228 msgid "Name or number of the building" msgstr "Name oder Nummer des Gebäudes" -#: models.py:217 +#: AKModel/models.py:229 msgid "Capacity" msgstr "Kapazität" -#: models.py:217 +#: AKModel/models.py:229 msgid "Maximum number of people" msgstr "Maximale Personenzahl" -#: models.py:218 +#: AKModel/models.py:230 msgid "Properties" msgstr "Eigenschaften" -#: models.py:219 +#: AKModel/models.py:231 msgid "AK requirements fulfilled by the room" msgstr "AK Anforderungen, die dieser Raum erfüllt" -#: models.py:226 +#: AKModel/models.py:238 msgid "Rooms" msgstr "Räume" -#: models.py:239 +#: AKModel/models.py:251 msgid "AK being mapped" msgstr "AK, der zugeordnet wird" -#: models.py:241 +#: AKModel/models.py:253 msgid "Room the AK will take place in" msgstr "Raum in dem der AK stattfindet" -#: models.py:242 +#: AKModel/models.py:254 msgid "Slot Begin" msgstr "Beginn des Slots" -#: models.py:242 +#: AKModel/models.py:254 msgid "Time and date the slot begins" msgstr "Zeit und Datum zu der der AK beginnt" -#: models.py:244 +#: AKModel/models.py:256 msgid "Duration" msgstr "Dauer" -#: models.py:245 +#: AKModel/models.py:257 msgid "Length in hours" msgstr "Länge in Stunden" -#: models.py:251 +#: AKModel/models.py:263 msgid "AK Slot" msgstr "AK Slot" -#: models.py:252 +#: AKModel/models.py:264 msgid "AK Slots" msgstr "AK Slot" -#: models.py:266 +#: AKModel/models.py:278 msgid "Not scheduled yet" msgstr "Noch nicht geplant" #~ msgid "E-Mail Address" #~ msgstr "E-Mail Adresse" - -#~ msgid "Contact mail" -#~ msgstr "Kontakt E-Mail" diff --git a/AKModel/migrations/0025_contact_email.py b/AKModel/migrations/0025_contact_email.py new file mode 100644 index 0000000000000000000000000000000000000000..50520d84503933482190f2c500dfafaee1950d84 --- /dev/null +++ b/AKModel/migrations/0025_contact_email.py @@ -0,0 +1,18 @@ +# Generated by Django 2.2.6 on 2019-10-28 17:40 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('AKModel', '0024_event_dependencies'), + ] + + operations = [ + migrations.AddField( + model_name='event', + name='contact_email', + field=models.EmailField(blank=True, help_text='An email address that is displayed on every page and can be used for all kinds of questions', max_length=254, verbose_name='Contact email address'), + ), + ] diff --git a/AKModel/models.py b/AKModel/models.py index 84974b104ec754cbff8d030388370640318a7008..a1442587613df98a4fb5b9680efd552877a6c3c6 100644 --- a/AKModel/models.py +++ b/AKModel/models.py @@ -23,6 +23,9 @@ class Event(models.Model): default_slot = models.DecimalField(max_digits=4, decimal_places=2, default=2, verbose_name='Default Slot Length', help_text='Default length in hours that is assumed for AKs in this event.') + contact_email = models.EmailField(verbose_name=_("Contact email address"), blank=True, + help_text=_("An email address that is displayed on every page and can be used for all kinds of questions")) + class Meta: verbose_name = _('Event') verbose_name_plural = _('Events') diff --git a/AKSubmission/locale/de_DE/LC_MESSAGES/django.po b/AKSubmission/locale/de_DE/LC_MESSAGES/django.po index 4aa13e1040e619c683c235cb5544bb1948e8acab..c749f1df467139e111bfda49b2869a43aa5bb558 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: 2019-10-29 14:50+0000\n" +"POT-Creation-Date: 2019-10-29 15:27+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" -#: AKSubmission/forms.py:43 +#: forms.py:43 msgid "Separate multiple tags with semicolon" msgstr "Mehrere Tags mit Semikolon trennen" -#: AKSubmission/forms.py:67 +#: forms.py:67 #, python-format msgid "\"%(duration)s\" is not a valid duration" msgstr "\"%(duration)s\" ist keine gültige Dauer" -#: AKSubmission/forms.py:110 +#: forms.py:110 msgid "Duration(s)" msgstr "Dauer(n)" -#: AKSubmission/forms.py:112 +#: forms.py:112 msgid "" "Enter at least one planned duration (in hours). If your AK should have " "multiple slots, use multiple lines" @@ -38,243 +38,245 @@ msgstr "" "Mindestens eine geplante Dauer (in Stunden) angeben. Wenn der AK mehrere " "Slots haben soll, mehrere Zeilen verwenden" -#: AKSubmission/templates/AKSubmission/ak_detail.html:8 -#: AKSubmission/templates/AKSubmission/ak_edit.html:8 -#: AKSubmission/templates/AKSubmission/ak_list.html:8 -#: AKSubmission/templates/AKSubmission/ak_list.html:14 -#: 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:15 -#: AKSubmission/templates/AKSubmission/submit_new.html:8 -#: AKSubmission/templates/AKSubmission/submit_new_wish.html:5 +#: templates/AKSubmission/ak_detail.html:8 +#: templates/AKSubmission/ak_edit.html:8 templates/AKSubmission/ak_list.html:8 +#: templates/AKSubmission/ak_list.html:14 +#: 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:15 +#: templates/AKSubmission/submit_new.html:8 +#: templates/AKSubmission/submit_new_wish.html:5 msgid "AKs" msgstr "AKs" -#: AKSubmission/templates/AKSubmission/ak_detail.html:8 -#: AKSubmission/templates/AKSubmission/akslot_delete.html:30 +#: templates/AKSubmission/ak_detail.html:8 +#: templates/AKSubmission/akslot_delete.html:30 #, fuzzy #| msgid "AKs" msgid "AK" msgstr "AKs" -#: AKSubmission/templates/AKSubmission/ak_detail.html:13 -#: AKSubmission/templates/AKSubmission/ak_edit.html:14 -#: AKSubmission/templates/AKSubmission/ak_list.html:13 -#: AKSubmission/templates/AKSubmission/ak_list.html:18 -#: AKSubmission/templates/AKSubmission/akowner_create_update.html:13 -#: AKSubmission/templates/AKSubmission/akslot_add_update.html:13 -#: AKSubmission/templates/AKSubmission/akslot_delete.html:13 -#: AKSubmission/templates/AKSubmission/submission_overview.html:6 -#: AKSubmission/templates/AKSubmission/submission_overview.html:11 -#: AKSubmission/templates/AKSubmission/submit_new.html:19 -#: AKSubmission/templates/AKSubmission/submit_new_wish.html:10 +#: templates/AKSubmission/ak_detail.html:13 +#: templates/AKSubmission/ak_edit.html:14 +#: templates/AKSubmission/ak_list.html:13 +#: templates/AKSubmission/ak_list.html:18 +#: templates/AKSubmission/akowner_create_update.html:13 +#: templates/AKSubmission/akslot_add_update.html:13 +#: templates/AKSubmission/akslot_delete.html:13 +#: templates/AKSubmission/submission_overview.html:6 +#: templates/AKSubmission/submission_overview.html:11 +#: templates/AKSubmission/submit_new.html:19 +#: templates/AKSubmission/submit_new_wish.html:10 msgid "AK Submission" msgstr "AK-Eintragung" -#: AKSubmission/templates/AKSubmission/ak_detail.html:27 -#: AKSubmission/templates/AKSubmission/ak_list_table.html:30 +#: templates/AKSubmission/ak_detail.html:27 +#: templates/AKSubmission/ak_list_table.html:30 msgid "AK Wish" msgstr "AK-Wunsch" -#: AKSubmission/templates/AKSubmission/ak_detail.html:30 -#: AKSubmission/templates/AKSubmission/ak_list_table.html:10 +#: templates/AKSubmission/ak_detail.html:30 +#: templates/AKSubmission/ak_list_table.html:10 msgid "Who?" msgstr "Wer?" -#: AKSubmission/templates/AKSubmission/ak_detail.html:32 -#: AKSubmission/templates/AKSubmission/ak_list_table.html:11 +#: templates/AKSubmission/ak_detail.html:32 +#: templates/AKSubmission/ak_list_table.html:11 msgid "Category" msgstr "Kategorie" -#: AKSubmission/templates/AKSubmission/ak_detail.html:38 +#: templates/AKSubmission/ak_detail.html:38 msgid "Present this AK" msgstr "Diesen AK vorstellen" -#: AKSubmission/templates/AKSubmission/ak_detail.html:42 -#: AKSubmission/templates/AKSubmission/ak_list.html:26 -#: AKSubmission/templates/AKSubmission/ak_list_table.html:12 +#: templates/AKSubmission/ak_detail.html:42 +#: templates/AKSubmission/ak_list.html:26 +#: templates/AKSubmission/ak_list_table.html:12 msgid "Tags" msgstr "Tags" -#: AKSubmission/templates/AKSubmission/ak_detail.html:48 +#: templates/AKSubmission/ak_detail.html:48 msgid "Reso?" msgstr "Reso?" -#: AKSubmission/templates/AKSubmission/ak_detail.html:62 +#: templates/AKSubmission/ak_detail.html:62 msgid "When?" msgstr "Wann?" -#: AKSubmission/templates/AKSubmission/ak_detail.html:63 -#: AKSubmission/templates/AKSubmission/akslot_delete.html:31 +#: templates/AKSubmission/ak_detail.html:63 +#: templates/AKSubmission/akslot_delete.html:31 msgid "Duration" msgstr "Dauer" -#: AKSubmission/templates/AKSubmission/ak_detail.html:64 +#: templates/AKSubmission/ak_detail.html:64 msgid "Room" msgstr "Raum" -#: AKSubmission/templates/AKSubmission/ak_detail.html:86 +#: templates/AKSubmission/ak_detail.html:86 msgid "Add another slot" msgstr "Einen neuen AK-Slot hinzufügen" -#: AKSubmission/templates/AKSubmission/ak_edit.html:8 -#: AKSubmission/templates/AKSubmission/ak_edit.html:21 +#: templates/AKSubmission/ak_edit.html:8 templates/AKSubmission/ak_edit.html:21 msgid "Edit AK" msgstr "AK bearbeiten" -#: AKSubmission/templates/AKSubmission/ak_edit.html:16 +#: templates/AKSubmission/ak_edit.html:16 msgid "Edit" msgstr "Bearbeiten" -#: AKSubmission/templates/AKSubmission/ak_list.html:20 +#: templates/AKSubmission/ak_list.html:20 msgid "Categories" msgstr "Kategorie" -#: AKSubmission/templates/AKSubmission/ak_list_table.html:9 +#: templates/AKSubmission/ak_list_table.html:9 msgid "Name" msgstr "Name" -#: AKSubmission/templates/AKSubmission/ak_list_table.html:22 +#: templates/AKSubmission/ak_list_table.html:22 msgid "present this AK" msgstr "Diesen AK vorstellen" -#: AKSubmission/templates/AKSubmission/ak_list_table.html:25 +#: templates/AKSubmission/ak_list_table.html:25 msgid "Reso" msgstr "Reso" -#: AKSubmission/templates/AKSubmission/akowner_create_update.html:7 -#: AKSubmission/templates/AKSubmission/akowner_create_update.html:14 -#: AKSubmission/templates/AKSubmission/akowner_create_update.html:19 +#: templates/AKSubmission/akowner_create_update.html:7 +#: templates/AKSubmission/akowner_create_update.html:14 +#: templates/AKSubmission/akowner_create_update.html:19 msgid "AK Owner" msgstr "AK-Leitung" -#: AKSubmission/templates/AKSubmission/akowner_create_update.html:25 -#: AKSubmission/templates/AKSubmission/akslot_add_update.html:26 -#: AKSubmission/templates/AKSubmission/submit_new.html:34 +#: templates/AKSubmission/akowner_create_update.html:25 +#: templates/AKSubmission/akslot_add_update.html:26 +#: templates/AKSubmission/submit_new.html:34 msgid "Reset" msgstr "Zurücksetzen" -#: AKSubmission/templates/AKSubmission/akowner_create_update.html:29 -#: AKSubmission/templates/AKSubmission/akslot_add_update.html:30 -#: AKSubmission/templates/AKSubmission/akslot_delete.html:36 -#: AKSubmission/templates/AKSubmission/submit_new.html:38 +#: templates/AKSubmission/akowner_create_update.html:29 +#: templates/AKSubmission/akslot_add_update.html:30 +#: templates/AKSubmission/akslot_delete.html:36 +#: templates/AKSubmission/submit_new.html:38 msgid "Cancel" msgstr "Abbrechen" -#: AKSubmission/templates/AKSubmission/akowner_create_update.html:32 -#: AKSubmission/templates/AKSubmission/akslot_add_update.html:33 +#: templates/AKSubmission/akowner_create_update.html:32 +#: templates/AKSubmission/akslot_add_update.html:33 msgid "Continue" msgstr "Weiter" -#: 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 +#: 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 #, fuzzy #| msgid "Duration(s)" msgid "AK Duration(s)" msgstr "Dauer(n)" -#: AKSubmission/templates/AKSubmission/akslot_delete.html:25 +#: templates/AKSubmission/akslot_delete.html:25 msgid "Do you really want to delete this AK Slot?" msgstr "" -#: AKSubmission/templates/AKSubmission/akslot_delete.html:39 +#: templates/AKSubmission/akslot_delete.html:39 msgid "Confirm" msgstr "Bestätigen" -#: AKSubmission/templates/AKSubmission/submission_overview.html:19 +#: templates/AKSubmission/base_submission.html:8 +msgid "Write to organizers of this event for questions and comments" +msgstr "" + +#: templates/AKSubmission/submission_overview.html:19 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." -#: AKSubmission/templates/AKSubmission/submission_overview.html:25 -#: AKSubmission/templates/AKSubmission/submit_new_wish.html:5 -#: AKSubmission/templates/AKSubmission/submit_new_wish.html:11 -#: AKSubmission/templates/AKSubmission/submit_new_wish.html:15 +#: templates/AKSubmission/submission_overview.html:25 +#: templates/AKSubmission/submit_new_wish.html:5 +#: templates/AKSubmission/submit_new_wish.html:11 +#: templates/AKSubmission/submit_new_wish.html:15 msgid "New AK Wish" msgstr "Neuer AK-Wunsch" -#: AKSubmission/templates/AKSubmission/submission_overview.html:29 +#: templates/AKSubmission/submission_overview.html:29 msgid "Who" msgstr "Wer" -#: AKSubmission/templates/AKSubmission/submission_overview.html:32 +#: templates/AKSubmission/submission_overview.html:32 msgid "I do not own AKs yet" msgstr "Ich leite bisher keine AKs" -#: AKSubmission/templates/AKSubmission/submission_overview.html:40 -#: AKSubmission/templates/AKSubmission/submit_new.html:8 -#: AKSubmission/templates/AKSubmission/submit_new.html:21 -#: AKSubmission/templates/AKSubmission/submit_new.html:28 +#: templates/AKSubmission/submission_overview.html:40 +#: templates/AKSubmission/submit_new.html:8 +#: templates/AKSubmission/submit_new.html:21 +#: templates/AKSubmission/submit_new.html:28 msgid "New AK" msgstr "Neuer AK" -#: AKSubmission/templates/AKSubmission/submission_overview.html:46 +#: templates/AKSubmission/submission_overview.html:46 msgid "Edit Person Info" msgstr "Personen-Info bearbeiten" -#: AKSubmission/templates/AKSubmission/submission_overview.html:53 +#: templates/AKSubmission/submission_overview.html:53 msgid "Current AKs" msgstr "Aktuelle AKs" -#: AKSubmission/templates/AKSubmission/submit_new.html:41 +#: templates/AKSubmission/submit_new.html:41 msgid "Submit" msgstr "Eintragen" -#: AKSubmission/views.py:43 +#: views.py:43 msgid "Wishes" msgstr "Wünsche" -#: AKSubmission/views.py:43 +#: views.py:43 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:104 +#: views.py:104 msgid "AK successfully created" msgstr "AK erfolgreich angelegt" -#: AKSubmission/views.py:157 +#: views.py:157 msgid "AK successfully updated" msgstr "AK erfolgreich bearbeitet" -#: AKSubmission/views.py:215 +#: views.py:215 msgid "Person Info successfully updated" msgstr "Personen-Info erfolgreich bearbeitet" -#: AKSubmission/views.py:228 +#: views.py:228 msgid "No user selected" msgstr "Keine Person ausgewählt" -#: AKSubmission/views.py:254 +#: views.py:254 #, fuzzy #| msgid "AK successfully created" msgid "AK Slot successfully added" msgstr "AK erfolgreich angelegt" -#: AKSubmission/views.py:266 +#: views.py:266 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:276 +#: views.py:276 #, fuzzy #| msgid "AK successfully updated" msgid "AK Slot successfully updated" msgstr "AK erfolgreich bearbeitet" -#: AKSubmission/views.py:287 +#: 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" -#: AKSubmission/views.py:297 +#: views.py:297 #, fuzzy #| msgid "AK successfully created" msgid "AK Slot successfully deleted" diff --git a/AKSubmission/templates/AKSubmission/ak_detail.html b/AKSubmission/templates/AKSubmission/ak_detail.html index fe58e158a8de8aa7de1a2c68ebd953a8c6d5beec..c7d9b53ab75945f695188fa31347347c6dc0ed24 100644 --- a/AKSubmission/templates/AKSubmission/ak_detail.html +++ b/AKSubmission/templates/AKSubmission/ak_detail.html @@ -1,4 +1,4 @@ -{% extends 'base.html' %} +{% extends 'AKSubmission/base_submission.html' %} {% load i18n %} {% load fontawesome %} diff --git a/AKSubmission/templates/AKSubmission/ak_list.html b/AKSubmission/templates/AKSubmission/ak_list.html index 6a0be42ee433825cae2d505eb5c3e9760aaa0161..31e744eb1972c6aabf0198bfd9f18aa332b08c00 100644 --- a/AKSubmission/templates/AKSubmission/ak_list.html +++ b/AKSubmission/templates/AKSubmission/ak_list.html @@ -1,4 +1,4 @@ -{% extends 'base.html' %} +{% extends 'AKSubmission/base_submission.html' %} {% load i18n %} {% load fontawesome %} diff --git a/AKSubmission/templates/AKSubmission/akowner_create_update.html b/AKSubmission/templates/AKSubmission/akowner_create_update.html index abe2e08eddead347e255d1772dd58c3584939f9e..7ebfc25f72450f66b2498d236c70d8725118333b 100644 --- a/AKSubmission/templates/AKSubmission/akowner_create_update.html +++ b/AKSubmission/templates/AKSubmission/akowner_create_update.html @@ -1,4 +1,4 @@ -{% extends 'base.html' %} +{% extends 'AKSubmission/base_submission.html' %} {% load i18n %} {% load bootstrap4 %} diff --git a/AKSubmission/templates/AKSubmission/akslot_add_update.html b/AKSubmission/templates/AKSubmission/akslot_add_update.html index f178e0fbeef7c197e52a824b4f1b7d3ba4ff12ee..2a479dbdbce2695c8ea5613d8d0607ee5c2a20aa 100644 --- a/AKSubmission/templates/AKSubmission/akslot_add_update.html +++ b/AKSubmission/templates/AKSubmission/akslot_add_update.html @@ -1,4 +1,4 @@ -{% extends 'base.html' %} +{% extends 'AKSubmission/base_submission.html' %} {% load i18n %} {% load bootstrap4 %} diff --git a/AKSubmission/templates/AKSubmission/akslot_delete.html b/AKSubmission/templates/AKSubmission/akslot_delete.html index c5d185cdfc3694c01ea9e44735b641e328d5ef50..fb69c140127bf25251be8c952539ddfc50e4d7c8 100644 --- a/AKSubmission/templates/AKSubmission/akslot_delete.html +++ b/AKSubmission/templates/AKSubmission/akslot_delete.html @@ -1,4 +1,4 @@ -{% extends 'base.html' %} +{% extends 'AKSubmission/base_submission.html' %} {% load i18n %} {% load bootstrap4 %} diff --git a/AKSubmission/templates/AKSubmission/base_submission.html b/AKSubmission/templates/AKSubmission/base_submission.html new file mode 100644 index 0000000000000000000000000000000000000000..9d9115d0e3f424c665b834f92877523c3ae3e89f --- /dev/null +++ b/AKSubmission/templates/AKSubmission/base_submission.html @@ -0,0 +1,10 @@ +{% extends "base.html" %} + +{% load fontawesome %} +{% load i18n %} + +{% block footer_custom %} + {% if event.contact_email %} + <h4><a href="mailto://{{ event.contact_email }}">{% fontawesome_icon "envelope" %} {% trans "Write to organizers of this event for questions and comments" %}</a></h4> + {% endif %} +{% endblock %} diff --git a/AKSubmission/templates/AKSubmission/submission_overview.html b/AKSubmission/templates/AKSubmission/submission_overview.html index 5647c8df76eae791d0b2f0db21ff8f3edd0e730b..261440c7eb2faac3878590d7259b4c53c8030edc 100644 --- a/AKSubmission/templates/AKSubmission/submission_overview.html +++ b/AKSubmission/templates/AKSubmission/submission_overview.html @@ -1,4 +1,4 @@ -{% extends 'base.html' %} +{% extends 'AKSubmission/base_submission.html' %} {% load i18n %} {% load fontawesome %} diff --git a/AKSubmission/templates/AKSubmission/submit_new.html b/AKSubmission/templates/AKSubmission/submit_new.html index 8f705ce396988cbbaf3c9a356897de5d8c9ae3d4..3e0815cb17472946a41fa3ba8a41d0c37ce17c26 100644 --- a/AKSubmission/templates/AKSubmission/submit_new.html +++ b/AKSubmission/templates/AKSubmission/submit_new.html @@ -1,4 +1,4 @@ -{% extends 'base.html' %} +{% extends 'AKSubmission/base_submission.html' %} {% load i18n %} {% load bootstrap4 %} diff --git a/AKSubmission/views.py b/AKSubmission/views.py index 66ab16f5c2b67a05155f0ba4bc9bae0199a05207..99968a106f04ab0982221ef8040165987718de4e 100644 --- a/AKSubmission/views.py +++ b/AKSubmission/views.py @@ -49,7 +49,7 @@ class SubmissionOverviewView(FilterByEventSlugMixin, ListView): return context -class AKDetailView(DetailView): +class AKDetailView(EventSlugMixin, DetailView): model = AK context_object_name = "ak" template_name = "AKSubmission/ak_detail.html"