Sync commits from upstream (#3)

* Release v1.4.0

* Add missing JWT dependency

* Oops, use correct dependency

* Don't pin dep, play nice with other plugins

* Use modern widgets

* Remove django-bootstrap4

* Fix form error rendering

* Use new widget

* Improve error display

* Update translations

* Release v1.5.0

---------

Co-authored-by: Tobias Kunze <[email protected]>

pretalx_venueless/__init__.py

@@ -1 +1 @@
-__version__ = "1.3.0"
+__version__ = "1.5.0"

pretalx_venueless/forms.py

@@ -1,6 +1,7 @@
 from django import forms
 from django.utils.translation import gettext_lazy as _
 from i18nfield.forms import I18nModelForm
+from pretalx.common.forms.widgets import HtmlDateTimeInput
 
 from .models import VenuelessSettings
 
@@ -73,7 +74,7 @@ class Meta:
             "join_text",
         )
         widgets = {
-            "join_start": forms.DateTimeInput(attrs={"class": "datetimepickerfield"}),
+            "join_start": HtmlDateTimeInput,
             "secret": forms.TextInput(),
             "audience": forms.TextInput(),
             "issuer": forms.TextInput(),

pretalx_venueless/locale/ar/LC_MESSAGES/django.po

@@ -8,16 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-02-19 08:10+0000\n"
+"POT-Creation-Date: 2024-10-12 00:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
-"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
 #: local/pretalx-venueless/pretalx_venueless/apps.py:12
 msgid "Venueless integration"
@@ -29,30 +28,30 @@ msgid ""
 "releases!"
 msgstr ""
 
-#: local/pretalx-venueless/pretalx_venueless/forms.py:11
+#: local/pretalx-venueless/pretalx_venueless/forms.py:12
 #: local/pretalx-venueless/pretalx_venueless/models.py:16
 msgid ""
-"Generate a token with the trait 'world:api' in the Config -> Token Generator "
-"menu in Venueless. Leave empty to leave unchanged."
+"Generate a token with the trait 'world:api' in the Config -> Token Generator"
+" menu in Venueless. Leave empty to leave unchanged."
 msgstr ""
 
-#: local/pretalx-venueless/pretalx_venueless/forms.py:13
+#: local/pretalx-venueless/pretalx_venueless/forms.py:14
 #: local/pretalx-venueless/pretalx_venueless/models.py:18
 msgid "Venueless Token"
 msgstr ""
 
-#: local/pretalx-venueless/pretalx_venueless/forms.py:17
+#: local/pretalx-venueless/pretalx_venueless/forms.py:18
 #: local/pretalx-venueless/pretalx_venueless/models.py:23
 msgid "URL of your Venueless event"
 msgstr ""
 
-#: local/pretalx-venueless/pretalx_venueless/forms.py:18
+#: local/pretalx-venueless/pretalx_venueless/forms.py:19
 #: local/pretalx-venueless/pretalx_venueless/models.py:24
 #: local/pretalx-venueless/pretalx_venueless/models.py:40
 msgid "Venueless URL"
 msgstr ""
 
-#: local/pretalx-venueless/pretalx_venueless/forms.py:57
+#: local/pretalx-venueless/pretalx_venueless/forms.py:58
 msgid ""
 "This field is required if you want to show a join button to your speakers."
 msgstr ""
@@ -92,7 +91,7 @@ msgid "Introductory text"
 msgstr ""
 
 #: local/pretalx-venueless/pretalx_venueless/signals.py:35
-#: local/pretalx-venueless/pretalx_venueless/templates/pretalx_venueless/settings.html:31
+#: local/pretalx-venueless/pretalx_venueless/templates/pretalx_venueless/settings.html:23
 msgid "Venueless"
 msgstr ""
 
@@ -111,55 +110,56 @@ msgid ""
 "starts."
 msgstr ""
 
-#: local/pretalx-venueless/pretalx_venueless/templates/pretalx_venueless/settings.html:21
+#: local/pretalx-venueless/pretalx_venueless/templates/pretalx_venueless/settings.html:13
 msgid "Confirm your Venueless connection"
 msgstr ""
 
-#: local/pretalx-venueless/pretalx_venueless/templates/pretalx_venueless/settings.html:24
+#: local/pretalx-venueless/pretalx_venueless/templates/pretalx_venueless/settings.html:16
 msgid ""
 "<b>Venueless</b> is asking to connect to your pretalx event. If you confirm "
 "this connection, pretalx will notify Venueless about all schedule changes."
 msgstr ""
 
-#: local/pretalx-venueless/pretalx_venueless/templates/pretalx_venueless/settings.html:35
+#: local/pretalx-venueless/pretalx_venueless/templates/pretalx_venueless/settings.html:27
 #, python-format
 msgid ""
 "Successfully connected to venueless. Data was last pushed on %(last_push)s."
 msgstr ""
 
-#: local/pretalx-venueless/pretalx_venueless/templates/pretalx_venueless/settings.html:42
+#: local/pretalx-venueless/pretalx_venueless/templates/pretalx_venueless/settings.html:34
 msgid ""
-"Setting up the connection with Venueless will configure the pretalx settings "
-"in Venueless, and will automatically push schedule changes to venueless "
-"users. Please use Venueless to begin this process. Go to <b>Config → Event</"
-"b> in Venueless, and enter the following settings to create the connection:"
+"Setting up the connection with Venueless will configure the pretalx settings"
+" in Venueless, and will automatically push schedule changes to venueless "
+"users. Please use Venueless to begin this process. Go to <b>Config → "
+"Event</b> in Venueless, and enter the following settings to create the "
+"connection:"
 msgstr ""
 
-#: local/pretalx-venueless/pretalx_venueless/templates/pretalx_venueless/settings.html:61
+#: local/pretalx-venueless/pretalx_venueless/templates/pretalx_venueless/settings.html:53
 msgid "Main settings"
 msgstr ""
 
-#: local/pretalx-venueless/pretalx_venueless/templates/pretalx_venueless/settings.html:63
+#: local/pretalx-venueless/pretalx_venueless/templates/pretalx_venueless/settings.html:55
 msgid ""
 "These settings will get filled in automatically when you set up your event "
 "with venueless. Please follow the instructions at the top of this page!"
 msgstr ""
 
-#: local/pretalx-venueless/pretalx_venueless/templates/pretalx_venueless/settings.html:76
+#: local/pretalx-venueless/pretalx_venueless/templates/pretalx_venueless/settings.html:68
 msgid "Join link settings"
 msgstr ""
 
-#: local/pretalx-venueless/pretalx_venueless/templates/pretalx_venueless/settings.html:78
+#: local/pretalx-venueless/pretalx_venueless/templates/pretalx_venueless/settings.html:70
 msgid ""
-"These settings are only required if you want to distribute the sign-up links "
-"to venueless for your speakers by way of pretalx."
+"These settings are only required if you want to distribute the sign-up links"
+" to venueless for your speakers by way of pretalx."
 msgstr ""
 
-#: local/pretalx-venueless/pretalx_venueless/templates/pretalx_venueless/settings.html:103
+#: local/pretalx-venueless/pretalx_venueless/templates/pretalx_venueless/settings.html:95
 msgid "Connect"
 msgstr ""
 
-#: local/pretalx-venueless/pretalx_venueless/templates/pretalx_venueless/settings.html:105
+#: local/pretalx-venueless/pretalx_venueless/templates/pretalx_venueless/settings.html:97
 msgid "Save"
 msgstr ""
 

pretalx_venueless/locale/ca/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-02-19 08:10+0000\n"
+"POT-Creation-Date: 2024-10-12 00:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -28,30 +28,30 @@ msgid ""
 "releases!"
 msgstr ""
 
-#: local/pretalx-venueless/pretalx_venueless/forms.py:11
+#: local/pretalx-venueless/pretalx_venueless/forms.py:12
 #: local/pretalx-venueless/pretalx_venueless/models.py:16
 msgid ""
-"Generate a token with the trait 'world:api' in the Config -> Token Generator "
-"menu in Venueless. Leave empty to leave unchanged."
+"Generate a token with the trait 'world:api' in the Config -> Token Generator"
+" menu in Venueless. Leave empty to leave unchanged."
 msgstr ""
 
-#: local/pretalx-venueless/pretalx_venueless/forms.py:13
+#: local/pretalx-venueless/pretalx_venueless/forms.py:14
 #: local/pretalx-venueless/pretalx_venueless/models.py:18
 msgid "Venueless Token"
 msgstr ""
 
-#: local/pretalx-venueless/pretalx_venueless/forms.py:17
+#: local/pretalx-venueless/pretalx_venueless/forms.py:18
 #: local/pretalx-venueless/pretalx_venueless/models.py:23
 msgid "URL of your Venueless event"
 msgstr ""
 
-#: local/pretalx-venueless/pretalx_venueless/forms.py:18
+#: local/pretalx-venueless/pretalx_venueless/forms.py:19
 #: local/pretalx-venueless/pretalx_venueless/models.py:24
 #: local/pretalx-venueless/pretalx_venueless/models.py:40
 msgid "Venueless URL"
 msgstr ""
 
-#: local/pretalx-venueless/pretalx_venueless/forms.py:57
+#: local/pretalx-venueless/pretalx_venueless/forms.py:58
 msgid ""
 "This field is required if you want to show a join button to your speakers."
 msgstr ""
@@ -91,7 +91,7 @@ msgid "Introductory text"
 msgstr ""
 
 #: local/pretalx-venueless/pretalx_venueless/signals.py:35
-#: local/pretalx-venueless/pretalx_venueless/templates/pretalx_venueless/settings.html:31
+#: local/pretalx-venueless/pretalx_venueless/templates/pretalx_venueless/settings.html:23
 msgid "Venueless"
 msgstr ""
 
@@ -110,55 +110,56 @@ msgid ""
 "starts."
 msgstr ""
 
-#: local/pretalx-venueless/pretalx_venueless/templates/pretalx_venueless/settings.html:21
+#: local/pretalx-venueless/pretalx_venueless/templates/pretalx_venueless/settings.html:13
 msgid "Confirm your Venueless connection"
 msgstr ""
 
-#: local/pretalx-venueless/pretalx_venueless/templates/pretalx_venueless/settings.html:24
+#: local/pretalx-venueless/pretalx_venueless/templates/pretalx_venueless/settings.html:16
 msgid ""
 "<b>Venueless</b> is asking to connect to your pretalx event. If you confirm "
 "this connection, pretalx will notify Venueless about all schedule changes."
 msgstr ""
 
-#: local/pretalx-venueless/pretalx_venueless/templates/pretalx_venueless/settings.html:35
+#: local/pretalx-venueless/pretalx_venueless/templates/pretalx_venueless/settings.html:27
 #, python-format
 msgid ""
 "Successfully connected to venueless. Data was last pushed on %(last_push)s."
 msgstr ""
 
-#: local/pretalx-venueless/pretalx_venueless/templates/pretalx_venueless/settings.html:42
+#: local/pretalx-venueless/pretalx_venueless/templates/pretalx_venueless/settings.html:34
 msgid ""
-"Setting up the connection with Venueless will configure the pretalx settings "
-"in Venueless, and will automatically push schedule changes to venueless "
-"users. Please use Venueless to begin this process. Go to <b>Config → Event</"
-"b> in Venueless, and enter the following settings to create the connection:"
+"Setting up the connection with Venueless will configure the pretalx settings"
+" in Venueless, and will automatically push schedule changes to venueless "
+"users. Please use Venueless to begin this process. Go to <b>Config → "
+"Event</b> in Venueless, and enter the following settings to create the "
+"connection:"
 msgstr ""
 
-#: local/pretalx-venueless/pretalx_venueless/templates/pretalx_venueless/settings.html:61
+#: local/pretalx-venueless/pretalx_venueless/templates/pretalx_venueless/settings.html:53
 msgid "Main settings"
 msgstr ""
 
-#: local/pretalx-venueless/pretalx_venueless/templates/pretalx_venueless/settings.html:63
+#: local/pretalx-venueless/pretalx_venueless/templates/pretalx_venueless/settings.html:55
 msgid ""
 "These settings will get filled in automatically when you set up your event "
 "with venueless. Please follow the instructions at the top of this page!"
 msgstr ""
 
-#: local/pretalx-venueless/pretalx_venueless/templates/pretalx_venueless/settings.html:76
+#: local/pretalx-venueless/pretalx_venueless/templates/pretalx_venueless/settings.html:68
 msgid "Join link settings"
 msgstr ""
 
-#: local/pretalx-venueless/pretalx_venueless/templates/pretalx_venueless/settings.html:78
+#: local/pretalx-venueless/pretalx_venueless/templates/pretalx_venueless/settings.html:70
 msgid ""
-"These settings are only required if you want to distribute the sign-up links "
-"to venueless for your speakers by way of pretalx."
+"These settings are only required if you want to distribute the sign-up links"
+" to venueless for your speakers by way of pretalx."
 msgstr ""
 
-#: local/pretalx-venueless/pretalx_venueless/templates/pretalx_venueless/settings.html:103
+#: local/pretalx-venueless/pretalx_venueless/templates/pretalx_venueless/settings.html:95
 msgid "Connect"
 msgstr ""
 
-#: local/pretalx-venueless/pretalx_venueless/templates/pretalx_venueless/settings.html:105
+#: local/pretalx-venueless/pretalx_venueless/templates/pretalx_venueless/settings.html:97
 msgid "Save"
 msgstr ""