Review notes and adjust some margins

It is a question, so it needs to end with a question mark.

.clabot

@@ -1,5 +1,5 @@
 {
   "contributors": "https://crm.rami.io/cla/check/?project=pretix&checkContributor=",
-  "message": "Hey there! :) Thank you very much for offering a contribution to pretix! For legal reasons, we need you to sign a Contributor License Agreement in order to be able to merge the code. Sorry for the hassle :( Please download the agreement from https://pretix.eu/about/en/cla and send a signed copy to support@pretix.eu. Feel free to also contact us there or via comments here if you have any questions!",
+  "message": "Hey there! :) Thank you very much for offering a contribution to pretix! For legal reasons, we need you to sign a Contributor License Agreement in order to be able to merge the code. Sorry for the hassle :( Please download the agreement from https://pretix.eu/about/en/cla and send a signed copy to support@pretix.eu. Feel free to also contact us there or via comments here if you have any questions!\n\nFeel free to ignore me on documentation changes, translations, and trivial PRs like typo fixes (and similar single-line changes) – we can merge these without a CLA as well.",
   "label": "cla-signed"
 }

src/pretix/base/payment.py

@@ -330,18 +330,18 @@ class BasePaymentProvider:
                  label=_('Enable payment method'),
                  required=False,
              )),
-            ('_availability_date',
-             RelativeDateField(
-                 label=_('Available until'),
-                 help_text=_('Users will not be able to choose this payment provider after the given date.'),
-                 required=False,
-             )),
             ('_availability_start',
              RelativeDateField(
                  label=_('Available from'),
                  help_text=_('Users will not be able to choose this payment provider before the given date.'),
                  required=False,
              )),
+            ('_availability_date',
+             RelativeDateField(
+                 label=_('Available until'),
+                 help_text=_('Users will not be able to choose this payment provider after the given date.'),
+                 required=False,
+             )),
             ('_total_min',
              forms.DecimalField(
                  label=_('Minimum order total'),

src/pretix/base/settings.py

@@ -2987,7 +2987,7 @@ Your {organizer} team"""))  # noqa: W291
             help_text=_('This picture will be used as a preview if you post links to your ticket shop on social media. '
                         'Facebook advises to use a picture size of 1200 x 630 pixels, however some platforms like '
                         'WhatsApp and Reddit only show a square preview, so we recommend to make sure it still looks good '
-                        'only the center square is shown. If you do not fill this, we will use the logo given above.')
+                        'if only the center square is shown. If you do not fill this, we will use the logo given above.')
         ),
         'serializer_class': UploadedFileField,
         'serializer_kwargs': dict(
@@ -3291,6 +3291,8 @@ Your {organizer} team"""))  # noqa: W291
             label=_('Validity of gift card codes in years'),
             help_text=_('If you set a number here, gift cards will by default expire at the end of the year after this '
                         'many years. If you keep it empty, gift cards do not have an explicit expiry date.'),
+            min_value=0,
+            max_value=99,
         )
     },
     'cookie_consent': {

src/pretix/control/templates/pretixcontrol/checkin/bulk_revert_confirm.html

@@ -13,7 +13,7 @@
         {% endfor %}
 		<p>
             {% blocktrans trimmed count count=cnt %}
-                Are you sure you want to permanently delete the check-ins of <strong>one ticket</strong>.
+                Are you sure you want to permanently delete the check-ins of <strong>one ticket</strong>?
             {% plural %}
                 Are you sure you want to permanently delete the check-ins of <strong>{{ count }} tickets</strong>?
             {% endblocktrans %}

src/pretix/control/views/pdf.py

@@ -104,9 +104,26 @@ class BaseEditorView(EventPermissionRequiredMixin, TemplateView):
 
         scheme = PERSON_NAME_SCHEMES[self.request.event.settings.name_scheme]
         sample = {k: str(v) for k, v in scheme['sample'].items()}
-        p = order.positions.create(item=item, attendee_name_parts=sample, price=item.default_price)
-        order.positions.create(item=item2, attendee_name_parts=sample, price=item.default_price, addon_to=p)
-        order.positions.create(item=item2, attendee_name_parts=sample, price=item.default_price, addon_to=p)
+        p = order.positions.create(
+            item=item,
+            attendee_name_parts=sample,
+            company=_("Sample company"),
+            price=item.default_price
+        )
+        order.positions.create(
+            item=item2,
+            attendee_name_parts=sample,
+            company=_("Sample company"),
+            price=item.default_price,
+            addon_to=p
+        )
+        order.positions.create(
+            item=item2,
+            attendee_name_parts=sample,
+            company=_("Sample company"),
+            price=item.default_price,
+            addon_to=p
+        )
 
         InvoiceAddress.objects.create(order=order, name_parts=sample, company=_("Sample company"))
         return p

src/pretix/locale/ang/LC_MESSAGES/django.po

@@ -10260,7 +10260,7 @@ msgid ""
 "This picture will be used as a preview if you post links to your ticket shop "
 "on social media. Facebook advises to use a picture size of 1200 x 630 "
 "pixels, however some platforms like WhatsApp and Reddit only show a square "
-"preview, so we recommend to make sure it still looks good only the center "
+"preview, so we recommend to make sure it still looks good if only the center "
 "square is shown. If you do not fill this, we will use the logo given above."
 msgstr ""
 

src/pretix/locale/ar/LC_MESSAGES/django.po

@@ -11933,7 +11933,7 @@ msgid ""
 "This picture will be used as a preview if you post links to your ticket shop "
 "on social media. Facebook advises to use a picture size of 1200 x 630 "
 "pixels, however some platforms like WhatsApp and Reddit only show a square "
-"preview, so we recommend to make sure it still looks good only the center "
+"preview, so we recommend to make sure it still looks good if only the center "
 "square is shown. If you do not fill this, we will use the logo given above."
 msgstr ""
 "سيتم استخدام هذه الصورة كمعاينة إذا قمت بنشر روابط لمتجر التذاكر الخاص بك "

src/pretix/locale/az/LC_MESSAGES/django.po

@@ -10262,7 +10262,7 @@ msgid ""
 "This picture will be used as a preview if you post links to your ticket shop "
 "on social media. Facebook advises to use a picture size of 1200 x 630 "
 "pixels, however some platforms like WhatsApp and Reddit only show a square "
-"preview, so we recommend to make sure it still looks good only the center "
+"preview, so we recommend to make sure it still looks good if only the center "
 "square is shown. If you do not fill this, we will use the logo given above."
 msgstr ""
 

src/pretix/locale/ca/LC_MESSAGES/django.po

@@ -12016,7 +12016,7 @@ msgid ""
 "This picture will be used as a preview if you post links to your ticket shop "
 "on social media. Facebook advises to use a picture size of 1200 x 630 "
 "pixels, however some platforms like WhatsApp and Reddit only show a square "
-"preview, so we recommend to make sure it still looks good only the center "
+"preview, so we recommend to make sure it still looks good if only the center "
 "square is shown. If you do not fill this, we will use the logo given above."
 msgstr ""
 

src/pretix/locale/cs/LC_MESSAGES/django.po

@@ -11422,7 +11422,7 @@ msgid ""
 "This picture will be used as a preview if you post links to your ticket shop "
 "on social media. Facebook advises to use a picture size of 1200 x 630 "
 "pixels, however some platforms like WhatsApp and Reddit only show a square "
-"preview, so we recommend to make sure it still looks good only the center "
+"preview, so we recommend to make sure it still looks good if only the center "
 "square is shown. If you do not fill this, we will use the logo given above."
 msgstr ""
 "Tento obrázek bude použit jako náhled, pokud na sociálních sítích zveřejníte "

src/pretix/locale/cy/LC_MESSAGES/django.po

@@ -10279,7 +10279,7 @@ msgid ""
 "This picture will be used as a preview if you post links to your ticket shop "
 "on social media. Facebook advises to use a picture size of 1200 x 630 "
 "pixels, however some platforms like WhatsApp and Reddit only show a square "
-"preview, so we recommend to make sure it still looks good only the center "
+"preview, so we recommend to make sure it still looks good if only the center "
 "square is shown. If you do not fill this, we will use the logo given above."
 msgstr ""
 

src/pretix/locale/da/LC_MESSAGES/django.po

@@ -11447,7 +11447,7 @@ msgid ""
 "This picture will be used as a preview if you post links to your ticket shop "
 "on social media. Facebook advises to use a picture size of 1200 x 630 "
 "pixels, however some platforms like WhatsApp and Reddit only show a square "
-"preview, so we recommend to make sure it still looks good only the center "
+"preview, so we recommend to make sure it still looks good if only the center "
 "square is shown. If you do not fill this, we will use the logo given above."
 msgstr ""
 

src/pretix/locale/de/LC_MESSAGES/django.po

@@ -11764,7 +11764,7 @@ msgid ""
 "This picture will be used as a preview if you post links to your ticket shop "
 "on social media. Facebook advises to use a picture size of 1200 x 630 "
 "pixels, however some platforms like WhatsApp and Reddit only show a square "
-"preview, so we recommend to make sure it still looks good only the center "
+"preview, so we recommend to make sure it still looks good if only the center "
 "square is shown. If you do not fill this, we will use the logo given above."
 msgstr ""
 "Dieses Bild wird als Vorschau in sozialen Medien verwendet, wenn Sie den "

src/pretix/locale/de_Informal/LC_MESSAGES/django.po

@@ -11744,7 +11744,7 @@ msgid ""
 "This picture will be used as a preview if you post links to your ticket shop "
 "on social media. Facebook advises to use a picture size of 1200 x 630 "
 "pixels, however some platforms like WhatsApp and Reddit only show a square "
-"preview, so we recommend to make sure it still looks good only the center "
+"preview, so we recommend to make sure it still looks good if only the center "
 "square is shown. If you do not fill this, we will use the logo given above."
 msgstr ""
 "Dieses Bild wird als Vorschau in sozialen Medien verwendet, wenn du den "

src/pretix/locale/django.pot

@@ -10261,7 +10261,7 @@ msgid ""
 "This picture will be used as a preview if you post links to your ticket shop "
 "on social media. Facebook advises to use a picture size of 1200 x 630 "
 "pixels, however some platforms like WhatsApp and Reddit only show a square "
-"preview, so we recommend to make sure it still looks good only the center "
+"preview, so we recommend to make sure it still looks good if only the center "
 "square is shown. If you do not fill this, we will use the logo given above."
 msgstr ""
 

src/pretix/locale/el/LC_MESSAGES/django.po

@@ -12421,7 +12421,7 @@ msgid ""
 "This picture will be used as a preview if you post links to your ticket shop "
 "on social media. Facebook advises to use a picture size of 1200 x 630 "
 "pixels, however some platforms like WhatsApp and Reddit only show a square "
-"preview, so we recommend to make sure it still looks good only the center "
+"preview, so we recommend to make sure it still looks good if only the center "
 "square is shown. If you do not fill this, we will use the logo given above."
 msgstr ""
 

src/pretix/locale/enm/LC_MESSAGES/django.po

@@ -10260,7 +10260,7 @@ msgid ""
 "This picture will be used as a preview if you post links to your ticket shop "
 "on social media. Facebook advises to use a picture size of 1200 x 630 "
 "pixels, however some platforms like WhatsApp and Reddit only show a square "
-"preview, so we recommend to make sure it still looks good only the center "
+"preview, so we recommend to make sure it still looks good if only the center "
 "square is shown. If you do not fill this, we will use the logo given above."
 msgstr ""
 

src/pretix/locale/es/LC_MESSAGES/django.po

@@ -11738,7 +11738,7 @@ msgid ""
 "This picture will be used as a preview if you post links to your ticket shop "
 "on social media. Facebook advises to use a picture size of 1200 x 630 "
 "pixels, however some platforms like WhatsApp and Reddit only show a square "
-"preview, so we recommend to make sure it still looks good only the center "
+"preview, so we recommend to make sure it still looks good if only the center "
 "square is shown. If you do not fill this, we will use the logo given above."
 msgstr ""
 "Esta imagen se utilizará como vista previa si publica enlaces a su taquilla "

src/pretix/locale/et/LC_MESSAGES/django.po

@@ -10262,7 +10262,7 @@ msgid ""
 "This picture will be used as a preview if you post links to your ticket shop "
 "on social media. Facebook advises to use a picture size of 1200 x 630 "
 "pixels, however some platforms like WhatsApp and Reddit only show a square "
-"preview, so we recommend to make sure it still looks good only the center "
+"preview, so we recommend to make sure it still looks good if only the center "
 "square is shown. If you do not fill this, we will use the logo given above."
 msgstr ""
 

src/pretix/locale/eu/LC_MESSAGES/django.po

@@ -11632,7 +11632,7 @@ msgid ""
 "This picture will be used as a preview if you post links to your ticket shop "
 "on social media. Facebook advises to use a picture size of 1200 x 630 "
 "pixels, however some platforms like WhatsApp and Reddit only show a square "
-"preview, so we recommend to make sure it still looks good only the center "
+"preview, so we recommend to make sure it still looks good if only the center "
 "square is shown. If you do not fill this, we will use the logo given above."
 msgstr ""
 "Irudi hau aurrebistako erabiliko da zure sarrera-dendako estekak sare "

src/pretix/locale/fi/LC_MESSAGES/django.po

@@ -11536,7 +11536,7 @@ msgid ""
 "This picture will be used as a preview if you post links to your ticket shop "
 "on social media. Facebook advises to use a picture size of 1200 x 630 "
 "pixels, however some platforms like WhatsApp and Reddit only show a square "
-"preview, so we recommend to make sure it still looks good only the center "
+"preview, so we recommend to make sure it still looks good if only the center "
 "square is shown. If you do not fill this, we will use the logo given above."
 msgstr ""
 "Tätä kuvaa käytetään esikatseluna, jos julkaiset linkkejä lippukauppaasi "

src/pretix/locale/fo/LC_MESSAGES/django.po

@@ -10281,7 +10281,7 @@ msgid ""
 "This picture will be used as a preview if you post links to your ticket shop "
 "on social media. Facebook advises to use a picture size of 1200 x 630 "
 "pixels, however some platforms like WhatsApp and Reddit only show a square "
-"preview, so we recommend to make sure it still looks good only the center "
+"preview, so we recommend to make sure it still looks good if only the center "
 "square is shown. If you do not fill this, we will use the logo given above."
 msgstr ""
 

src/pretix/locale/fr/LC_MESSAGES/django.po

@@ -11861,7 +11861,7 @@ msgid ""
 "This picture will be used as a preview if you post links to your ticket shop "
 "on social media. Facebook advises to use a picture size of 1200 x 630 "
 "pixels, however some platforms like WhatsApp and Reddit only show a square "
-"preview, so we recommend to make sure it still looks good only the center "
+"preview, so we recommend to make sure it still looks good if only the center "
 "square is shown. If you do not fill this, we will use the logo given above."
 msgstr ""
 "Cette photo sera utilisée comme aperçu si vous publiez des liens vers votre "

src/pretix/locale/gl/LC_MESSAGES/django.po

@@ -12257,7 +12257,7 @@ msgid ""
 "This picture will be used as a preview if you post links to your ticket shop "
 "on social media. Facebook advises to use a picture size of 1200 x 630 "
 "pixels, however some platforms like WhatsApp and Reddit only show a square "
-"preview, so we recommend to make sure it still looks good only the center "
+"preview, so we recommend to make sure it still looks good if only the center "
 "square is shown. If you do not fill this, we will use the logo given above."
 msgstr ""
 

src/pretix/locale/he/LC_MESSAGES/django.po

@@ -10282,7 +10282,7 @@ msgid ""
 "This picture will be used as a preview if you post links to your ticket shop "
 "on social media. Facebook advises to use a picture size of 1200 x 630 "
 "pixels, however some platforms like WhatsApp and Reddit only show a square "
-"preview, so we recommend to make sure it still looks good only the center "
+"preview, so we recommend to make sure it still looks good if only the center "
 "square is shown. If you do not fill this, we will use the logo given above."
 msgstr ""
 

src/pretix/locale/hr/LC_MESSAGES/django.po

@@ -10781,7 +10781,7 @@ msgid ""
 "This picture will be used as a preview if you post links to your ticket shop "
 "on social media. Facebook advises to use a picture size of 1200 x 630 "
 "pixels, however some platforms like WhatsApp and Reddit only show a square "
-"preview, so we recommend to make sure it still looks good only the center "
+"preview, so we recommend to make sure it still looks good if only the center "
 "square is shown. If you do not fill this, we will use the logo given above."
 msgstr ""
 

src/pretix/locale/hu/LC_MESSAGES/django.po

@@ -10819,7 +10819,7 @@ msgid ""
 "This picture will be used as a preview if you post links to your ticket shop "
 "on social media. Facebook advises to use a picture size of 1200 x 630 "
 "pixels, however some platforms like WhatsApp and Reddit only show a square "
-"preview, so we recommend to make sure it still looks good only the center "
+"preview, so we recommend to make sure it still looks good if only the center "
 "square is shown. If you do not fill this, we will use the logo given above."
 msgstr ""
 

src/pretix/locale/id/LC_MESSAGES/django.po

@@ -11710,7 +11710,7 @@ msgid ""
 "This picture will be used as a preview if you post links to your ticket shop "
 "on social media. Facebook advises to use a picture size of 1200 x 630 "
 "pixels, however some platforms like WhatsApp and Reddit only show a square "
-"preview, so we recommend to make sure it still looks good only the center "
+"preview, so we recommend to make sure it still looks good if only the center "
 "square is shown. If you do not fill this, we will use the logo given above."
 msgstr ""
 "Gambar ini akan digunakan sebagai pratinjau jika kamu memposting link ke "

src/pretix/locale/it/LC_MESSAGES/django.po

@@ -10949,7 +10949,7 @@ msgid ""
 "This picture will be used as a preview if you post links to your ticket shop "
 "on social media. Facebook advises to use a picture size of 1200 x 630 "
 "pixels, however some platforms like WhatsApp and Reddit only show a square "
-"preview, so we recommend to make sure it still looks good only the center "
+"preview, so we recommend to make sure it still looks good if only the center "
 "square is shown. If you do not fill this, we will use the logo given above."
 msgstr ""
 

src/pretix/locale/ja/LC_MESSAGES/django.po

@@ -11418,7 +11418,7 @@ msgid ""
 "This picture will be used as a preview if you post links to your ticket shop "
 "on social media. Facebook advises to use a picture size of 1200 x 630 "
 "pixels, however some platforms like WhatsApp and Reddit only show a square "
-"preview, so we recommend to make sure it still looks good only the center "
+"preview, so we recommend to make sure it still looks good if only the center "
 "square is shown. If you do not fill this, we will use the logo given above."
 msgstr ""
 "この画像は、SNSでチケットショップのリンクを投稿する際のプレビューとして使用さ"

src/pretix/locale/ko/LC_MESSAGES/django.po

@@ -10274,7 +10274,7 @@ msgid ""
 "This picture will be used as a preview if you post links to your ticket shop "
 "on social media. Facebook advises to use a picture size of 1200 x 630 "
 "pixels, however some platforms like WhatsApp and Reddit only show a square "
-"preview, so we recommend to make sure it still looks good only the center "
+"preview, so we recommend to make sure it still looks good if only the center "
 "square is shown. If you do not fill this, we will use the logo given above."
 msgstr ""
 

src/pretix/locale/lt/LC_MESSAGES/django.po

@@ -10263,7 +10263,7 @@ msgid ""
 "This picture will be used as a preview if you post links to your ticket shop "
 "on social media. Facebook advises to use a picture size of 1200 x 630 "
 "pixels, however some platforms like WhatsApp and Reddit only show a square "
-"preview, so we recommend to make sure it still looks good only the center "
+"preview, so we recommend to make sure it still looks good if only the center "
 "square is shown. If you do not fill this, we will use the logo given above."
 msgstr ""
 

src/pretix/locale/lv/LC_MESSAGES/django.po

@@ -11177,7 +11177,7 @@ msgid ""
 "This picture will be used as a preview if you post links to your ticket shop "
 "on social media. Facebook advises to use a picture size of 1200 x 630 "
 "pixels, however some platforms like WhatsApp and Reddit only show a square "
-"preview, so we recommend to make sure it still looks good only the center "
+"preview, so we recommend to make sure it still looks good if only the center "
 "square is shown. If you do not fill this, we will use the logo given above."
 msgstr ""
 

src/pretix/locale/nan/LC_MESSAGES/django.po

@@ -10260,7 +10260,7 @@ msgid ""
 "This picture will be used as a preview if you post links to your ticket shop "
 "on social media. Facebook advises to use a picture size of 1200 x 630 "
 "pixels, however some platforms like WhatsApp and Reddit only show a square "
-"preview, so we recommend to make sure it still looks good only the center "
+"preview, so we recommend to make sure it still looks good if only the center "
 "square is shown. If you do not fill this, we will use the logo given above."
 msgstr ""
 

src/pretix/locale/nb_NO/LC_MESSAGES/django.po

@@ -11751,7 +11751,7 @@ msgid ""
 "This picture will be used as a preview if you post links to your ticket shop "
 "on social media. Facebook advises to use a picture size of 1200 x 630 "
 "pixels, however some platforms like WhatsApp and Reddit only show a square "
-"preview, so we recommend to make sure it still looks good only the center "
+"preview, so we recommend to make sure it still looks good if only the center "
 "square is shown. If you do not fill this, we will use the logo given above."
 msgstr ""
 "Dette bildet vil bli brukt som en forhåndsvisning hvis du deler lenker til "

src/pretix/locale/nl/LC_MESSAGES/django.po

@@ -11705,7 +11705,7 @@ msgid ""
 "This picture will be used as a preview if you post links to your ticket shop "
 "on social media. Facebook advises to use a picture size of 1200 x 630 "
 "pixels, however some platforms like WhatsApp and Reddit only show a square "
-"preview, so we recommend to make sure it still looks good only the center "
+"preview, so we recommend to make sure it still looks good if only the center "
 "square is shown. If you do not fill this, we will use the logo given above."
 msgstr ""
 "Deze afbeelding zal worden gebruikt als u links naar uw ticketwinkel op "

src/pretix/locale/nl_Informal/LC_MESSAGES/django.po

@@ -11988,7 +11988,7 @@ msgid ""
 "This picture will be used as a preview if you post links to your ticket shop "
 "on social media. Facebook advises to use a picture size of 1200 x 630 "
 "pixels, however some platforms like WhatsApp and Reddit only show a square "
-"preview, so we recommend to make sure it still looks good only the center "
+"preview, so we recommend to make sure it still looks good if only the center "
 "square is shown. If you do not fill this, we will use the logo given above."
 msgstr ""
 "Deze afbeelding zal als voorvertoning worden gebruikt als je links naar je "

src/pretix/locale/pl/LC_MESSAGES/django.po

@@ -11634,7 +11634,7 @@ msgid ""
 "This picture will be used as a preview if you post links to your ticket shop "
 "on social media. Facebook advises to use a picture size of 1200 x 630 "
 "pixels, however some platforms like WhatsApp and Reddit only show a square "
-"preview, so we recommend to make sure it still looks good only the center "
+"preview, so we recommend to make sure it still looks good if only the center "
 "square is shown. If you do not fill this, we will use the logo given above."
 msgstr ""
 "Ten obraz będzie używany jako podgląd, jeśli opublikujesz linki do swojego "

src/pretix/locale/pl_Informal/LC_MESSAGES/django.po

@@ -10461,7 +10461,7 @@ msgid ""
 "This picture will be used as a preview if you post links to your ticket shop "
 "on social media. Facebook advises to use a picture size of 1200 x 630 "
 "pixels, however some platforms like WhatsApp and Reddit only show a square "
-"preview, so we recommend to make sure it still looks good only the center "
+"preview, so we recommend to make sure it still looks good if only the center "
 "square is shown. If you do not fill this, we will use the logo given above."
 msgstr ""
 

src/pretix/locale/pt/LC_MESSAGES/django.po

@@ -10432,7 +10432,7 @@ msgid ""
 "This picture will be used as a preview if you post links to your ticket shop "
 "on social media. Facebook advises to use a picture size of 1200 x 630 "
 "pixels, however some platforms like WhatsApp and Reddit only show a square "
-"preview, so we recommend to make sure it still looks good only the center "
+"preview, so we recommend to make sure it still looks good if only the center "
 "square is shown. If you do not fill this, we will use the logo given above."
 msgstr ""
 

src/pretix/locale/pt_BR/LC_MESSAGES/django.po

@@ -11646,7 +11646,7 @@ msgid ""
 "This picture will be used as a preview if you post links to your ticket shop "
 "on social media. Facebook advises to use a picture size of 1200 x 630 "
 "pixels, however some platforms like WhatsApp and Reddit only show a square "
-"preview, so we recommend to make sure it still looks good only the center "
+"preview, so we recommend to make sure it still looks good if only the center "
 "square is shown. If you do not fill this, we will use the logo given above."
 msgstr ""
 "Esta imagem será usada como uma prévia se você postar links para sua loja de "

src/pretix/locale/pt_PT/LC_MESSAGES/django.po

@@ -11759,7 +11759,7 @@ msgid ""
 "This picture will be used as a preview if you post links to your ticket shop "
 "on social media. Facebook advises to use a picture size of 1200 x 630 "
 "pixels, however some platforms like WhatsApp and Reddit only show a square "
-"preview, so we recommend to make sure it still looks good only the center "
+"preview, so we recommend to make sure it still looks good if only the center "
 "square is shown. If you do not fill this, we will use the logo given above."
 msgstr ""
 "Esta imagem será usada como uma visualização prévia se postar links para a "

src/pretix/locale/ro/LC_MESSAGES/django.po

@@ -12128,7 +12128,7 @@ msgid ""
 "This picture will be used as a preview if you post links to your ticket shop "
 "on social media. Facebook advises to use a picture size of 1200 x 630 "
 "pixels, however some platforms like WhatsApp and Reddit only show a square "
-"preview, so we recommend to make sure it still looks good only the center "
+"preview, so we recommend to make sure it still looks good if only the center "
 "square is shown. If you do not fill this, we will use the logo given above."
 msgstr ""
 "Această imagine va fi folosită ca o previzualizare dacă postați linkuri "

src/pretix/locale/ru/LC_MESSAGES/django.po

@@ -11545,7 +11545,7 @@ msgid ""
 "This picture will be used as a preview if you post links to your ticket shop "
 "on social media. Facebook advises to use a picture size of 1200 x 630 "
 "pixels, however some platforms like WhatsApp and Reddit only show a square "
-"preview, so we recommend to make sure it still looks good only the center "
+"preview, so we recommend to make sure it still looks good if only the center "
 "square is shown. If you do not fill this, we will use the logo given above."
 msgstr ""
 

src/pretix/locale/si/LC_MESSAGES/django.po

@@ -10292,7 +10292,7 @@ msgid ""
 "This picture will be used as a preview if you post links to your ticket shop "
 "on social media. Facebook advises to use a picture size of 1200 x 630 "
 "pixels, however some platforms like WhatsApp and Reddit only show a square "
-"preview, so we recommend to make sure it still looks good only the center "
+"preview, so we recommend to make sure it still looks good if only the center "
 "square is shown. If you do not fill this, we will use the logo given above."
 msgstr ""
 

src/pretix/locale/sk/LC_MESSAGES/django.po

@@ -11506,7 +11506,7 @@ msgid ""
 "This picture will be used as a preview if you post links to your ticket shop "
 "on social media. Facebook advises to use a picture size of 1200 x 630 "
 "pixels, however some platforms like WhatsApp and Reddit only show a square "
-"preview, so we recommend to make sure it still looks good only the center "
+"preview, so we recommend to make sure it still looks good if only the center "
 "square is shown. If you do not fill this, we will use the logo given above."
 msgstr ""
 "Tento obrázok sa použije ako náhľad, ak na sociálnych sieťach zverejníte "

src/pretix/locale/sl/LC_MESSAGES/django.po

@@ -11493,7 +11493,7 @@ msgid ""
 "This picture will be used as a preview if you post links to your ticket shop "
 "on social media. Facebook advises to use a picture size of 1200 x 630 "
 "pixels, however some platforms like WhatsApp and Reddit only show a square "
-"preview, so we recommend to make sure it still looks good only the center "
+"preview, so we recommend to make sure it still looks good if only the center "
 "square is shown. If you do not fill this, we will use the logo given above."
 msgstr ""
 

src/pretix/locale/sq/LC_MESSAGES/django.po

@@ -10260,7 +10260,7 @@ msgid ""
 "This picture will be used as a preview if you post links to your ticket shop "
 "on social media. Facebook advises to use a picture size of 1200 x 630 "
 "pixels, however some platforms like WhatsApp and Reddit only show a square "
-"preview, so we recommend to make sure it still looks good only the center "
+"preview, so we recommend to make sure it still looks good if only the center "
 "square is shown. If you do not fill this, we will use the logo given above."
 msgstr ""
 

src/pretix/locale/sv/LC_MESSAGES/django.po

@@ -11582,7 +11582,7 @@ msgid ""
 "This picture will be used as a preview if you post links to your ticket shop "
 "on social media. Facebook advises to use a picture size of 1200 x 630 "
 "pixels, however some platforms like WhatsApp and Reddit only show a square "
-"preview, so we recommend to make sure it still looks good only the center "
+"preview, so we recommend to make sure it still looks good if only the center "
 "square is shown. If you do not fill this, we will use the logo given above."
 msgstr ""
 "Denna bild kommer att användas som förhandsgranskning om du delar länkar "

src/pretix/locale/th/LC_MESSAGES/django.po

@@ -10262,7 +10262,7 @@ msgid ""
 "This picture will be used as a preview if you post links to your ticket shop "
 "on social media. Facebook advises to use a picture size of 1200 x 630 "
 "pixels, however some platforms like WhatsApp and Reddit only show a square "
-"preview, so we recommend to make sure it still looks good only the center "
+"preview, so we recommend to make sure it still looks good if only the center "
 "square is shown. If you do not fill this, we will use the logo given above."
 msgstr ""
 

src/pretix/locale/tr/LC_MESSAGES/django.po

@@ -12385,7 +12385,7 @@ msgid ""
 "This picture will be used as a preview if you post links to your ticket shop "
 "on social media. Facebook advises to use a picture size of 1200 x 630 "
 "pixels, however some platforms like WhatsApp and Reddit only show a square "
-"preview, so we recommend to make sure it still looks good only the center "
+"preview, so we recommend to make sure it still looks good if only the center "
 "square is shown. If you do not fill this, we will use the logo given above."
 msgstr ""
 

src/pretix/locale/uk/LC_MESSAGES/django.po

@@ -11956,7 +11956,7 @@ msgid ""
 "This picture will be used as a preview if you post links to your ticket shop "
 "on social media. Facebook advises to use a picture size of 1200 x 630 "
 "pixels, however some platforms like WhatsApp and Reddit only show a square "
-"preview, so we recommend to make sure it still looks good only the center "
+"preview, so we recommend to make sure it still looks good if only the center "
 "square is shown. If you do not fill this, we will use the logo given above."
 msgstr ""
 "Це зображення буде використано для попереднього перегляду, якщо ви "

src/pretix/locale/vi/LC_MESSAGES/django.po

@@ -10267,7 +10267,7 @@ msgid ""
 "This picture will be used as a preview if you post links to your ticket shop "
 "on social media. Facebook advises to use a picture size of 1200 x 630 "
 "pixels, however some platforms like WhatsApp and Reddit only show a square "
-"preview, so we recommend to make sure it still looks good only the center "
+"preview, so we recommend to make sure it still looks good if only the center "
 "square is shown. If you do not fill this, we will use the logo given above."
 msgstr ""
 

src/pretix/locale/vls/LC_MESSAGES/django.po

@@ -10260,7 +10260,7 @@ msgid ""
 "This picture will be used as a preview if you post links to your ticket shop "
 "on social media. Facebook advises to use a picture size of 1200 x 630 "
 "pixels, however some platforms like WhatsApp and Reddit only show a square "
-"preview, so we recommend to make sure it still looks good only the center "
+"preview, so we recommend to make sure it still looks good if only the center "
 "square is shown. If you do not fill this, we will use the logo given above."
 msgstr ""
 

src/pretix/locale/zh_Hans/LC_MESSAGES/django.po

@@ -11829,7 +11829,7 @@ msgid ""
 "This picture will be used as a preview if you post links to your ticket shop "
 "on social media. Facebook advises to use a picture size of 1200 x 630 "
 "pixels, however some platforms like WhatsApp and Reddit only show a square "
-"preview, so we recommend to make sure it still looks good only the center "
+"preview, so we recommend to make sure it still looks good if only the center "
 "square is shown. If you do not fill this, we will use the logo given above."
 msgstr ""
 

src/pretix/locale/zh_Hant/LC_MESSAGES/django.po

@@ -10949,7 +10949,7 @@ msgid ""
 "This picture will be used as a preview if you post links to your ticket shop "
 "on social media. Facebook advises to use a picture size of 1200 x 630 "
 "pixels, however some platforms like WhatsApp and Reddit only show a square "
-"preview, so we recommend to make sure it still looks good only the center "
+"preview, so we recommend to make sure it still looks good if only the center "
 "square is shown. If you do not fill this, we will use the logo given above."
 msgstr ""
 "如果你在社交媒體上發佈連向售票處的連結，此圖片將用作預覽。Facebook建議使用"

src/pretix/plugins/ticketoutputpdf/templates/pretixplugins/ticketoutputpdf/form.html

@@ -11,7 +11,7 @@
     <a class="btn btn-primary btn-lg" target="_blank"
             href="{% url "plugins:ticketoutputpdf:getdefault" organizer=request.organizer.slug event=request.event.slug %}">
         <span class="fa fa-paint-brush"></span>
-        {% trans "Open Layout Designer" %}
+        {% trans "Open layout editor" %}
     </a>
     <a class="btn btn-default btn-lg" target="_blank"
             href="{% url "plugins:ticketoutputpdf:index" organizer=request.organizer.slug event=request.event.slug %}">

src/pretix/presale/templates/pretixpresale/event/base.html

@@ -15,6 +15,8 @@
 {% block custom_header %}
     {% if event.settings.meta_noindex %}
         <meta name="robots" content="noindex, nofollow">
+    {% elif "date" in request.GET or "old" in request.GET %}
+        <meta name="robots" content="noindex, follow">
     {% endif %}
     <meta property="og:type" content="website" />
     {% if social_image %}

src/pretix/presale/templates/pretixpresale/organizers/base.html

@@ -11,6 +11,8 @@
 {% block custom_header %}
     {% if organizer.settings.meta_noindex %}
         <meta name="robots" content="noindex, nofollow">
+    {% elif "date" in request.GET or "old" in request.GET %}
+        <meta name="robots" content="noindex, follow">
     {% endif %}
     <meta property="og:type" content="website" />
 

src/pretix/presale/templates/pretixpresale/organizers/index.html

@@ -30,24 +30,24 @@
             </div>
         </div>
     </div>
-    {% if events %}
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <h2 class="panel-title">
-                    <b>
-                    {% if "old" in request.GET %}
-                        {% trans "Past events" %}
-                    {% else %}
-                        {% trans "Upcoming events" %}
-                    {% endif %}
-                    </b>
-                </h2>
-            </div>
-        {% if filter_form.fields %}
-            <div class="panel-subhead">
-                {% include "pretixpresale/fragment_event_list_filter.html" with request=request %}
-            </div>
-        {% endif %}
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <h2 class="panel-title">
+                <b>
+                {% if "old" in request.GET %}
+                    {% trans "Past events" %}
+                {% else %}
+                    {% trans "Upcoming events" %}
+                {% endif %}
+                </b>
+            </h2>
+        </div>
+    {% if filter_form.fields %}
+        <div class="panel-subhead">
+            {% include "pretixpresale/fragment_event_list_filter.html" with request=request %}
+        </div>
+    {% endif %}
+        {% if events %}
             <div class="panel-body">
                 <dl class="full-width-list alternating-rows">
                 {% for e in events %}{% eventurl e "presale:event.index" as url %}
@@ -99,12 +99,15 @@
                 {% endfor %}
                 </dl>
             </div>
+            <hr>
+        {% endif %}
+        <div class="panel-body">
+            {% if "old" in request.GET %}
+                <p><em>{% if not events %}{% trans "No archived events found." %} {% endif %}<a href="?{% url_replace request "old" "" %}">{% trans "Show upcoming" %}</a></em></p>
+            {% else %}
+                <p><em>{% if not events %}{% trans "No public upcoming events found." %} {% endif %}<a href="?{% url_replace request "old" "1" %}">{% trans "Show past events" %}</a></em></p>
+            {% endif %}
         </div>
-    {% endif %}
-    {% if "old" in request.GET %}
-        <p><em>{% if not events %}{% trans "No archived events found." %} {% endif %}<a href="?{% url_replace request "old" "" %}">{% trans "Show upcoming" %}</a></em></p>
-    {% else %}
-        <p><em>{% if not events %}{% trans "No public upcoming events found." %} {% endif %}<a href="?{% url_replace request "old" "1" %}">{% trans "Show past events" %}</a></em></p>
-    {% endif %}
+    </div>
     {% include "pretixpresale/pagination.html" %}
 {% endblock %}

src/pretix/presale/views/event.py

@@ -500,37 +500,33 @@ class EventIndex(EventViewMixin, EventListMixin, CartMixin, TemplateView):
 
         self.subevent = None
         utm_params = {k: v for k, v in request.GET.items() if k.startswith("utm_")}
-        pass_through_url_params = utm_params | \
-            {k: v for k, v in request.GET.items() if k in ("locale", "consent")} | \
-            ({"widget_data": request.GET.get('widget_data')} if len(self.request.GET.get('widget_data', '{}')) > 3 else {})
-
         if request.GET.get('src', '') == 'widget' and 'take_cart_id' in request.GET:
             # User has clicked "Open in a new tab" link in widget
             get_or_create_cart_id(request)
             return redirect_to_url(eventreverse(request.event, 'presale:event.index', kwargs=kwargs) + '?' + urlencode(utm_params))
-        elif request.GET.get('iframe', '') == '1' and (
-                'take_cart_id' in request.GET or len(self.request.GET.get('widget_data', '{}')) > 3 or 'consent' in request.GET
-        ):
-            # Widget just opened, and a cart already exists or we have been passed widget_data.
-            # Let's do a stupid redirect to check if cookies are disabled.
+        elif request.GET.get('iframe', '') == '1' and 'take_cart_id' in request.GET:
+            # Widget just opened, a cart already exists. Let's to a stupid redirect to check if cookies are disabled
+            get_or_create_cart_id(request)
             return redirect_to_url(eventreverse(request.event, 'presale:event.index', kwargs=kwargs) + '?' + urlencode({
                 'require_cookie': 'true',
-                'cart_id': get_or_create_cart_id(request),
-                **pass_through_url_params,
+                'cart_id': request.GET.get('take_cart_id'),
+                **({"locale": request.GET.get('locale')} if request.GET.get('locale') else {}),
+                **utm_params,
             }))
+        elif request.GET.get('iframe', '') == '1' and len(self.request.GET.get('widget_data', '{}')) > 3:
+            # We've been passed data from a widget, we need to create a cart session to store it.
+            get_or_create_cart_id(request)
         elif 'require_cookie' in request.GET and settings.SESSION_COOKIE_NAME not in request.COOKIES and \
                 '__Host-' + settings.SESSION_COOKIE_NAME not in self.request.COOKIES:
             # Cookies are in fact not supported
             r = render(request, 'pretixpresale/event/cookies.html', {
                 'url': eventreverse(
-                    request.event, "presale:event.index", kwargs={
-                        'cart_namespace': kwargs.get('cart_namespace') or '',
-                        **({"subevent": kwargs['subevent']} if kwargs.get('subevent') else {}),
-                    }
+                    request.event, "presale:event.index", kwargs={'cart_namespace': kwargs.get('cart_namespace') or ''}
                 ) + "?" + urlencode({
                     "src": "widget",
+                    **({"locale": request.GET.get('locale')} if request.GET.get('locale') else {}),
                     **({"take_cart_id": request.GET.get('cart_id')} if request.GET.get('cart_id') else {}),
-                    **pass_through_url_params,
+                    **utm_params,
                 })
             })
             r._csp_ignore = True

src/pretix/static/pretixpresale/scss/_event.scss

@@ -145,6 +145,11 @@ article.item-with-variations .product-row:last-child:after {
     margin-bottom: 0;
 }
 
+.panel > hr {
+    margin: 0;
+    border-top: 1px solid $table-border-color;
+}
+
 .product-row {
     padding: 1.25*$line-height-computed 0;
 

src/pretix/static/pretixpresale/scss/main.scss

@@ -413,7 +413,6 @@ details.details-open .panel-title::before {
 }
 
 .panel-subhead {
-    margin-bottom: 15px;
     padding: 15px;
     background: $table-bg-accent;
     border-bottom: 1px solid $table-border-color;