From 8283c0f300bf678ead47a0d3e864009c17e71c58 Mon Sep 17 00:00:00 2001
From: luelista <weller@rami.io>
Date: Tue, 6 May 2025 16:40:19 +0200
Subject: [PATCH] Apply suggestions from code review

Co-authored-by: Raphael Michel <michel@rami.io>
---
 src/pretix/base/datasync/datasync.py                      | 3 ++-
 src/pretix/base/datasync/sourcefields.py                  | 5 ++---
 src/pretix/control/forms/mapping.py                       | 4 ++--
 src/pretix/control/logdisplay.py                          | 8 ++++----
 .../pretixcontrol/datasync/control_order_info.html        | 4 +++-
 5 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/pretix/base/datasync/datasync.py b/src/pretix/base/datasync/datasync.py
index 891ce275ea..e414684ea9 100644
--- a/src/pretix/base/datasync/datasync.py
+++ b/src/pretix/base/datasync/datasync.py
@@ -119,7 +119,8 @@ class OutboundSyncProvider:
             order=order,
             sync_provider=cls.identifier,
             triggered_by=triggered_by,
-            not_before=not_before)
+            not_before=not_before,
+        )
 
     @classmethod
     def get_external_link_info(cls, event, external_link_href, external_link_display_name):
diff --git a/src/pretix/base/datasync/sourcefields.py b/src/pretix/base/datasync/sourcefields.py
index 55d2a677e8..60a99eeae0 100644
--- a/src/pretix/base/datasync/sourcefields.py
+++ b/src/pretix/base/datasync/sourcefields.py
@@ -97,7 +97,7 @@ def split_name_on_last_space(name, part):
 ORDER_POSITION = 'position'
 ORDER = 'order'
 EVENT = 'event'
-EVENT_OR_SUBEVENT = 'event_or_subevent'
+SUBEVENT_OR_EVENT = 'subevent_or_event'
 AVAILABLE_MODELS = {
     'OrderPosition': (ORDER_POSITION, ORDER, EVENT_OR_SUBEVENT, EVENT),
     'Order': (ORDER, EVENT),
@@ -122,8 +122,7 @@ def get_data_fields(event, for_model=None):
     """
     Returns tuple of (required_input, key, label, type, enum_opts, getter)
 
-    type is one of the hubspot data types as specified in
-    https://developers.hubspot.com/docs/api/crm/properties#property-type-and-fieldtype-values
+    Type is one of the Question types as defined in Question.TYPE_CHOICES.
     """
     name_scheme = PERSON_NAME_SCHEMES[event.settings.name_scheme]
     name_headers = []
diff --git a/src/pretix/control/forms/mapping.py b/src/pretix/control/forms/mapping.py
index 09c49f13bc..111708c8d7 100644
--- a/src/pretix/control/forms/mapping.py
+++ b/src/pretix/control/forms/mapping.py
@@ -38,7 +38,7 @@ class PropertyMappingForm(forms.Form):
     overwrite = forms.ChoiceField(
         choices=[
             (MODE_OVERWRITE, _("Overwrite")),
-            (MODE_SET_IF_NEW, _("Fill if new contact")),
+            (MODE_SET_IF_NEW, _("Fill if new")),
             (MODE_SET_IF_EMPTY, _("Fill if empty")),
             (MODE_APPEND_LIST, _("Add to list")),
         ]
@@ -47,7 +47,7 @@ class PropertyMappingForm(forms.Form):
     def __init__(self, pretix_fields, external_fields_id, available_modes, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.fields["pretix_field"] = forms.ChoiceField(
-            label=_("pretix Field"),
+            label=_("pretix field"),
             choices=pretix_fields_choices(pretix_fields, kwargs.get("initial", {}).get("pretix_field")),
             required=False,
         )
diff --git a/src/pretix/control/logdisplay.py b/src/pretix/control/logdisplay.py
index 153af8984d..83c037e3ad 100644
--- a/src/pretix/control/logdisplay.py
+++ b/src/pretix/control/logdisplay.py
@@ -424,9 +424,9 @@ class OrderPrintLogEntryType(OrderLogEntryType):
 
 
 @log_entry_types.new_from_dict({
-    "pretix.event.order.data_sync.success": _("Ticket data successfully transferred to {provider}."),
+    "pretix.event.order.data_sync.success": _("Data successfully transferred to {provider}."),
 })
-class OrderDataSyncLogentrytype(OrderLogEntryType):
+class OrderDataSyncLogEntryType(OrderLogEntryType):
     def display(self, logentry, data):
         links = []
         if data.get('provider') and data.get('objects'):
@@ -443,9 +443,9 @@ class OrderDataSyncLogentrytype(OrderLogEntryType):
 
 
 @log_entry_types.new_from_dict({
-    "pretix.event.order.data_sync.failed": _("Error while transferring ticket data to {provider}:"),
+    "pretix.event.order.data_sync.failed": _("Error while transferring data to {provider}:"),
 })
-class OrderDataSyncErrorLogentrytype(OrderLogEntryType):
+class OrderDataSyncErrorLogEntryType(OrderLogEntryType):
     def display(self, logentry, data):
         errmes = data["error"]
         if not isinstance(errmes, list):
diff --git a/src/pretix/control/templates/pretixcontrol/datasync/control_order_info.html b/src/pretix/control/templates/pretixcontrol/datasync/control_order_info.html
index 5e94ad8614..edcb21c9a8 100644
--- a/src/pretix/control/templates/pretixcontrol/datasync/control_order_info.html
+++ b/src/pretix/control/templates/pretixcontrol/datasync/control_order_info.html
@@ -42,7 +42,9 @@
                         {% else %}
                             <i class="fa fa-hourglass"></i> {% trans "Pending" %}
                         {% endif %}
-                        <span class="text-muted">(triggered by {{ pending.triggered_by }} at {{ pending.triggered|date:"SHORT_DATETIME_FORMAT" }})</span>
+                        <span class="text-muted">({% blocktrans trimmed with datetime=pending.triggered|date:"SHORT_DATETIME_FORMAT" %}triggered at {{ datetime }}
+                        {% endblocktrans %})</span>
+                        <!-- {{ pending.triggered_by }} / {{ pending.triggered }} -->
                     </p>
                 {% endif %}