Merge branch 'master' into 'feature-requirements-overview'

# Conflicts:
#   locale/de_DE/LC_MESSAGES/django.po

AKSubmission/forms.py

 import itertools
+import re
 
 from django import forms
 from django.core.exceptions import ValidationError
@@ -10,6 +11,7 @@ from AKModel.models import AK, AKOwner, AKCategory, AKRequirement, AKSlot
 
 class AKForm(AvailabilitiesFormMixin, forms.ModelForm):
     required_css_class = 'required'
+    split_string = re.compile('[,;]')
 
     class Meta:
         model = AK
@@ -42,7 +44,7 @@ class AKForm(AvailabilitiesFormMixin, forms.ModelForm):
         self.fields["conflicts"].widget.attrs = {'class': 'chosen-select'}
         self.fields["prerequisites"].widget.attrs = {'class': 'chosen-select'}
 
-        help_tags_addition = _('Separate multiple tags with semicolon')
+        help_tags_addition = _('Separate multiple tags with comma or semicolon')
 
         # Add text fields for tags
         self.fields["tags_raw"] = forms.CharField(
@@ -98,7 +100,9 @@ class AKForm(AvailabilitiesFormMixin, forms.ModelForm):
             cleaned_data["short_name"] = short_name
 
         # Get tag names from raw tags
-        cleaned_data["tag_names"] = [name.strip().lower() for name in cleaned_data["tags_raw"].split(";")]
+        cleaned_data["tag_names"] = [name.strip().lower() for name
+                                     in self.split_string.split(cleaned_data["tags_raw"])
+                                     if name.strip() != '']
 
         # Get durations from raw durations field
         if "durations" in cleaned_data:

AKSubmission/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: 2020-05-19 20:46+0000\n"
+"POT-Creation-Date: 2020-05-20 12:18+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:45
-msgid "Separate multiple tags with semicolon"
-msgstr "Mehrere Tags mit Semikolon trennen"
+#: AKSubmission/forms.py:47
+msgid "Separate multiple tags with comma or semicolon"
+msgstr "Mehrere Tags mit Komma oder Semikolon trennen"
 
-#: AKSubmission/forms.py:75
+#: AKSubmission/forms.py:77
 #, python-format
 msgid "\"%(duration)s\" is not a valid duration"
 msgstr "\"%(duration)s\" ist keine gültige Dauer"
 
-#: AKSubmission/forms.py:118
+#: AKSubmission/forms.py:122
 msgid "Duration(s)"
 msgstr "Dauer(n)"
 
-#: AKSubmission/forms.py:120
+#: AKSubmission/forms.py:124
 msgid ""
 "Enter at least one planned duration (in hours). If your AK should have "
 "multiple slots, use multiple lines"

locale/de_DE/LC_MESSAGES/django.po

@@ -55,6 +55,6 @@ msgstr "Wirklich jetzt die Sprache ändern? Das wird das Formular zurücksetzen!
 msgid "Impress"
 msgstr "Impressum"
 
-#: templates/base.html:100
+#: templates/base.html:102
 msgid "This software is open source"
 msgstr "Diese Software ist Open Source"