{% for locale, out in output.items %}
diff --git a/src/pretix/presale/checkoutflow.py b/src/pretix/presale/checkoutflow.py
index f4c25f7a0..70d1ce2d5 100644
--- a/src/pretix/presale/checkoutflow.py
+++ b/src/pretix/presale/checkoutflow.py
@@ -1523,7 +1523,7 @@ class ConfirmStep(CartMixin, AsyncAction, TemplateFlowStep):
email = self.cart_session.get('contact_form_data', {}).get('email')
if email != settings.PRETIX_EMAIL_NONE_VALUE:
ctx['contact_info'] = [
- (_('E-mail'), email),
+ (_('Email'), email),
]
else:
ctx['contact_info'] = []
diff --git a/src/pretix/presale/forms/checkout.py b/src/pretix/presale/forms/checkout.py
index 6133d1525..d890df288 100644
--- a/src/pretix/presale/forms/checkout.py
+++ b/src/pretix/presale/forms/checkout.py
@@ -54,7 +54,7 @@ from pretix.presale.signals import contact_form_fields
class ContactForm(forms.Form):
required_css_class = 'required'
- email = forms.EmailField(label=_('E-mail'),
+ email = forms.EmailField(label=_('Email'),
validators=[EmailBanlistValidator()],
widget=forms.EmailInput(attrs={'autocomplete': 'section-contact email'})
)
@@ -67,7 +67,7 @@ class ContactForm(forms.Form):
if self.event.settings.order_email_asked_twice:
self.fields['email_repeat'] = forms.EmailField(
- label=_('E-mail address (repeated)'),
+ label=_('Email address (repeated)'),
help_text=_('Please enter the same email address again to make sure you typed it correctly.'),
)
diff --git a/src/pretix/presale/forms/customer.py b/src/pretix/presale/forms/customer.py
index e26b32925..4183d1aa1 100644
--- a/src/pretix/presale/forms/customer.py
+++ b/src/pretix/presale/forms/customer.py
@@ -53,7 +53,7 @@ class TokenGenerator(PasswordResetTokenGenerator):
class AuthenticationForm(forms.Form):
required_css_class = 'required'
email = forms.EmailField(
- label=_("E-mail"),
+ label=_("Email"),
widget=forms.EmailInput(attrs={'autofocus': True})
)
password = forms.CharField(
@@ -128,7 +128,7 @@ class RegistrationForm(forms.Form):
required_css_class = 'required'
name_parts = forms.CharField()
email = forms.EmailField(
- label=_("E-mail"),
+ label=_("Email"),
)
error_messages = {
@@ -283,7 +283,7 @@ class SetPasswordForm(forms.Form):
'pw_mismatch': _("Please enter the same password twice"),
}
email = forms.EmailField(
- label=_('E-mail'),
+ label=_('Email'),
disabled=True
)
password = forms.CharField(
@@ -329,7 +329,7 @@ class ResetPasswordForm(forms.Form):
'unknown': _("A user with this email address is not known in our system."),
}
email = forms.EmailField(
- label=_('E-mail'),
+ label=_('Email'),
)
def __init__(self, request=None, *args, **kwargs):
@@ -372,7 +372,7 @@ class ChangePasswordForm(forms.Form):
'rate_limit': _("For security reasons, please wait 5 minutes before you try again."),
}
email = forms.EmailField(
- label=_('E-mail'),
+ label=_('Email'),
disabled=True
)
password_current = forms.CharField(
diff --git a/src/pretix/presale/forms/user.py b/src/pretix/presale/forms/user.py
index 598483821..deb461b96 100644
--- a/src/pretix/presale/forms/user.py
+++ b/src/pretix/presale/forms/user.py
@@ -37,4 +37,4 @@ from django.utils.translation import gettext_lazy as _
class ResendLinkForm(forms.Form):
- email = forms.EmailField(label=_('E-mail'))
+ email = forms.EmailField(label=_('Email'))
diff --git a/src/pretix/presale/templates/pretixpresale/event/order.html b/src/pretix/presale/templates/pretixpresale/event/order.html
index 4f3e9fa6e..62c9c11a8 100644
--- a/src/pretix/presale/templates/pretixpresale/event/order.html
+++ b/src/pretix/presale/templates/pretixpresale/event/order.html
@@ -296,7 +296,7 @@
{% if order.email %}
- - {% trans "E-mail" %}
+ - {% trans "Email" %}
- {{ order.email }}
{% endif %}
{% if order.phone %}
diff --git a/src/pretix/presale/templates/pretixpresale/organizers/customer_profile.html b/src/pretix/presale/templates/pretixpresale/organizers/customer_profile.html
index ad3b9bb6f..551004c9a 100644
--- a/src/pretix/presale/templates/pretixpresale/organizers/customer_profile.html
+++ b/src/pretix/presale/templates/pretixpresale/organizers/customer_profile.html
@@ -23,7 +23,7 @@
- {% trans "Login method" %}
- {{ customer.provider.name }}
{% endif %}
- - {% trans "E-mail" %}
+ - {% trans "Email" %}
- {{ customer.email }}
- {% trans "Name" %}
diff --git a/src/tests/base/test_mail.py b/src/tests/base/test_mail.py
index 651bad751..a8e4c338a 100644
--- a/src/tests/base/test_mail.py
+++ b/src/tests/base/test_mail.py
@@ -151,7 +151,7 @@ def test_send_mail_with_user_locale(env):
assert len(djmail.outbox) == 1
assert djmail.outbox[0].subject == 'Benutzer'
- assert 'The language code used for rendering this e-mail is de.' in djmail.outbox[0].body
+ assert 'The language code used for rendering this email is de.' in djmail.outbox[0].body
@pytest.mark.django_db
diff --git a/src/tests/base/test_modelimport_orders.py b/src/tests/base/test_modelimport_orders.py
index ce287a1d4..ce482534c 100644
--- a/src/tests/base/test_modelimport_orders.py
+++ b/src/tests/base/test_modelimport_orders.py
@@ -282,7 +282,7 @@ def test_import_email_invalid(user, event, item):
import_orders.apply(
args=(event.pk, inputfile_factory().id, settings, 'en', user.pk)
).get()
- assert 'Error while importing value "Dieter" for column "E-mail address" in line "1": Enter a valid email address.' in str(excinfo.value)
+ assert 'Error while importing value "Dieter" for column "Email address" in line "1": Enter a valid email address.' in str(excinfo.value)
@pytest.mark.django_db
@@ -356,7 +356,7 @@ def test_import_attendee_email_invalid(user, event, item):
import_orders.apply(
args=(event.pk, inputfile_factory().id, settings, 'en', user.pk)
).get()
- assert 'Error while importing value "Dieter" for column "Attendee e-mail address" in line "1": Enter a valid email address.' in str(excinfo.value)
+ assert 'Error while importing value "Dieter" for column "Attendee email address" in line "1": Enter a valid email address.' in str(excinfo.value)
@pytest.mark.django_db
diff --git a/src/tests/control/test_orders.py b/src/tests/control/test_orders.py
index 28a338b5c..7439525ee 100644
--- a/src/tests/control/test_orders.py
+++ b/src/tests/control/test_orders.py
@@ -1227,7 +1227,7 @@ def test_order_sendmail_preview(client, order_url, env):
follow=True)
assert response.status_code == 200
- assert 'E-mail preview' in response.content.decode()
+ assert 'Email preview' in response.content.decode()
assert len(mail.outbox) == 0
diff --git a/src/tests/plugins/banktransfer/test_presale.py b/src/tests/plugins/banktransfer/test_presale.py
index 7cdfc36af..ceb0a7a15 100644
--- a/src/tests/plugins/banktransfer/test_presale.py
+++ b/src/tests/plugins/banktransfer/test_presale.py
@@ -86,6 +86,5 @@ class BanktransferOrdersTest(BaseOrdersTest):
from django.contrib.messages import get_messages
messages = list(get_messages(response.wsgi_request))
assert len(messages) == 1
- assert str(messages[0]) == 'Sending the latest invoice via e-mail to test@example.org.'
-
+ assert str(messages[0]) == 'Sending the latest invoice via email to test@example.org.'
assert len(djmail.outbox) == 1
diff --git a/src/tests/plugins/sendmail/test_sendmail.py b/src/tests/plugins/sendmail/test_sendmail.py
index de4593cae..d43408b7b 100644
--- a/src/tests/plugins/sendmail/test_sendmail.py
+++ b/src/tests/plugins/sendmail/test_sendmail.py
@@ -144,7 +144,7 @@ def test_sendmail_preview(logged_in_client, sendmail_url, event, order, pos):
},
follow=True)
assert response.status_code == 200
- assert 'E-mail preview' in response.rendered_content
+ assert 'Email preview' in response.rendered_content
assert len(djmail.outbox) == 0
diff --git a/src/tests/plugins/test_checkinlist.py b/src/tests/plugins/test_checkinlist.py
index 1c679543a..795474a77 100644
--- a/src/tests/plugins/test_checkinlist.py
+++ b/src/tests/plugins/test_checkinlist.py
@@ -90,7 +90,7 @@ def test_csv_simple(event):
})
assert clean(content.decode()) == clean(""""Order code","Attendee name","Attendee name: Title","Attendee name:
First name","Attendee name: Middle name","Attendee name: Family name","Product","Price","Checked in","Checked out","Automatically
- checked in","Secret","E-mail","Phone number","Company","Voucher code","Order date","Order time","Requires special attention",
+ checked in","Secret","Email","Phone number","Company","Voucher code","Order date","Order time","Requires special attention",
"Comment","Check-in text","Seat ID","Seat name","Seat zone","Seat row","Seat number","Blocked","Valid from","Valid until","Address","ZIP code",
"City","Country","State"
"FOO","Mr Peter A Jones","Mr","Peter","A","Jones","Ticket","23.00","","","No","hutjztuxhkbtwnesv2suqv26k6ttytxx",
@@ -112,7 +112,7 @@ def test_csv_order_by_name_parts(event): # noqa
})
assert clean(content.decode()) == clean(""""Order code","Attendee name","Attendee name: Title",
"Attendee name: First name","Attendee name: Middle name","Attendee name: Family name","Product","Price",
-"Checked in","Checked out","Automatically checked in","Secret","E-mail","Phone number","Company","Voucher code","Order date","Order time","Requires special
+"Checked in","Checked out","Automatically checked in","Secret","Email","Phone number","Company","Voucher code","Order date","Order time","Requires special
attention","Comment","Check-in text","Seat ID","Seat name","Seat zone","Seat row","Seat number","Blocked","Valid from","Valid until",
"Address","ZIP code","City","Country","State"
"FOO","Mrs Andrea J Zulu","Mrs","Andrea","J","Zulu","Ticket","13.00","","","No","ggsngqtnmhx74jswjngw3fk8pfwz2a7k",
@@ -130,7 +130,7 @@ def test_csv_order_by_name_parts(event): # noqa
})
assert clean(content.decode()) == clean(""""Order code","Attendee name","Attendee name: Title",
"Attendee name: First name","Attendee name: Middle name","Attendee name: Family name","Product","Price",
-"Checked in","Checked out","Automatically checked in","Secret","E-mail","Phone number","Company","Voucher code","Order date","Order time","Requires special
+"Checked in","Checked out","Automatically checked in","Secret","Email","Phone number","Company","Voucher code","Order date","Order time","Requires special
attention","Comment","Check-in text","Seat ID","Seat name","Seat zone","Seat row","Seat number","Blocked","Valid from","Valid until",
"Address","ZIP code","City","Country","State"
"FOO","Mr Peter A Jones","Mr","Peter","A","Jones","Ticket","23.00","","","No","hutjztuxhkbtwnesv2suqv26k6ttytxx",
@@ -183,7 +183,7 @@ def test_csv_order_by_inherited_name_parts(event): # noqa
})
assert clean(content.decode()) == clean(""""Order code","Attendee name","Attendee name: Title",
"Attendee name: First name","Attendee name: Middle name","Attendee name: Family name","Product","Price",
-"Checked in","Checked out","Automatically checked in","Secret","E-mail","Phone number","Company","Voucher code","Order date","Order time","Requires special
+"Checked in","Checked out","Automatically checked in","Secret","Email","Phone number","Company","Voucher code","Order date","Order time","Requires special
attention","Comment","Check-in text","Seat ID","Seat name","Seat zone","Seat row","Seat number","Blocked","Valid from","Valid until",
"Address","ZIP code","City","Country","State"
"BAR","Mr Albert J Zulu","Mr","Albert","J","Zulu","Ticket","23.00","","","No","hutjztuxhkbtwnesv2suqv26k6ttytyy",
@@ -201,7 +201,7 @@ def test_csv_order_by_inherited_name_parts(event): # noqa
})
assert clean(content.decode()) == clean(""""Order code","Attendee name","Attendee name: Title",
"Attendee name: First name","Attendee name: Middle name","Attendee name: Family name","Product","Price",
-"Checked in","Checked out","Automatically checked in","Secret","E-mail","Phone number","Company","Voucher code","Order date","Order time","Requires special
+"Checked in","Checked out","Automatically checked in","Secret","Email","Phone number","Company","Voucher code","Order date","Order time","Requires special
attention","Comment","Check-in text","Seat ID","Seat name","Seat zone","Seat row","Seat number","Blocked","Valid from","Valid until",
"Address","ZIP code","City","Country","State"
"BAR","Mr Albert J Zulu","Mr","Albert","J","Zulu","Ticket","23.00","","","No","hutjztuxhkbtwnesv2suqv26k6ttytyy",
@@ -219,7 +219,7 @@ def test_csv_order_by_inherited_name_parts(event): # noqa
})
assert clean(content.decode()) == clean(""""Order code","Attendee name","Attendee name: Title",
"Attendee name: First name","Attendee name: Middle name","Attendee name: Family name","Product","Price",
-"Checked in","Checked out","Automatically checked in","Secret","E-mail","Phone number","Company","Voucher code","Order date","Order time","Requires special
+"Checked in","Checked out","Automatically checked in","Secret","Email","Phone number","Company","Voucher code","Order date","Order time","Requires special
attention","Comment","Check-in text","Seat ID","Seat name","Seat zone","Seat row","Seat number","Blocked","Valid from","Valid until",
"Address","ZIP code","City","Country","State"
"FOO","Mr Paul A Jones","Mr","Paul","A","Jones","Ticket","23.00","","","No","hutjztuxhkbtwnesv2suqv26k6ttytxx",
@@ -262,7 +262,7 @@ def test_csv_order_by_orderdatetime(event):
})
assert clean(content.decode()) == clean(""""Order code","Attendee name","Attendee name: Title","Attendee name:
First name","Attendee name: Middle name","Attendee name: Family name","Product","Price","Checked in","Checked out","Automatically
- checked in","Secret","E-mail","Phone number","Company","Voucher code","Order date","Order time","Requires special attention",
+ checked in","Secret","Email","Phone number","Company","Voucher code","Order date","Order time","Requires special attention",
"Comment","Check-in text","Seat ID","Seat name","Seat zone","Seat row","Seat number","Blocked","Valid from","Valid until","Address","ZIP code",
"City","Country","State"
"FOO2","Mx Alex F Nord","Mx","Alex","F","Nord","Ticket2","23.00","","","No","asdfasdfasdfasdfasdfasdfasfdasdf",
diff --git a/src/tests/templates/mailtest.txt b/src/tests/templates/mailtest.txt
index 3ff57d7d0..71139e00c 100644
--- a/src/tests/templates/mailtest.txt
+++ b/src/tests/templates/mailtest.txt
@@ -1,4 +1,4 @@
{% load i18n %}
This is a test file for sending mails.
{% get_current_language as LANGUAGE_CODE %}
-The language code used for rendering this e-mail is {{ LANGUAGE_CODE }}.
\ No newline at end of file
+The language code used for rendering this email is {{ LANGUAGE_CODE }}.