Compare commits

..

38 Commits

Author SHA1 Message Date
Richard Schreiber
60e7a81c05 fix display of attendee_name in list of memberships 2024-11-27 12:40:46 +01:00
Richard Schreiber
dd5b57d4a2 fix contrast for $text-muted on $table-bg-accent 2024-11-25 10:25:53 +01:00
Richard Schreiber
297971e81a unify label and title for view customer account 2024-11-25 09:54:24 +01:00
Richard Schreiber
faf64f0973 fix test 2024-11-22 13:29:16 +01:00
Richard Schreiber
1a39f209e9 fix code style 2024-11-22 13:24:24 +01:00
Richard Schreiber
6fc62dcaf5 use more icon-helper 2024-11-22 13:17:34 +01:00
Richard Schreiber
6df3c121b4 fix flake8 2024-11-22 12:57:22 +01:00
Richard Schreiber
d1a6ab89fe rename text-blob to textbubble 2024-11-22 12:56:22 +01:00
Richard Schreiber
3ec0fdb4d2 improve membership validity display 2024-11-22 12:41:39 +01:00
Richard Schreiber
20c14b8b24 remove unused code 2024-11-22 11:13:40 +01:00
Richard Schreiber
a2100c9295 checnge users to user 2024-11-22 11:13:27 +01:00
Richard Schreiber
094c04df73 remove impractical title attribute from icon templatetag 2024-11-22 11:13:18 +01:00
Richard Schreiber
de6f6025e2 update templates 2024-11-22 11:12:57 +01:00
Richard Schreiber
3a1f19fa51 add icon templatetag 2024-11-22 10:12:26 +01:00
Richard Schreiber
4bc1adc5e2 make icon optional in textblob 2024-11-21 15:35:07 +01:00
Richard Schreiber
2ca22ef663 use predefined border-radius instead of always fully round 2024-11-21 15:32:30 +01:00
Richard Schreiber
1fdf8cb01e make icons in text-bubble more vibrant (although less contrast) 2024-11-21 15:29:17 +01:00
Richard Schreiber
83b8cb3b4b change order-status to text-blob 2024-11-21 14:02:14 +01:00
Richard Schreiber
2fe5b65f94 change to status to textblob 2024-11-21 14:02:14 +01:00
Richard Schreiber
87d54ae068 improve addresses 2024-11-21 14:02:14 +01:00
Richard Schreiber
e3cd5af1d7 remove padding top/bottom if full-width-list is only element in panel 2024-11-21 14:02:14 +01:00
Richard Schreiber
b1fbf4d5b7 change ol to ul 2024-11-21 14:02:14 +01:00
Richard Schreiber
ce2e94b8d5 improve memberships list view 2024-11-21 14:02:14 +01:00
Richard Schreiber
ccf32ed2c1 remove unused path 2024-11-21 14:02:14 +01:00
Richard Schreiber
57bed6e6db improve subnav 2024-11-21 14:02:14 +01:00
Richard Schreiber
5a85ed49e8 add customer to context in CustomerRequiredMixin 2024-11-21 14:02:14 +01:00
Richard Schreiber
9e2aeaa400 move to individual pages with own paged querysets 2024-11-21 14:02:14 +01:00
Richard Schreiber
2442f2bfb5 rename to OrderView instead of IndexView 2024-11-21 14:02:14 +01:00
Richard Schreiber
2c03468ef5 use new tinted/shaded colors for text-blob 2024-11-21 14:01:56 +01:00
Richard Schreiber
53d80e56e6 improve status icon 2024-11-21 14:01:56 +01:00
Richard Schreiber
5fede841d7 move css from theme to main 2024-11-21 14:01:56 +01:00
Richard Schreiber
3c5ccaa1ba improve styling 2024-11-21 14:01:56 +01:00
Richard Schreiber
59dccaf680 change to pages instead of tabs 2024-11-21 14:01:34 +01:00
Richard Schreiber
3f499447da change table of order to list of cards 2024-11-21 14:00:51 +01:00
Richard Schreiber
4765dd5c9a change order-status info to text-blob 2024-11-21 14:00:51 +01:00
Richard Schreiber
8f7fca42e5 simplify account info panel 2024-11-21 14:00:51 +01:00
Richard Schreiber
5437bad1c1 add actions icons to login page 2024-11-21 13:59:33 +01:00
Richard Schreiber
3c16c5f66a add count of 2024-11-21 13:59:33 +01:00
26 changed files with 256 additions and 368 deletions

View File

@@ -288,7 +288,6 @@ Example::
[django]
secret=j1kjps5a5&4ilpn912s7a1!e2h!duz^i3&idu@_907s$wrz@x-
debug=off
passwords_argon2=on
``secret``
The secret to be used by Django for signing and verification purposes. If this
@@ -304,10 +303,6 @@ Example::
.. WARNING:: Never set this to ``True`` in production!
``passwords_argon``
Use the ``argon2`` algorithm for password hashing. Disable on systems with a small number of CPU cores (currently
less than 8).
``profile``
Enable code profiling for a random subset of requests. Disabled by default, see
:ref:`perf-monitoring` for details.

View File

@@ -53,7 +53,7 @@ dependencies = [
"django-phonenumber-field==7.3.*",
"django-redis==5.4.*",
"django-scopes==2.0.*",
"django-statici18n==2.6.*",
"django-statici18n==2.5.*",
"djangorestframework==3.15.*",
"dnspython==2.7.*",
"drf_ujson2==1.7.*",
@@ -76,7 +76,7 @@ dependencies = [
"phonenumberslite==8.13.*",
"Pillow==11.0.*",
"pretix-plugin-build",
"protobuf==5.29.*",
"protobuf==5.28.*",
"psycopg2-binary",
"pycountry",
"pycparser==2.22",

View File

@@ -19,4 +19,4 @@
# You should have received a copy of the GNU Affero General Public License along with this program. If not, see
# <https://www.gnu.org/licenses/>.
#
__version__ = "2024.12.0.dev0"
__version__ = "2024.11.0.dev0"

View File

@@ -54,7 +54,6 @@ from django.core.validators import (
from django.db.models import QuerySet
from django.forms import Select, widgets
from django.forms.widgets import FILE_INPUT_CONTRADICTION
from django.urls import reverse
from django.utils.formats import date_format
from django.utils.html import escape
from django.utils.safestring import mark_safe
@@ -78,7 +77,7 @@ from pretix.base.i18n import (
get_babel_locale, get_language_without_region, language,
)
from pretix.base.models import InvoiceAddress, Item, Question, QuestionOption
from pretix.base.models.tax import ask_for_vat_id
from pretix.base.models.tax import VAT_ID_COUNTRIES, ask_for_vat_id
from pretix.base.services.tax import (
VATIDFinalError, VATIDTemporaryError, validate_vat_id,
)
@@ -277,10 +276,6 @@ class NamePartsFormField(forms.MultiValueField):
return value
def name_parts_is_empty(name_parts_dict):
return not any(k != "_scheme" and v for k, v in name_parts_dict.items())
class WrappedPhonePrefixSelect(Select):
initial = None
@@ -607,7 +602,6 @@ class BaseQuestionsForm(forms.Form):
questions = pos.item.questions_to_ask
event = kwargs.pop('event')
self.all_optional = kwargs.pop('all_optional', False)
self.attendee_addresses_required = event.settings.attendee_addresses_required and not self.all_optional
super().__init__(*args, **kwargs)
@@ -682,7 +676,7 @@ class BaseQuestionsForm(forms.Form):
if item.ask_attendee_data and event.settings.attendee_addresses_asked:
add_fields['street'] = forms.CharField(
required=self.attendee_addresses_required,
required=event.settings.attendee_addresses_required and not self.all_optional,
label=_('Address'),
widget=forms.Textarea(attrs={
'rows': 2,
@@ -692,7 +686,7 @@ class BaseQuestionsForm(forms.Form):
initial=(cartpos.street if cartpos else orderpos.street),
)
add_fields['zipcode'] = forms.CharField(
required=False,
required=event.settings.attendee_addresses_required and not self.all_optional,
max_length=30,
label=_('ZIP code'),
initial=(cartpos.zipcode if cartpos else orderpos.zipcode),
@@ -701,7 +695,7 @@ class BaseQuestionsForm(forms.Form):
}),
)
add_fields['city'] = forms.CharField(
required=False,
required=event.settings.attendee_addresses_required and not self.all_optional,
label=_('City'),
max_length=255,
initial=(cartpos.city if cartpos else orderpos.city),
@@ -713,12 +707,11 @@ class BaseQuestionsForm(forms.Form):
add_fields['country'] = CountryField(
countries=CachedCountries
).formfield(
required=self.attendee_addresses_required,
required=event.settings.attendee_addresses_required and not self.all_optional,
label=_('Country'),
initial=country,
widget=forms.Select(attrs={
'autocomplete': 'country',
'data-country-information-url': reverse('js_helpers.states'),
}),
)
c = [('', pgettext_lazy('address', 'Select state'))]
@@ -953,9 +946,9 @@ class BaseQuestionsForm(forms.Form):
d = super().clean()
if self.address_validation:
self.cleaned_data = d = validate_address(d, all_optional=not self.attendee_addresses_required)
self.cleaned_data = d = validate_address(d, True)
if d.get('street') and d.get('country') and str(d['country']) in COUNTRIES_WITH_STATE_IN_ADDRESS:
if d.get('city') and d.get('country') and str(d['country']) in COUNTRIES_WITH_STATE_IN_ADDRESS:
if not d.get('state'):
self.add_error('state', _('This field is required.'))
@@ -1012,7 +1005,7 @@ class BaseInvoiceAddressForm(forms.ModelForm):
'street': forms.Textarea(attrs={
'rows': 2,
'placeholder': _('Street and Number'),
'autocomplete': 'street-address',
'autocomplete': 'street-address'
}),
'beneficiary': forms.Textarea(attrs={'rows': 3}),
'country': forms.Select(attrs={
@@ -1028,7 +1021,7 @@ class BaseInvoiceAddressForm(forms.ModelForm):
'data-display-dependency': '#id_is_business_1',
'autocomplete': 'organization',
}),
'vat_id': forms.TextInput(attrs={'data-display-dependency': '#id_is_business_1'}),
'vat_id': forms.TextInput(attrs={'data-display-dependency': '#id_is_business_1', 'data-countries-with-vat-id': ','.join(VAT_ID_COUNTRIES)}),
'internal_reference': forms.TextInput,
}
labels = {
@@ -1062,7 +1055,6 @@ class BaseInvoiceAddressForm(forms.ModelForm):
])
self.fields['country'].choices = CachedCountries()
self.fields['country'].widget.attrs['data-country-information-url'] = reverse('js_helpers.states')
c = [('', pgettext_lazy('address', 'Select state'))]
fprefix = self.prefix + '-' if self.prefix else ''
@@ -1091,10 +1083,6 @@ class BaseInvoiceAddressForm(forms.ModelForm):
)
self.fields['state'].widget.is_required = True
self.fields['street'].required = False
self.fields['zipcode'].required = False
self.fields['city'].required = False
# Without JavaScript the VAT ID field is not hidden, so we empty the field if a country outside the EU is selected.
if cc and not ask_for_vat_id(cc) and fprefix + 'vat_id' in self.data:
self.data = self.data.copy()
@@ -1147,19 +1135,16 @@ class BaseInvoiceAddressForm(forms.ModelForm):
validate_address # local import to prevent impact on startup time
data = self.cleaned_data
if not data.get('is_business'):
data['company'] = ''
data['vat_id'] = ''
if data.get('is_business') and not ask_for_vat_id(data.get('country')):
data['vat_id'] = ''
if self.address_validation and self.event.settings.invoice_address_required and not self.all_optional:
if self.event.settings.invoice_address_required:
if data.get('is_business') and not data.get('company'):
raise ValidationError({"company": _('You need to provide a company name.')})
if not data.get('is_business') and name_parts_is_empty(data.get('name_parts', {})):
raise ValidationError(_('You need to provide a company name.'))
if not data.get('is_business') and not data.get('name_parts'):
raise ValidationError(_('You need to provide your name.'))
if not data.get('street') and not data.get('zipcode') and not data.get('city'):
raise ValidationError({"street": _('This field is required.')})
if 'vat_id' in self.changed_data or not data.get('vat_id'):
self.instance.vat_id_validated = False
@@ -1171,7 +1156,7 @@ class BaseInvoiceAddressForm(forms.ModelForm):
if all(
not v for k, v in data.items() if k not in ('is_business', 'country', 'name_parts')
) and name_parts_is_empty(data.get('name_parts', {})):
) and len(data.get('name_parts', {})) == 1:
# Do not save the country if it is the only field set -- we don't know the user even checked it!
self.cleaned_data['country'] = ''

View File

@@ -9,7 +9,6 @@ from decimal import Decimal
import django.core.validators
import django.db.models.deletion
import i18nfield.fields
from argon2.exceptions import HashingError
from django.conf import settings
from django.contrib.auth.hashers import make_password
from django.db import migrations, models
@@ -26,14 +25,7 @@ def initial_user(apps, schema_editor):
user = User(email='admin@localhost')
user.is_staff = True
user.is_superuser = True
try:
user.password = make_password('admin')
except HashingError:
raise Exception(
"Could not hash password of initial user with argon2id. If this is a system with less than 8 CPU cores, "
"you might need to disable argon2id by setting `passwords_argon2=off` in the `[django]` section of the "
"pretix.cfg configuration file."
)
user.password = make_password('admin')
user.save()

View File

@@ -3204,9 +3204,9 @@ class InvoiceAddress(models.Model):
company = models.CharField(max_length=255, blank=True, verbose_name=_('Company name'))
name_cached = models.CharField(max_length=255, verbose_name=_('Full name'), blank=True)
name_parts = models.JSONField(default=dict)
street = models.TextField(verbose_name=_('Address'), blank=True)
zipcode = models.CharField(max_length=30, verbose_name=_('ZIP code'), blank=True)
city = models.CharField(max_length=255, verbose_name=_('City'), blank=True)
street = models.TextField(verbose_name=_('Address'), blank=False)
zipcode = models.CharField(max_length=30, verbose_name=_('ZIP code'), blank=False)
city = models.CharField(max_length=255, verbose_name=_('City'), blank=False)
country_old = models.CharField(max_length=255, verbose_name=_('Country'), blank=False)
country = FastCountryField(verbose_name=_('Country'), blank=False, blank_label=_('Select country'),
countries=CachedCountries)

View File

@@ -22,30 +22,16 @@
import pycountry
from django.http import JsonResponse
from pretix.base.addressvalidation import (
COUNTRIES_WITH_STREET_ZIPCODE_AND_CITY_REQUIRED,
)
from pretix.base.models.tax import VAT_ID_COUNTRIES
from pretix.base.settings import COUNTRIES_WITH_STATE_IN_ADDRESS
def states(request):
cc = request.GET.get("country", "DE")
info = {
'street': {'required': True},
'zipcode': {'required': cc in COUNTRIES_WITH_STREET_ZIPCODE_AND_CITY_REQUIRED},
'city': {'required': cc in COUNTRIES_WITH_STREET_ZIPCODE_AND_CITY_REQUIRED},
'state': {'visible': cc in COUNTRIES_WITH_STATE_IN_ADDRESS, 'required': cc in COUNTRIES_WITH_STATE_IN_ADDRESS},
'vat_id': {'visible': cc in VAT_ID_COUNTRIES, 'required': False},
}
if cc not in COUNTRIES_WITH_STATE_IN_ADDRESS:
return JsonResponse({'data': [], **info, })
return JsonResponse({'data': []})
types, form = COUNTRIES_WITH_STATE_IN_ADDRESS[cc]
statelist = [s for s in pycountry.subdivisions.get(country_code=cc) if s.type in types]
return JsonResponse({
'data': [
{'name': s.name, 'code': s.code[3:]}
for s in sorted(statelist, key=lambda s: s.name)
],
**info,
})
return JsonResponse({'data': [
{'name': s.name, 'code': s.code[3:]}
for s in sorted(statelist, key=lambda s: s.name)
]})

View File

@@ -61,7 +61,6 @@
<script type="text/javascript" src="{% static "fileupload/jquery.fileupload.js" %}"></script>
<script type="text/javascript" src="{% static "lightbox/js/lightbox.js" %}"></script>
<script type="text/javascript" src="{% static "are-you-sure/jquery.are-you-sure.js" %}"></script>
<script type="text/javascript" src="{% static "pretixbase/js/addressform.js" %}"></script>
{% endcompress %}
{{ html_head|safe }}

View File

@@ -46,13 +46,11 @@
<div id="cp{{ pos.id }}">
<div class="panel-body">
{% for form in forms %}
<div class="profile-scope">
{% if form.pos.item != pos.item %}
{# Add-Ons #}
<legend>+ {{ form.pos.item }}</legend>
{% endif %}
{% bootstrap_form form layout="control" %}
</div>
{% if form.pos.item != pos.item %}
{# Add-Ons #}
<legend>+ {{ form.pos.item }}</legend>
{% endif %}
{% bootstrap_form form layout="control" %}
{% endfor %}
</div>
</div>

View File

@@ -8,17 +8,16 @@ msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-11-19 15:34+0000\n"
"PO-Revision-Date: 2024-11-25 18:00+0000\n"
"Last-Translator: Jakub Stribrny <kubajznik@users.noreply.translate.pretix.eu>"
"\n"
"Language-Team: Czech <https://translate.pretix.eu/projects/pretix/pretix/cs/>"
"\n"
"PO-Revision-Date: 2023-09-15 15:21+0000\n"
"Last-Translator: Michael <michael.happl@gmx.at>\n"
"Language-Team: Czech <https://translate.pretix.eu/projects/pretix/pretix/cs/"
">\n"
"Language: cs\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
"X-Generator: Weblate 5.8.3\n"
"X-Generator: Weblate 5.0.1\n"
#: pretix/_base_settings.py:79
msgid "English"
@@ -12462,7 +12461,7 @@ msgstr ""
#: pretix/control/forms/checkin.py:176
msgid "Barcode"
msgstr "Čárový kód"
msgstr ""
#: pretix/control/forms/checkin.py:179
msgid "Check-in time"
@@ -12475,8 +12474,6 @@ msgstr "Typ check-inu"
#: pretix/control/forms/checkin.py:187
msgid "Allow check-in of unpaid order (if check-in list permits it)"
msgstr ""
"Povolit check-in pro nezaplacenou objednávku (pokud to seznam check-in "
"dovoluje)"
#: pretix/control/forms/checkin.py:191
msgid "Support for check-in questions"
@@ -12511,11 +12508,11 @@ msgstr "Časové pásmo akce"
#: pretix/control/forms/event.py:140
msgid "I don't want to specify taxes now"
msgstr "Přidat podrobnosti o daních později"
msgstr ""
#: pretix/control/forms/event.py:141
msgid "You can always configure tax rates later."
msgstr "Daňové sazby můžete nastavit kdykoliv."
msgstr ""
#: pretix/control/forms/event.py:145
msgid "Sales tax rate"

View File

@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-11-19 15:34+0000\n"
"PO-Revision-Date: 2024-11-27 03:00+0000\n"
"PO-Revision-Date: 2024-11-19 15:15+0000\n"
"Last-Translator: CVZ-es <damien.bremont@casadevelazquez.org>\n"
"Language-Team: Spanish <https://translate.pretix.eu/projects/pretix/pretix/"
"es/>\n"
@@ -3799,7 +3799,7 @@ msgstr "Todos los productos (incluso los recién creados)"
#: pretix/base/models/checkin.py:56 pretix/plugins/badges/exporters.py:436
#: pretix/plugins/checkinlists/exporters.py:842
msgid "Limit to products"
msgstr "Límite a los productos"
msgstr "Limita a los productos"
#: pretix/base/models/checkin.py:60
msgid ""
@@ -9565,7 +9565,7 @@ msgstr ""
#: pretix/base/settings.py:1175
msgid "Introductory text"
msgstr "Texto de introducción"
msgstr "Texto introductorio"
#: pretix/base/settings.py:1176
msgid "Will be printed on every invoice above the invoice rows."
@@ -12822,11 +12822,11 @@ msgstr "Zona horaria del evento"
#: pretix/control/forms/event.py:140
msgid "I don't want to specify taxes now"
msgstr "No quiero especificar los impuestos ahora"
msgstr ""
#: pretix/control/forms/event.py:141
msgid "You can always configure tax rates later."
msgstr "Siempre puede configurar los tipos impositivos más adelante."
msgstr ""
#: pretix/control/forms/event.py:145
msgid "Sales tax rate"
@@ -12879,8 +12879,6 @@ msgid ""
"You have not specified a tax rate. If you do not want us to compute sales "
"taxes, please check \"{field}\" above."
msgstr ""
"No ha especificado el tipo impositivo. Si no desea que calculemos los "
"impuestos sobre las ventas, marque «{field}» más arriba."
#: pretix/control/forms/event.py:308
msgid "Copy configuration from"

View File

@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: 1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-11-19 15:34+0000\n"
"PO-Revision-Date: 2024-11-27 03:00+0000\n"
"PO-Revision-Date: 2024-11-19 15:15+0000\n"
"Last-Translator: CVZ-es <damien.bremont@casadevelazquez.org>\n"
"Language-Team: French <https://translate.pretix.eu/projects/pretix/pretix/fr/"
">\n"
@@ -416,9 +416,7 @@ msgstr "Une facture existe déjà pour cet ordre."
#: pretix/api/views/order.py:637 pretix/control/views/orders.py:1716
#: pretix/control/views/users.py:143
msgid "There was an error sending the mail. Please try again later."
msgstr ""
"Une erreur s'est produite lors de l'envoi de l'e-mail. Veuillez réessayer "
"plus tard."
msgstr "Il y a eu une erreur d'envoi du mail. Veuillez réessayer plus tard."
#: pretix/api/views/order.py:715 pretix/base/services/cart.py:215
#: pretix/base/services/orders.py:186 pretix/presale/views/order.py:799
@@ -1413,7 +1411,7 @@ msgstr "Adresse"
#: pretix/plugins/checkinlists/exporters.py:533
#: pretix/plugins/reports/exporters.py:841
msgid "ZIP code"
msgstr "Code postal"
msgstr "Code Postal"
#: pretix/base/exporters/invoices.py:209 pretix/base/exporters/invoices.py:217
#: pretix/base/exporters/invoices.py:335 pretix/base/exporters/invoices.py:343
@@ -1497,7 +1495,7 @@ msgstr "Destinataire de facture:"
#: pretix/presale/templates/pretixpresale/event/checkout_confirm.html:83
#: pretix/presale/templates/pretixpresale/event/order.html:307
msgid "Company"
msgstr "Entreprise"
msgstr "Société"
#: pretix/base/exporters/invoices.py:215 pretix/base/exporters/invoices.py:341
msgid "Street address"
@@ -2136,7 +2134,7 @@ msgstr "Règle fiscale"
#: pretix/base/exporters/orderlist.py:644
#: pretix/base/exporters/orderlist.py:648 pretix/base/pdf.py:330
msgid "Invoice address name"
msgstr "Nom de l'adresse de facturation"
msgstr "Adresse de facturation"
#: pretix/base/exporters/orderlist.py:480
#: pretix/base/exporters/orderlist.py:683 pretix/base/models/orders.py:204
@@ -2235,7 +2233,7 @@ msgstr "Nom du participant"
#: pretix/presale/templates/pretixpresale/event/fragment_cart.html:176
#: pretix/presale/templates/pretixpresale/event/fragment_cart.html:179
msgid "Attendee email"
msgstr "E-mail du participant"
msgstr "Adresse mail du participant"
#: pretix/base/exporters/orderlist.py:609 pretix/base/models/vouchers.py:312
#: pretix/control/templates/pretixcontrol/vouchers/bulk.html:5
@@ -2321,19 +2319,19 @@ msgstr "Add-on à la position ID"
#: pretix/base/exporters/orderlist.py:650 pretix/base/pdf.py:340
msgid "Invoice address street"
msgstr "Adresse de facturation (rue)"
msgstr "Adresse de facturation: rue"
#: pretix/base/exporters/orderlist.py:650 pretix/base/pdf.py:345
msgid "Invoice address ZIP code"
msgstr "Adresse de facturation (Code postal)"
msgstr "Adresse de facturation: code postal"
#: pretix/base/exporters/orderlist.py:650 pretix/base/pdf.py:350
msgid "Invoice address city"
msgstr "Adresse de facturation (ville)"
msgstr "Adresse de facturation : ville"
#: pretix/base/exporters/orderlist.py:651 pretix/base/pdf.py:360
msgid "Invoice address country"
msgstr "Adresse de facturation (pays)"
msgstr "Adresse de facturation : pays"
#: pretix/base/exporters/orderlist.py:652
msgctxt "address"
@@ -3589,7 +3587,7 @@ msgstr "Vous ne pouvez pas attribuer un poste secret qui existe déjà."
#: pretix/base/modelimport_orders.py:490
msgid "Please enter a valid language code."
msgstr "Veuillez saisir un code linguistique valide."
msgstr "Veuillez saisir un code de langue valide."
#: pretix/base/modelimport_orders.py:558 pretix/base/modelimport_orders.py:560
msgid "Please enter a valid sales channel."
@@ -3612,8 +3610,8 @@ msgstr "Aucun siège correspondant na été trouvé."
msgid ""
"The seat you selected has already been taken. Please select a different seat."
msgstr ""
"La place que vous avez choisie est déjà occupée. Veuillez choisir une autre "
"place."
"Le siège que vous avez sélectionné a déjà été pris. Veuillez sélectionner un "
"autre siège."
#: pretix/base/modelimport_orders.py:592 pretix/base/services/cart.py:209
msgid "You need to select a specific seat."
@@ -3731,7 +3729,7 @@ msgstr "Vous devez choisir le produit « {prod} » pour ce siège."
#: pretix/control/templates/pretixcontrol/vouchers/tags.html:42
#: pretix/control/views/vouchers.py:120
msgid "Tag"
msgstr "Balise"
msgstr "Tag"
#: pretix/base/modelimport_vouchers.py:334 pretix/base/models/vouchers.py:297
msgid "Shows hidden products that match this voucher"
@@ -3998,7 +3996,7 @@ msgstr ""
#: pretix/base/models/customers.py:310 pretix/base/models/orders.py:1534
#: pretix/base/models/orders.py:3204 pretix/base/settings.py:1108
msgid "Company name"
msgstr "Nom de l'entreprise"
msgstr "Nom de la société"
#: pretix/base/models/customers.py:314 pretix/base/models/orders.py:1538
#: pretix/base/models/orders.py:3211 pretix/base/settings.py:81
@@ -5782,7 +5780,7 @@ msgstr "expiré"
#: pretix/base/models/orders.py:253 pretix/control/forms/filter.py:560
#: pretix/control/templates/pretixcontrol/organizers/customer.html:64
msgid "Locale"
msgstr "Langue"
msgstr "Régionalisation"
#: pretix/base/models/orders.py:268 pretix/control/forms/filter.py:571
#: pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/refund_export.html:57
@@ -6068,7 +6066,7 @@ msgstr "Badge"
#: pretix/control/templates/pretixcontrol/checkin/checkins.html:66
#: pretix/plugins/ticketoutputpdf/ticketoutput.py:113
msgid "Ticket"
msgstr "Billet"
msgstr "Ticket"
#: pretix/base/models/orders.py:3405
msgid "Certificate"
@@ -6474,7 +6472,7 @@ msgstr ""
#: pretix/control/templates/pretixcontrol/vouchers/index.html:6
#: pretix/control/templates/pretixcontrol/vouchers/index.html:8
msgid "Vouchers"
msgstr "Bons d'achat"
msgstr "Bons de réduction"
#: pretix/base/models/vouchers.py:339
msgid "You cannot select a quota that belongs to a different event."
@@ -7178,7 +7176,7 @@ msgstr "Jacques Martin"
#: pretix/presale/templates/pretixpresale/event/fragment_cart.html:186
#: pretix/presale/templates/pretixpresale/event/fragment_cart.html:189
msgid "Attendee company"
msgstr "Entreprise du participant"
msgstr "Entreprise participante"
#: pretix/base/pdf.py:178 pretix/base/pdf.py:336
#: pretix/base/services/tickets.py:118 pretix/control/views/pdf.py:111
@@ -7322,7 +7320,7 @@ msgstr "Ville quelconque"
#: pretix/base/pdf.py:335
msgid "Invoice address company"
msgstr "Adresse de facturation de l'entreprise"
msgstr "Adresse de la facturation de l'entreprise"
#: pretix/base/pdf.py:341
msgid "Sesame Street 42"
@@ -7495,7 +7493,7 @@ msgstr "Nom du participant pour la formule de salutation"
#: pretix/base/services/placeholders.py:567
#: pretix/control/forms/organizer.py:612
msgid "Mr Doe"
msgstr "M. Doe"
msgstr "M. Dupont"
#: pretix/base/pdf.py:655 pretix/base/pdf.py:662
#: pretix/plugins/badges/exporters.py:501
@@ -12957,11 +12955,11 @@ msgstr "Fuseau horaire de l'événement"
#: pretix/control/forms/event.py:140
msgid "I don't want to specify taxes now"
msgstr "Je ne veux pas spécifier les taxes maintenant"
msgstr ""
#: pretix/control/forms/event.py:141
msgid "You can always configure tax rates later."
msgstr "Vous pouvez toujours configurer les taux d'imposition ultérieurement."
msgstr ""
#: pretix/control/forms/event.py:145
msgid "Sales tax rate"
@@ -13016,9 +13014,6 @@ msgid ""
"You have not specified a tax rate. If you do not want us to compute sales "
"taxes, please check \"{field}\" above."
msgstr ""
"Vous n'avez pas spécifié de taux d'imposition. Si vous ne souhaitez pas que "
"nous calculions les impôts sur les ventes, veuillez cocher \"{field}\" ci-"
"dessus."
#: pretix/control/forms/event.py:308
msgid "Copy configuration from"
@@ -13775,7 +13770,7 @@ msgstr "Prévente terminée"
#: pretix/control/forms/filter.py:2339
#: pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/import_form.html:84
msgid "Date from"
msgstr "Date à partir de"
msgstr "Date de début"
#: pretix/control/forms/filter.py:1211 pretix/control/forms/filter.py:1214
#: pretix/control/forms/filter.py:1710 pretix/control/forms/filter.py:1713
@@ -16986,7 +16981,7 @@ msgstr "Widget"
#: pretix/control/templates/pretixcontrol/event/payment.html:47
#: pretix/control/templates/pretixcontrol/waitinglist/index.html:12
msgid "Settings"
msgstr "Paramètres"
msgstr "Réglages"
#: pretix/control/navigation.py:164
msgid "Categories"
@@ -17020,7 +17015,7 @@ msgstr "Tous les bons de réduction"
#: pretix/control/navigation.py:284
msgid "Tags"
msgstr "Balises"
msgstr "Tags"
#: pretix/control/navigation.py:296
msgctxt "navigation"
@@ -17856,7 +17851,7 @@ msgstr "Supprimer"
#: pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/import_form.html:91
#: pretix/presale/templates/pretixpresale/fragment_event_list_filter.html:21
msgid "Filter"
msgstr "Filtrer"
msgstr "Filtre"
#: pretix/control/templates/pretixcontrol/checkin/checkins.html:50
msgid "Your search did not match any check-ins."
@@ -17917,7 +17912,7 @@ msgstr "Refusé"
#: pretix/control/templates/pretixcontrol/checkin/checkins.html:152
#: pretix/control/templates/pretixcontrol/event/index.html:24
msgid "Copy to clipboard"
msgstr "Copier dans le presse-papier"
msgstr "Copier dans le Presse-papiers"
#: pretix/control/templates/pretixcontrol/checkin/index.html:7
#: pretix/control/templates/pretixcontrol/checkin/index.html:11
@@ -21947,7 +21942,7 @@ msgstr ""
#: pretix/control/templates/pretixcontrol/order/index.html:229
msgid "Contact email"
msgstr "E-mail de contact"
msgstr "Email de contact"
#: pretix/control/templates/pretixcontrol/order/index.html:233
msgid ""
@@ -22209,21 +22204,21 @@ msgstr "Historique des commandes"
#: pretix/plugins/sendmail/templates/pretixplugins/sendmail/history.html:4
#: pretix/plugins/sendmail/templates/pretixplugins/sendmail/history.html:6
msgid "Email history"
msgstr "Historique de l'e-mail"
msgstr "Historique des e-mails"
#: pretix/control/templates/pretixcontrol/order/mail_history.html:33
msgid ""
"This email has been sent with an older version of pretix. We are therefore "
"not able to display it here accurately."
msgstr ""
"Cet e-mail a été envoyé avec une ancienne version de pretix. Nous ne sommes "
"Cet email a été envoyé avec une ancienne version de pretix. Nous ne sommes "
"donc pas en mesure de l'afficher correctement ici."
#: pretix/control/templates/pretixcontrol/order/mail_history.html:39
#: pretix/control/templates/pretixcontrol/order/mail_history.html:50
#: pretix/plugins/sendmail/templates/pretixplugins/sendmail/history.html:30
msgid "Subject:"
msgstr "Sujet :"
msgstr "Sujet:"
#: pretix/control/templates/pretixcontrol/order/pay.html:5
#: pretix/control/templates/pretixcontrol/order/pay.html:9
@@ -22862,7 +22857,7 @@ msgstr "Aperçu des données"
#: pretix/control/templates/pretixcontrol/orders/import_process.html:43
#: pretix/control/templates/pretixcontrol/vouchers/import_process.html:43
msgid "Import settings"
msgstr "Importer les paramètres"
msgstr "Paramétrages dimportation"
#: pretix/control/templates/pretixcontrol/orders/import_process.html:49
#: pretix/control/templates/pretixcontrol/vouchers/import_process.html:49
@@ -22870,13 +22865,13 @@ msgid ""
"The import will be performed regardless of your quotas, so it will be "
"possible to overbook your event using this option."
msgstr ""
"L'importation sera effectuée sans tenir compte de vos quotas, de sorte qu'il "
"sera possible de surbooker votre événement à l'aide de cette option."
"Limportation sera effectuée quels que soient vos quotas, il sera donc "
"possible de surréserver votre événement en utilisant cette option."
#: pretix/control/templates/pretixcontrol/orders/import_process.html:57
#: pretix/control/templates/pretixcontrol/vouchers/import_process.html:57
msgid "Perform import"
msgstr "Réaliser l'importation"
msgstr "Effectuer limportation"
#: pretix/control/templates/pretixcontrol/orders/import_start.html:10
#: pretix/control/templates/pretixcontrol/vouchers/import_start.html:10
@@ -22890,15 +22885,15 @@ msgid ""
"The uploaded file should be a CSV file with a header row. You will be able "
"to assign the meanings of the different columns in the next step."
msgstr ""
"Le fichier téléchargé doit être un fichier CSV avec une ligne d'en-tête. "
"Vous pourrez définir la signification des différentes colonnes à l'étape "
"Le fichier téléchargé doit être un fichier CSV avec une ligne den-tête. "
"Vous pourrez attribuer les significations des différentes colonnes à létape "
"suivante."
#: pretix/control/templates/pretixcontrol/orders/import_start.html:22
#: pretix/control/templates/pretixcontrol/vouchers/import_start.html:22
#: pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/import_form.html:46
msgid "Import file"
msgstr "Importer le fichier"
msgstr "Importer un fichier"
#: pretix/control/templates/pretixcontrol/orders/import_start.html:25
#: pretix/control/templates/pretixcontrol/vouchers/import_start.html:25
@@ -22913,7 +22908,7 @@ msgstr "Détecter automatiquement"
#: pretix/control/templates/pretixcontrol/orders/import_start.html:35
#: pretix/control/templates/pretixcontrol/vouchers/import_start.html:35
msgid "Start import"
msgstr "Lancer l'importation"
msgstr "Démarrer l'exportation"
#: pretix/control/templates/pretixcontrol/orders/index.html:14
msgid "Nobody ordered a ticket yet."
@@ -25526,7 +25521,7 @@ msgstr "Créer plusieurs bons"
#: pretix/control/templates/pretixcontrol/vouchers/bulk.html:12
msgid "Voucher codes"
msgstr "Codes de bons d'achat"
msgstr "Codes de réduction"
#: pretix/control/templates/pretixcontrol/vouchers/bulk.html:17
msgid "Prefix (optional)"
@@ -25705,7 +25700,7 @@ msgstr "Expiration"
#: pretix/control/templates/pretixcontrol/vouchers/index.html:183
#, python-format
msgid "Any product in quota \"%(quota)s\""
msgstr "Tout produit dans le quota « %(quota)s »"
msgstr "Tout produit dans le quota \"%(quota)s\""
#: pretix/control/templates/pretixcontrol/vouchers/index.html:200
msgid "Use as a template for new vouchers"
@@ -26816,7 +26811,9 @@ msgstr[1] ""
#: pretix/presale/views/order.py:1279 pretix/presale/views/order.py:1662
#: pretix/presale/views/order.py:1693
msgid "Unknown order code or not authorized to access this order."
msgstr "Code de commande inconnu ou non autorisé pour accéder à cette commande."
msgstr ""
"Code de commande inconnu ou utilisateur non autorisé à accéder à cette "
"commande."
#: pretix/control/views/orders.py:675 pretix/presale/views/order.py:1111
msgid "Ticket download is not enabled for this product."
@@ -29300,7 +29297,7 @@ msgstr "Date de téléchargement"
#: pretix/plugins/checkinlists/exporters.py:767
msgid "Upload time"
msgstr "Temps de chargement"
msgstr "Temps de téléchargement"
#: pretix/plugins/checkinlists/exporters.py:818
msgid "OK"
@@ -33147,7 +33144,7 @@ msgstr "Nous appliquons ce bon de réduction à votre panier..."
#: pretix/presale/templates/pretixpresale/event/fragment_cart_box.html:56
#: pretix/presale/templates/pretixpresale/event/fragment_voucher_form.html:26
msgid "Redeem voucher"
msgstr "Utiliser le bon d'achat"
msgstr "Utiliser bon d'achat"
#: pretix/presale/templates/pretixpresale/event/fragment_change_confirm.html:10
msgid "Change summary"

View File

@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-11-19 15:34+0000\n"
"PO-Revision-Date: 2024-11-27 03:00+0000\n"
"PO-Revision-Date: 2024-11-15 20:00+0000\n"
"Last-Translator: Patrick Chilton <chpatrick@gmail.com>\n"
"Language-Team: Hungarian <https://translate.pretix.eu/projects/pretix/pretix/"
"hu/>\n"
@@ -7720,7 +7720,8 @@ msgid ""
"You are receiving this email because someone placed an order for {event} for "
"you."
msgstr ""
"Ezt az emailt a következő eseményre való rendelésed kapcsán küldtük: {event}"
"Azért küldtük ezt az e-mailt mert valaki rendelt neked jegyet a következő "
"eseményre: {event}"
#: pretix/base/services/mail.py:282 pretix/base/services/mail.py:298
#, python-brace-format
@@ -9716,7 +9717,7 @@ msgid ""
msgstr ""
"Szia!\n"
"\n"
"A rendelésed sikeres volt a következő eseményre: {event}.\n"
"A rendelésed sikeres volt a következő eseményre: {event}\n"
"Mivel csak ingyenes termékeket rendeltél, nem kell fizetned.\n"
"\n"
"Módosíthatod a rendelésed részleteit és megtekintheted az állapotát a "
@@ -10256,7 +10257,7 @@ msgid ""
msgstr ""
"Szia!\n"
"\n"
"Elfogadtuk a rendelésedet a következő eseményre és örömmel várunk: {event}.\n"
"Elfogadtuk a rendelésedet a következő eseményre és örömmel várunk: {event}\n"
"Mivel csak ingyenes termékeket rendeltél, nem kell fizetned.\n"
"\n"
"Módosíthatod a rendelésed részleteit és megtekintheted az állapotát a "
@@ -28973,7 +28974,7 @@ msgstr "Összes jegy letöltése (PDF)"
#: pretix/plugins/ticketoutputpdf/ticketoutput.py:66
msgid "Download ticket (PDF)"
msgstr "Jegy PDF letöltése"
msgstr ""
#: pretix/plugins/ticketoutputpdf/views.py:62
msgid "Default ticket layout"
@@ -31107,11 +31108,11 @@ msgstr ""
#: pretix/presale/templates/pretixpresale/event/position.html:10
msgid "Your registration"
msgstr "A rendelésed"
msgstr ""
#: pretix/presale/templates/pretixpresale/event/position.html:31
msgid "Your items"
msgstr "A tételeid"
msgstr ""
#: pretix/presale/templates/pretixpresale/event/position.html:46
msgid "Additional information"

View File

@@ -8,16 +8,16 @@ msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-11-08 13:45+0000\n"
"PO-Revision-Date: 2024-11-28 06:00+0000\n"
"PO-Revision-Date: 2024-10-01 22:52+0000\n"
"Last-Translator: Patrick Chilton <chpatrick@gmail.com>\n"
"Language-Team: Hungarian <https://translate.pretix.eu/projects/pretix/"
"pretix-js/hu/>\n"
"Language-Team: Hungarian <https://translate.pretix.eu/projects/pretix/pretix-"
"js/hu/>\n"
"Language: hu\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 5.8.3\n"
"X-Generator: Weblate 5.7.2\n"
#: pretix/plugins/banktransfer/static/pretixplugins/banktransfer/ui.js:56
#: pretix/plugins/banktransfer/static/pretixplugins/banktransfer/ui.js:62
@@ -779,7 +779,7 @@ msgstr "A kosár lejárt"
#: pretix/static/pretixpresale/js/ui/main.js:588
#: pretix/static/pretixpresale/js/ui/main.js:607
msgid "Time zone:"
msgstr "Időzona:"
msgstr ""
#: pretix/static/pretixpresale/js/ui/main.js:598
msgid "Your local time:"

View File

@@ -8,8 +8,8 @@ msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-11-19 15:34+0000\n"
"PO-Revision-Date: 2024-11-24 01:00+0000\n"
"Last-Translator: gabriblas <github@unowen.simplelogin.com>\n"
"PO-Revision-Date: 2024-11-18 02:00+0000\n"
"Last-Translator: Damiano <estux@users.noreply.translate.pretix.eu>\n"
"Language-Team: Italian <https://translate.pretix.eu/projects/pretix/pretix/"
"it/>\n"
"Language: it\n"
@@ -4424,9 +4424,6 @@ msgid ""
"If checked, an event can only be taken live if the property is set. In event "
"series, its always optional to set a value for individual dates"
msgstr ""
"Se selezionato, un evento può essere pubblicato solamente se la proprietà è "
"stata impostata. Per le serie di eventi, impostare un valore per le date di "
"singoli eventi è sempre opzionale"
#: pretix/base/models/event.py:1721 pretix/base/models/items.py:2211
msgid "Valid values"
@@ -4590,10 +4587,6 @@ msgid ""
"their own. They can only be bought in combination with a product that has "
"this category configured as a possible source for add-ons."
msgstr ""
"Se selezionato, i prodotti che appartengono a questa categoria non potranno "
"essere venduti separatamente. Potranno invece essere acquistati in "
"combinazione con un altro prodotto che indichi questa categoria come un add-"
"on valido."
#: pretix/base/models/items.py:114 pretix/base/models/items.py:159
#: pretix/control/forms/item.py:99
@@ -4601,25 +4594,21 @@ msgid "Normal category"
msgstr "Categoria normale"
#: pretix/base/models/items.py:115 pretix/control/forms/item.py:112
#, fuzzy
msgid "Normal + cross-selling category"
msgstr "Categoria normale + cross-selling"
msgstr ""
#: pretix/base/models/items.py:116 pretix/control/forms/item.py:107
#, fuzzy
msgid "Cross-selling category"
msgstr "Categoria cross-selling"
msgstr ""
#: pretix/base/models/items.py:124
msgid "Always show in cross-selling step"
msgstr "Visualizza sempre nello step di cross-selling (vendita aggiuntiva)"
msgstr ""
#: pretix/base/models/items.py:125
msgid ""
"Only show products that qualify for a discount according to discount rules"
msgstr ""
"Visualizza solamente prodotti su cui è applicabile uno sconto, in base alle "
"regole di sconto"
#: pretix/base/models/items.py:126
msgid "Only show if the cart contains one of the following products"
@@ -4627,7 +4616,7 @@ msgstr "Mostra solo se il carrello contiene uno dei seguenti prodotti"
#: pretix/base/models/items.py:129
msgid "Cross-selling condition"
msgstr "Condizione per il cross-selling (vendita aggiuntiva)"
msgstr ""
#: pretix/base/models/items.py:137
#, fuzzy
@@ -7167,7 +7156,7 @@ msgstr ""
#: pretix/base/pdf.py:500
msgid "Seat: row"
msgstr "Posto: fila"
msgstr ""
#: pretix/base/pdf.py:505
msgid "Seat: seat number"
@@ -7579,7 +7568,7 @@ msgstr ""
#: pretix/base/services/cart.py:210
msgid "Please select a valid seat."
msgstr "Si prega di selezionare un posto a sedere valido."
msgstr ""
#: pretix/base/services/cart.py:211
msgid "You can not select a seat for this position."
@@ -8026,7 +8015,7 @@ msgstr ""
#: pretix/base/services/modelimport.py:236
#, python-brace-format
msgid "Invalid data in row {row}: {message}"
msgstr "Dati invalidi alla linea {row}: {message}"
msgstr ""
#: pretix/base/services/modelimport.py:217
msgid "A voucher cannot be created without a code."

View File

@@ -8,8 +8,8 @@ msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-11-19 15:34+0000\n"
"PO-Revision-Date: 2024-11-21 12:58+0000\n"
"Last-Translator: Ryo <saremba@rami.io>\n"
"PO-Revision-Date: 2024-10-22 17:00+0000\n"
"Last-Translator: Yasunobu YesNo Kawaguchi <kawaguti@gmail.com>\n"
"Language-Team: Japanese <https://translate.pretix.eu/projects/pretix/pretix/"
"ja/>\n"
"Language: ja\n"
@@ -17,7 +17,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Weblate 5.8.3\n"
"X-Generator: Weblate 5.7.2\n"
#: pretix/_base_settings.py:79
msgid "English"
@@ -44,6 +44,7 @@ msgid "Catalan"
msgstr "カタルーニャ語"
#: pretix/_base_settings.py:85
#, fuzzy
msgid "Chinese (simplified)"
msgstr "中国語(簡体字)"
@@ -56,6 +57,7 @@ msgid "Czech"
msgstr "チェコ"
#: pretix/_base_settings.py:88
#, fuzzy
msgid "Danish"
msgstr "デンマーク語"
@@ -121,11 +123,11 @@ msgstr "ロシア語"
#: pretix/_base_settings.py:104
msgid "Slovak"
msgstr "スロバキア語"
msgstr ""
#: pretix/_base_settings.py:105
msgid "Swedish"
msgstr "スウェーデン語"
msgstr ""
#: pretix/_base_settings.py:106
msgid "Spanish"
@@ -282,7 +284,7 @@ msgstr ""
#: pretix/api/serializers/item.py:306
msgid "Only admission products can currently be personalized."
msgstr "現在、パーソナライズできるのは入場商品(チケット)のみです。"
msgstr ""
#: pretix/api/serializers/item.py:317
msgid ""
@@ -376,11 +378,11 @@ msgstr "このユーザーは既にチームへの参加を承認されていま
#: pretix/api/views/cart.py:209
msgid ""
"The specified voucher has already been used the maximum number of times."
msgstr "指定されたバウチャーは、すでに最大使用回数に達しています。"
msgstr ""
#: pretix/api/views/checkin.py:610 pretix/api/views/checkin.py:617
msgid "Medium connected to other event"
msgstr "他のイベントに関連付けられているメディアです"
msgstr ""
#: pretix/api/views/oauth.py:107 pretix/control/logdisplay.py:476
#, python-brace-format
@@ -467,7 +469,7 @@ msgstr "外部からの払い戻し"
#: pretix/api/webhooks.py:285
msgid "Refund of payment requested by customer"
msgstr "お客様から支払いの返金が要求されました"
msgstr ""
#: pretix/api/webhooks.py:289
#, fuzzy
@@ -541,8 +543,7 @@ msgstr "イベント情報のデータが削除されました"
msgid ""
"Product changed (including product added or deleted and including changes to "
"nested objects like variations or bundles)"
msgstr "製品が変更されました(製品の追加または削除、バリエーションやバンドルのような"
"ネストされたオブジェクトの変更を含む)"
msgstr ""
#: pretix/api/webhooks.py:354
#, fuzzy
@@ -566,7 +567,7 @@ msgstr "その金額がカードに請求されました。"
#: pretix/api/webhooks.py:370
msgid "Waiting list entry added"
msgstr "ウェイティングリストにエントリーが追加されました"
msgstr ""
#: pretix/api/webhooks.py:374
#, fuzzy
@@ -580,7 +581,7 @@ msgstr "その金額がカードに請求されました。"
#: pretix/api/webhooks.py:382
msgid "Waiting list entry received voucher"
msgstr "ウェイティングリストのエントリーがバウチャーを受け取りました"
msgstr ""
#: pretix/api/webhooks.py:386
#, fuzzy
@@ -607,15 +608,15 @@ msgstr "国"
#: pretix/plugins/banktransfer/payment.py:679
#: pretix/presale/forms/customer.py:140
msgid "This field is required."
msgstr "この項目は必須です。"
msgstr ""
#: pretix/base/addressvalidation.py:213
msgid "Enter a postal code in the format XXX."
msgstr "郵便番号をXXXの形式で入力してください。"
msgstr ""
#: pretix/base/addressvalidation.py:222 pretix/base/addressvalidation.py:224
msgid "Enter a postal code in the format XXXX."
msgstr "郵便番号をXXXXの形式で入力してください。"
msgstr ""
#: pretix/base/auth.py:146
#, python-brace-format
@@ -657,7 +658,7 @@ msgstr "パスワード"
#: pretix/base/auth.py:176 pretix/base/auth.py:183
msgid "Your password must contain both numeric and alphabetic characters."
msgstr "パスワードには数字とアルファベットの両方を含める必要があります。"
msgstr ""
#: pretix/base/auth.py:202 pretix/base/auth.py:212
#, python-format
@@ -665,8 +666,7 @@ msgid "Your password may not be the same as your previous password."
msgid_plural ""
"Your password may not be the same as one of your %(history_length)s previous "
"passwords."
msgstr[0] "パスワードは、過去%(history_length)s件のいずれかのパスワードと同じにすること"
"はできません。"
msgstr[0] ""
#: pretix/base/channels.py:168
msgid "Online shop"
@@ -674,14 +674,13 @@ msgstr "オンラインショップ"
#: pretix/base/channels.py:174
msgid "API"
msgstr "API"
msgstr ""
#: pretix/base/channels.py:175
msgid ""
"API sales channels come with no built-in functionality, but may be used for "
"custom integrations."
msgstr "API販売チャネルには組み込みの機能はありませんが、カスタムインテグレーションで"
"使用することができます。"
msgstr ""
#: pretix/base/context.py:45
#, python-brace-format
@@ -700,25 +699,25 @@ msgstr "ソースコード"
#: pretix/base/customersso/oidc.py:61
#, python-brace-format
msgid "Configuration option \"{name}\" is missing."
msgstr "設定オプション\"{name}\"がありません。"
msgstr ""
#: pretix/base/customersso/oidc.py:69 pretix/base/customersso/oidc.py:74
#, python-brace-format
msgid ""
"Unable to retrieve configuration from \"{url}\". Error message: \"{error}\"."
msgstr "\"{url}\"から設定を取得できませんでした。エラーメッセージ:\"{error}\"。"
msgstr ""
#: pretix/base/customersso/oidc.py:80 pretix/base/customersso/oidc.py:85
#: pretix/base/customersso/oidc.py:90 pretix/base/customersso/oidc.py:95
#: pretix/base/customersso/oidc.py:100 pretix/base/customersso/oidc.py:105
#, python-brace-format
msgid "Incompatible SSO provider: \"{error}\"."
msgstr "互換性のないSSOプロバイダー: \"{error}\"。"
msgstr ""
#: pretix/base/customersso/oidc.py:111
#, python-brace-format
msgid "You are not requesting \"{scope}\"."
msgstr "\"{scope}\" をリクエストしていません。"
msgstr ""
#: pretix/base/customersso/oidc.py:117
#, python-brace-format

View File

@@ -160,7 +160,7 @@ class BaseCheckoutFlowStep:
kwargs['cart_namespace'] = request.resolver_match.kwargs['cart_namespace']
return eventreverse(self.request.event, 'presale:event.index', kwargs=kwargs)
else:
return prev.get_step_url(request) + '?dir=prev'
return prev.get_step_url(request)
def get_next_url(self, request):
n = self.get_next_applicable(request)
@@ -662,7 +662,7 @@ class AddOnsStep(CartMixin, AsyncAction, TemplateFlowStep):
if 'async_id' in request.GET and settings.HAS_CELERY:
return self.get_result(request)
if len(self.forms) == 0 and len(self.cross_selling_data) == 0 and self.is_completed(request):
return redirect(self.get_prev_url(request) if request.GET.get('dir') == 'prev' else self.get_next_url(request))
return redirect(self.get_next_url(request))
return TemplateFlowStep.get(self, request)
def _clean_category(self, form, category):
@@ -1076,8 +1076,8 @@ class QuestionsStep(QuestionsViewMixin, CartMixin, TemplateFlowStep):
if warn:
messages.warning(request, _('Please fill in answers to all required questions.'))
return False
if cp.item.ask_attendee_data and self.request.event.settings.get('attendee_addresses_required', as_type=bool) \
and (cp.street is None and cp.city is None and cp.country is None):
if cp.item.ask_attendee_data and self.request.event.settings.get('attendee_attendees_required', as_type=bool) \
and (cp.street is None or cp.city is None or cp.country is None):
if warn:
messages.warning(request, _('Please fill in answers to all required questions.'))
return False

View File

@@ -133,7 +133,6 @@ class InvoiceAddressForm(BaseInvoiceAddressForm):
class InvoiceNameForm(InvoiceAddressForm):
address_validation = False
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)

View File

@@ -20,5 +20,4 @@
<script type="text/javascript" src="{% static "pretixpresale/js/ui/cart.js" %}"></script>
<script type="text/javascript" src="{% static "lightbox/js/lightbox.js" %}"></script>
<script type="text/javascript" src="{% static "pretixpresale/js/ui/iframe.js" %}"></script>
<script type="text/javascript" src="{% static "pretixbase/js/addressform.js" %}"></script>
{% endcompress %}

View File

@@ -89,7 +89,7 @@ class CheckoutView(View):
else:
previous_step = step
step.c_is_before = True
step.c_resolved_url = step.get_step_url(request) + '?dir=prev'
step.c_resolved_url = step.get_step_url(request)
raise Http404()
def redirect(self, url):

View File

@@ -726,11 +726,7 @@ PASSWORD_HASHERS = [
# the HistoricPassword model will not be changed automatically. In case a serious issue with a hasher
# comes to light, dropping the contents of the HistoricPassword table might be the more risk-adequate
# decision.
*(
["django.contrib.auth.hashers.Argon2PasswordHasher"]
if config.getboolean('django', 'passwords_argon2', fallback=True)
else []
),
"django.contrib.auth.hashers.Argon2PasswordHasher",
"django.contrib.auth.hashers.PBKDF2PasswordHasher",
"django.contrib.auth.hashers.PBKDF2SHA1PasswordHasher",
"django.contrib.auth.hashers.BCryptSHA256PasswordHasher",

View File

@@ -1,64 +0,0 @@
$(function () {
"use strict";
$("select[data-country-information-url]").each(function () {
let xhr;
const dependency = $(this),
loader = $("<span class='fa fa-cog fa-spin'></span>").hide().prependTo(dependency.closest(".form-group").find("label")),
url = this.getAttribute('data-country-information-url'),
form = dependency.closest(".panel-body, form, .profile-scope"),
isRequired = dependency.closest(".form-group").is(".required"),
dependents = {
'city': form.find("input[name$=city]"),
'zipcode': form.find("input[name$=zipcode]"),
'street': form.find("textarea[name$=street]"),
'state': form.find("select[name$=state]"),
'vat_id': form.find("input[name$=vat_id]"),
},
update = function (ev) {
if (xhr) {
xhr.abort();
}
for (var k in dependents) dependents[k].prop("disabled", true);
loader.show();
xhr = $.getJSON(url + '?country=' + dependency.val(), function (data) {
var selected_value = dependents.state.prop("data-selected-value");
if (selected_value) dependents.state.prop("data-selected-value", "");
dependents.state.find("option:not([value=''])").remove();
if (data.data.length > 0) {
$.each(data.data, function (k, s) {
var o = $("<option>").attr("value", s.code).text(s.name);
if (selected_value == s.code) o.prop("selected", true);
dependents.state.append(o);
});
}
for(var k in dependents) {
const options = data[k],
dependent = dependents[k],
visible = 'visible' in options ? options.visible : true,
required = 'required' in options && options.required && isRequired && visible;
dependent.closest(".form-group").toggle(visible).toggleClass('required', required);
dependent.prop("required", required);
}
for (var k in dependents) dependents[k].prop("disabled", false);
}).always(function() {
loader.hide();
}).fail(function(){
// In case of errors, show everything and require nothing, we can still handle errors in backend
for(var k in dependents) {
const dependent = dependents[k],
visible = true,
required = false;
dependent.closest(".form-group").toggle(visible).toggleClass('required', required);
dependent.prop("required", required);
}
});
};
dependents.state.prop("data-selected-value", dependents.state.val());
update();
dependency.on("change", update);
});
});

View File

@@ -434,6 +434,60 @@ var form_handlers = function (el) {
dependency.closest('.form-group').find('input[name=' + dependency.attr("name") + ']').on("dp.change", update);
});
$("input[name$=vat_id][data-countries-with-vat-id]").each(function () {
var dependent = $(this),
dependency_country = $(this).closest(".panel-body, form").find('select[name$=country]'),
dependency_id_is_business_1 = $(this).closest(".panel-body, form").find('input[id$=id_is_business_1]'),
update = function (ev) {
if (dependency_id_is_business_1.length && !dependency_id_is_business_1.prop("checked")) {
dependent.closest(".form-group").hide();
} else if (dependent.attr('data-countries-with-vat-id').split(',').includes(dependency_country.val())) {
dependent.closest(".form-group").show();
} else {
dependent.closest(".form-group").hide();
}
};
update();
dependency_country.on("change", update);
dependency_id_is_business_1.on("change", update);
});
$("select[name$=state]:not([data-static])").each(function () {
var dependent = $(this),
counter = 0,
dependency = $(this).closest(".panel-body, form").find('select[name$=country]'),
update = function (ev) {
counter++;
var curCounter = counter;
dependent.prop("disabled", true);
dependency.closest(".form-group").find("label").prepend("<span class='fa fa-cog fa-spin'></span> ");
$.getJSON('/js_helpers/states/?country=' + dependency.val(), function (data) {
if (counter > curCounter) {
return; // Lost race
}
dependent.find("option").filter(function (t) {return !!$(this).attr("value")}).remove();
if (data.data.length > 0) {
$.each(data.data, function (k, s) {
dependent.append($("<option>").attr("value", s.code).text(s.name));
});
dependent.closest(".form-group").show();
dependent.prop('required', dependency.prop("required"));
} else {
dependent.closest(".form-group").hide();
dependent.prop("required", false);
}
dependent.prop("disabled", false);
dependency.closest(".form-group").find("label .fa-spin").remove();
});
};
if (dependent.find("option").length === 1) {
dependent.closest(".form-group").hide();
} else {
dependent.prop('required', dependency.prop("required"));
}
dependency.on("change", update);
});
el.find("div.scrolling-choice:not(.no-search)").each(function () {
if ($(this).find("input[type=text]").length > 0) {
return;

View File

@@ -517,6 +517,65 @@ $(function () {
dependency.closest('.form-group, form').find('input[name=' + dependency.attr("name") + ']').on("dp.change", update);
});
$("input[name$=vat_id][data-countries-with-vat-id]").each(function () {
var dependent = $(this),
dependency_country = $(this).closest(".panel-body, form").find('select[name$=country]'),
dependency_id_is_business_1 = $(this).closest(".panel-body, form").find('input[id$=id_is_business_1]'),
update = function (ev) {
if (dependency_id_is_business_1.length && !dependency_id_is_business_1.prop("checked")) {
dependent.closest(".form-group").hide();
} else if (dependent.attr('data-countries-with-vat-id').split(',').includes(dependency_country.val())) {
dependent.closest(".form-group").show();
} else {
dependent.closest(".form-group").hide();
}
};
update();
dependency_country.on("change", update);
dependency_id_is_business_1.on("change", update);
});
$("select[name$=state]").each(function () {
var dependent = $(this),
counter = 0,
dependency = $(this).closest(".panel-body, form").find('select[name$=country]'),
update = function (ev) {
counter++;
var curCounter = counter;
dependent.prop("disabled", true);
dependency.closest(".form-group").find("label").prepend("<span class='fa fa-cog fa-spin'></span> ");
$.getJSON('/js_helpers/states/?country=' + dependency.val(), function (data) {
if (counter > curCounter) {
return; // Lost race
}
var selected_value = dependent.prop("data-selected-value");
dependent.find("option").filter(function (t) {return !!$(this).attr("value")}).remove();
if (data.data.length > 0) {
$.each(data.data, function (k, s) {
var o = $("<option>").attr("value", s.code).text(s.name);
if (s.code == selected_value || (selected_value && selected_value.indexOf && selected_value.indexOf(s.code) > -1)) {
o.prop("selected", true);
}
dependent.append(o);
});
dependent.closest(".form-group").show();
dependent.prop('required', dependency.prop("required"));
} else {
dependent.closest(".form-group").hide();
dependent.prop("required", false);
}
dependent.prop("disabled", false);
dependency.closest(".form-group").find("label .fa-spin").remove();
});
};
if (dependent.find("option").length === 1) {
dependent.closest(".form-group").hide();
} else {
dependent.prop('required', dependency.prop("required"));
}
dependency.on("change", update);
});
form_handlers($("body"));
var local_tz = moment.tz.guess()

View File

@@ -1,32 +0,0 @@
#
# This file is part of pretix (Community Edition).
#
# Copyright (C) 2014-2020 Raphael Michel and contributors
# Copyright (C) 2020-2021 rami.io GmbH and contributors
#
# This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General
# Public License as published by the Free Software Foundation in version 3 of the License.
#
# ADDITIONAL TERMS APPLY: Pursuant to Section 7 of the GNU Affero General Public License, additional terms are
# applicable granting you additional permissions and placing additional restrictions on your usage of this software.
# Please refer to the pretix LICENSE file to obtain the full terms applicable to this work. If you did not receive
# this file, see <https://pretix.eu/about/en/license>.
#
# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
# details.
#
# You should have received a copy of the GNU Affero General Public License along with this program. If not, see
# <https://www.gnu.org/licenses/>.
#
from pretix.base.forms.questions import name_parts_is_empty
def test_name_parts_is_empty():
assert name_parts_is_empty({}) is True
assert name_parts_is_empty({"_scheme": "foo"}) is True
assert name_parts_is_empty({"_scheme": "foo", "full_name": ""}) is True
assert name_parts_is_empty({"full_name": None}) is True
assert name_parts_is_empty({"full_name": "Flora Nord"}) is False
assert name_parts_is_empty({"_scheme": "foo", "given_name": "Alice"}) is False
assert name_parts_is_empty({"_legacy": "Alice"}) is False

View File

@@ -1207,65 +1207,6 @@ class CheckoutTestCase(BaseCheckoutTestCase, TimemachineTestMixin, TestCase):
}
assert ia.name_cached == 'Mr John Kennedy'
def test_invoice_address_required_no_zipcode_country(self):
self.event.settings.invoice_address_asked = True
self.event.settings.invoice_address_required = True
self.event.settings.invoice_address_not_asked_free = True
self.event.settings.set('name_scheme', 'title_given_middle_family')
with scopes_disabled():
CartPosition.objects.create(
event=self.event, cart_id=self.session_key, item=self.ticket,
price=23, expires=now() + timedelta(minutes=10)
)
response = self.client.get('/%s/%s/checkout/questions/' % (self.orga.slug, self.event.slug), follow=True)
doc = BeautifulSoup(response.content.decode(), "lxml")
self.assertEqual(len(doc.select('input[name="city"]')), 1)
# Not all required fields filled out, expect failure
response = self.client.post('/%s/%s/checkout/questions/' % (self.orga.slug, self.event.slug), {
'is_business': 'business',
'company': 'Foo',
'name_parts_0': 'Mr',
'name_parts_1': 'John',
'name_parts_2': '',
'name_parts_3': 'Kennedy',
'street': '',
'zipcode': '',
'city': '',
'country': 'BI',
'email': 'admin@localhost'
}, follow=True)
doc = BeautifulSoup(response.content.decode(), "lxml")
self.assertGreaterEqual(len(doc.select('.has-error')), 1)
# Correct request for a country where zip code is not required in address
response = self.client.post('/%s/%s/checkout/questions/' % (self.orga.slug, self.event.slug), {
'is_business': 'business',
'company': 'Foo',
'name_parts_0': 'Mr',
'name_parts_1': 'John',
'name_parts_2': '',
'name_parts_3': 'Kennedy',
'street': 'BP 12345',
'zipcode': '',
'city': 'Bujumbura',
'country': 'BI',
'email': 'admin@localhost'
}, follow=True)
self.assertRedirects(response, '/%s/%s/checkout/payment/' % (self.orga.slug, self.event.slug),
target_status_code=200)
with scopes_disabled():
ia = InvoiceAddress.objects.last()
assert ia.name_parts == {
'title': 'Mr',
'given_name': 'John',
'middle_name': '',
'family_name': 'Kennedy',
"_scheme": "title_given_middle_family"
}
assert ia.name_cached == 'Mr John Kennedy'
def test_invoice_address_validated(self):
self.event.settings.invoice_address_asked = True
self.event.settings.invoice_address_required = True