Fix #1674 -- Change spelling of e-mail to email (#4636)

* Fix #1674 -- Change spelling of e-mail to email

* Conflicts and word list

* Add MobilePay to wordlist

* fix usage in tests

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'] = []

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.'),
             )
 

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(

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'))

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

@@ -296,7 +296,7 @@
                 <div class="panel-body">
                     <dl class="dl-horizontal">
                         {% if order.email %}
-                            <dt>{% trans "E-mail" %}</dt>
+                            <dt>{% trans "Email" %}</dt>
                             <dd>{{ order.email }}</dd>
                         {% endif %}
                         {% if order.phone %}

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

@@ -23,7 +23,7 @@
                     <dt>{% trans "Login method" %}</dt>
                     <dd>{{ customer.provider.name }}</dd>
                 {% endif %}
-                <dt>{% trans "E-mail" %}</dt>
+                <dt>{% trans "Email" %}</dt>
                 <dd>{{ customer.email }}
                 </dd>
                 <dt>{% trans "Name" %}</dt>