diff --git a/src/pretix/base/models/items.py b/src/pretix/base/models/items.py index feb7dec8a5..07ded4cb8a 100644 --- a/src/pretix/base/models/items.py +++ b/src/pretix/base/models/items.py @@ -453,8 +453,8 @@ class Item(LoggedModel): MEDIA_POLICY_NEW = 'new' MEDIA_POLICY_REUSE_OR_NEW = 'reuse_or_new' MEDIA_POLICIES = ( - (None, _("Don't use re-usable media, use regular one-off tickets")), - (MEDIA_POLICY_REUSE, _('Require an existing medium to be re-used')), + (None, _("Don't use reusable media, use regular one-off tickets")), + (MEDIA_POLICY_REUSE, _('Require an existing medium to be reused')), (MEDIA_POLICY_NEW, _('Require a previously unknown medium to be newly added')), (MEDIA_POLICY_REUSE_OR_NEW, _('Require either an existing or a new medium to be used')), ) @@ -769,7 +769,7 @@ class Item(LoggedModel): null=True, blank=True, max_length=16, verbose_name=_('Reusable media policy'), help_text=_( - 'If this product should be stored on a re-usable physical medium, you can attach a physical media policy. ' + 'If this product should be stored on a reusable physical medium, you can attach a physical media policy. ' 'This is not required for regular tickets, which just use a one-time barcode, but only for products like ' 'renewable season tickets or re-chargeable gift card wristbands. ' 'This is an advanced feature that also requires specific configuration of ticketing and printing settings.' @@ -778,7 +778,7 @@ class Item(LoggedModel): media_type = models.CharField( max_length=100, null=True, blank=True, - choices=[(None, _("Don't use re-usable media, use regular one-off tickets"))] + [(k, v) for k, v in MEDIA_TYPES.items()], + choices=[(None, _("Don't use reusable media, use regular one-off tickets"))] + [(k, v) for k, v in MEDIA_TYPES.items()], verbose_name=_('Reusable media type'), help_text=_( 'Select the type of physical medium that should be used for this product. Note that not all media types ' @@ -2220,7 +2220,7 @@ class Quota(LoggedModel): class ItemMetaProperty(LoggedModel): """ An event can have ItemMetaProperty objects attached to define meta information fields - for its items. This information can be re-used for example in ticket layouts. + for its items. This information can be reused for example in ticket layouts. :param event: The event this property is defined for. :type event: Event diff --git a/src/pretix/base/settings.py b/src/pretix/base/settings.py index fa3c567344..ec6224e768 100644 --- a/src/pretix/base/settings.py +++ b/src/pretix/base/settings.py @@ -211,9 +211,9 @@ DEFAULTS = { 'form_class': forms.BooleanField, 'serializer_class': serializers.BooleanField, 'form_kwargs': dict( - label=_("Activate re-usable media"), - help_text=_("The re-usable media feature allows you to connect tickets and gift cards with physical media " - "such as wristbands or chip cards that may be re-used for different tickets or gift cards " + label=_("Activate reusable media"), + help_text=_("The reusable media feature allows you to connect tickets and gift cards with physical media " + "such as wristbands or chip cards that may be reused for different tickets or gift cards " "later.") ) }, @@ -223,9 +223,9 @@ DEFAULTS = { 'form_class': forms.BooleanField, 'serializer_class': serializers.BooleanField, 'form_kwargs': dict( - label=_("Enforce the usage of issued re-usable media for check-in"), - help_text=_("If enabled, a ticket barcode will not be accepted anymore, if a re-usable medium has been " - "created and linked to a ticket. Keeping this option turned off will treat the re-usable " + label=_("Enforce the usage of issued reusable media for check-in"), + help_text=_("If enabled, a ticket barcode will not be accepted anymore, if a reusable medium has been " + "created and linked to a ticket. Keeping this option turned off will treat the reusable " "medium and ticket as equals."), widget=forms.CheckboxInput(attrs={'data-display-dependency': '#id_settings-reusable_media_active'}), ) diff --git a/src/pretix/control/templates/pretixcontrol/checkin/simulator.html b/src/pretix/control/templates/pretixcontrol/checkin/simulator.html index 09a3dd3640..4b4251ef1f 100644 --- a/src/pretix/control/templates/pretixcontrol/checkin/simulator.html +++ b/src/pretix/control/templates/pretixcontrol/checkin/simulator.html @@ -86,7 +86,7 @@

{% trans "Media exchange required" %}

{% blocktrans trimmed with media_policy=media_policies|getitem:result.media_policy media_type=media_types|getitem:result.media_type %} - This ticket needs to be exchanged into a {{ media_type }} re-usable medium. + This ticket needs to be exchanged into a {{ media_type }} reusable medium. {{ media_policy }}. {% endblocktrans %}