Skip to content
Snippets Groups Projects
Commit ddc0ffe3 authored by Nadja Geisler's avatar Nadja Geisler :sunny:
Browse files

Merge branch 'master' of gitlab.fachschaften.org:kif/akplanning

parents 98e40f74 65fa1f13
No related branches found
No related tags found
No related merge requests found
......@@ -108,7 +108,7 @@ class AKEditForm(AKForm):
class AKWishForm(AKSubmissionForm):
class Meta(AKForm.Meta):
exclude = ['owners']
exclude = ['owners', 'link']
class AKOwnerForm(forms.ModelForm):
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-10-24 23:21+0000\n"
"POT-Creation-Date: 2019-10-25 00:53+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:39
#: forms.py:40
msgid "Separate multiple tags with semicolon"
msgstr "Mehrere Tags mit Semikolon trennen"
#: forms.py:60
#: forms.py:61
#, python-format
msgid "\"%(duration)s\" is not a valid duration"
msgstr "\"%(duration)s\" ist keine gültige Dauer"
#: forms.py:94
#: forms.py:95
msgid "Duration(s)"
msgstr "Dauer(n)"
#: forms.py:95
#: forms.py:96
msgid ""
"Enter at least one planned duration (in hours). If your AK should have "
"multiple slots, use multiple lines"
......@@ -39,58 +39,72 @@ msgstr ""
"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:14
#: templates/AKSubmission/akowner_create_update.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"
#: templates/AKSubmission/ak_detail.html:8
#, fuzzy
#| msgid "AKs"
msgid "AK"
msgstr "AKs"
#: templates/AKSubmission/ak_detail.html:13
#: templates/AKSubmission/ak_detail.html:18
#: templates/AKSubmission/ak_edit.html:14 templates/AKSubmission/ak_list.html:8
#: 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/submission_overview.html:6
#: templates/AKSubmission/submission_overview.html:11
#: templates/AKSubmission/submission_overview.html:15
#: templates/AKSubmission/submit_new.html:19
#: templates/AKSubmission/submit_new_wish.html:10
msgid "AK Submission"
msgstr "AK-Eintragung"
#: templates/AKSubmission/ak_detail.html:29
#: templates/AKSubmission/ak_detail.html:27
#: templates/AKSubmission/ak_list_table.html:30
msgid "AK Wish"
msgstr "AK-Wunsch"
#: templates/AKSubmission/ak_detail.html:32
#: templates/AKSubmission/ak_detail.html:30
#: templates/AKSubmission/ak_list_table.html:10
msgid "Who?"
msgstr "Wer?"
#: templates/AKSubmission/ak_detail.html:34
#: templates/AKSubmission/ak_detail.html:32
#: templates/AKSubmission/ak_list_table.html:11
msgid "Category"
msgstr "Kategorie"
#: templates/AKSubmission/ak_detail.html:40
#: templates/AKSubmission/ak_detail.html:38
msgid "Present this AK"
msgstr "Diesen AK vorstellen"
#: templates/AKSubmission/ak_detail.html:44
#: templates/AKSubmission/ak_detail.html:42
#: templates/AKSubmission/ak_list.html:26
#: templates/AKSubmission/ak_list_table.html:12
msgid "Tags"
msgstr "Tags"
#: templates/AKSubmission/ak_detail.html:50
#: templates/AKSubmission/ak_detail.html:48
msgid "Reso?"
msgstr "Reso?"
#: templates/AKSubmission/ak_detail.html:62
#: templates/AKSubmission/ak_detail.html:60
msgid "When?"
msgstr "Wann?"
#: templates/AKSubmission/ak_detail.html:63
#: templates/AKSubmission/ak_detail.html:61
msgid "Duration"
msgstr "Dauer"
#: templates/AKSubmission/ak_detail.html:64
#: templates/AKSubmission/ak_detail.html:62
msgid "Room"
msgstr "Raum"
......@@ -102,10 +116,6 @@ msgstr "AK bearbeiten"
msgid "Edit"
msgstr "Bearbeiten"
#: templates/AKSubmission/ak_list.html:14
msgid "AKs"
msgstr "AKs"
#: templates/AKSubmission/ak_list.html:20
msgid "Categories"
msgstr "Kategorie"
......@@ -123,6 +133,7 @@ msgid "Reso"
msgstr "Reso"
#: 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"
......@@ -138,9 +149,8 @@ msgid "Cancel"
msgstr "Abbrechen"
#: templates/AKSubmission/akowner_create_update.html:32
#: templates/AKSubmission/submit_new.html:41
msgid "Submit"
msgstr "Eintragen"
msgid "Continue"
msgstr "Weiter"
#: templates/AKSubmission/submission_overview.html:19
msgid ""
......@@ -179,6 +189,10 @@ msgstr "Personen-Info bearbeiten"
msgid "Current AKs"
msgstr "Aktuelle AKs"
#: templates/AKSubmission/submit_new.html:41
msgid "Submit"
msgstr "Eintragen"
#: views.py:44
msgid "Wishes"
msgstr "Wünsche"
......
......@@ -5,7 +5,7 @@
{% load tags_AKSubmission %}
{% block title %}{{ ak.event.slug }} - {% trans "AK Submission" %} - {{ ak.slug }}{% endblock %}
{% block title %}{% trans "AKs" %}: {{ ak.event.name }} - {% trans "AK" %}: {{ ak.name }}{% endblock %}
{% block breadcrumbs %}
<li class="breadcrumb-item"><a href="#">AKPlanning</a></li>
......@@ -15,8 +15,6 @@
{% endblock %}
{% block content %}
<h1 style="margin-bottom: 30px;">{{ ak.event.name }}: {% trans "AK Submission" %}</h1>
{% include "AKSubmission/messages.html" %}
<div class="float-right">
......
......@@ -5,14 +5,14 @@
{% load fontawesome %}
{% load staticfiles %}
{% block title %}{{ event.slug }} - {% trans "Edit AK" %}{% endblock %}
{% block title %}{% trans "AKs" %}: {{ event.name }} - {% trans "Edit AK" %}: {{ ak.name }}{% endblock %}
{% block breadcrumbs %}
<li class="breadcrumb-item"><a href="#">AKPlanning</a></li>
<li class="breadcrumb-item"><a href="#">{{ event.slug }}</a></li>
<li class="breadcrumb-item"><a
href="{% url 'submit:submission_overview' event_slug=event.slug %}">{% trans "AK Submission" %}</a></li>
<li class="breadcrumb-item"><a href="#">{{ ak.short_name }}</a></li>
<li class="breadcrumb-item"><a href="{% url 'submit:ak_detail' event_slug=event.slug pk=ak.pk %}">{{ ak.short_name }}</a></li>
<li class="breadcrumb-item active">{% trans "Edit" %}</li>
{% endblock %}
......
......@@ -5,7 +5,7 @@
{% load tags_AKSubmission %}
{% block title %}{{ event.slug }} - {% trans "AK Submission" %}{% endblock %}
{% block title %}{% trans "AKs" %}: {{ event.name }} - {% trans "AKs" %}{% endblock %}
{% block breadcrumbs %}
<li class="breadcrumb-item"><a href="#">AKPlanning</a></li>
......
......@@ -4,14 +4,14 @@
{% load bootstrap4 %}
{% load fontawesome %}
{% block title %}{{ event.slug }} - {% trans "AK Owner" %}{% endblock %}
{% block title %}{% trans "AKs" %}: {{ event.name }} - {% trans "AK Owner" %}{% endblock %}
{% block breadcrumbs %}
<li class="breadcrumb-item"><a href="#">AKPlanning</a></li>
<li class="breadcrumb-item"><a href="#">{{ event.slug }}</a></li>
<li class="breadcrumb-item"><a
href="{% url 'submit:submission_overview' event_slug=event.slug %}">{% trans "AK Submission" %}</a></li>
<li class="breadcrumb-item active">{{ owner.slug }}</li>
<li class="breadcrumb-item active">{% trans "AK Owner" %}</li>
{% endblock %}
{% block content %}
......@@ -29,7 +29,7 @@
{% fontawesome_icon "times" %} {% trans "Cancel" %}
</a>
<button type="submit" class="save btn btn-primary float-right">
{% fontawesome_icon "check" %} {% trans "Submit" %}
{% fontawesome_icon "check" %} {% trans "Continue" %}
</button>
{% endbuttons %}
</form>
......
......@@ -3,7 +3,7 @@
{% load i18n %}
{% load fontawesome %}
{% block title %}{{ event.slug }} - {% trans "AK Submission" %}{% endblock %}
{% block title %}{% trans "AKs" %}: {{ event.name }} - {% trans "AK Submission" %}{% endblock %}
{% block breadcrumbs %}
<li class="breadcrumb-item"><a href="#">AKPlanning</a></li>
......@@ -12,7 +12,7 @@
{% endblock %}
{% block content %}
<h1>{{ event.name }}: {% trans "AK Submission" %}</h1>
<h1>{% trans "AKs" %}: {{ event.name }}</h1>
{% include "AKSubmission/messages.html" %}
......
......@@ -5,7 +5,7 @@
{% load fontawesome %}
{% load staticfiles %}
{% block title %}{{ event.slug }} - {% trans "New AK" %}{% endblock %}
{% block title %}{% trans "AKs" %}: {{ event.name }} - {% trans "New AK" %}{% endblock %}
{% block imports %}
<link rel="stylesheet" href="{% static 'common/vendor/chosen-js/chosen.css' %}">
......
......@@ -2,12 +2,12 @@
{% load i18n %}
{% block title %}{{ event.slug }} - {% trans "New AK Wish" %}{% endblock %}
{% block title %}{% trans "AKs" %}: {{ event.name }} - {% trans "New AK Wish" %}{% endblock %}
{% block breadcrumbs %}
<li class="breadcrumb-item"><a href="#">AKPlanning</a></li>
<li class="breadcrumb-item"><a href="#">{{ event.slug }}</a></li>
<li class="breadcrumb-item"><a href="#">{% trans "AK Submission" %}</a></li>
<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 "New AK Wish" %}</li>
{% endblock %}
......
......@@ -142,6 +142,11 @@ class AKWishSubmissionView(AKAndAKWishSubmissionView):
template_name = 'AKSubmission/submit_new_wish.html'
form_class = AKWishForm
def get_initial(self):
initials = super(AKAndAKWishSubmissionView, self).get_initial()
initials['event'] = self.event
return initials
class AKEditView(EventSlugMixin, UpdateView):
model = AK
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment