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/plugins/banktransfer/payment.py

@@ -333,7 +333,7 @@ class BankTransfer(BasePaymentProvider):
                     required=False,
                 ),
                 'send_invoice_to': forms.EmailField(
-                    label=_('Invoice recipient e-mail'),
+                    label=_('Invoice recipient email'),
                     required=False,
                     help_text=_('The invoice recipient will receive an email which includes the invoice and your email '
                                 'address so they know who placed this order.'),

src/pretix/plugins/banktransfer/views.py

@@ -929,5 +929,5 @@ class SendInvoiceMailView(EventViewMixin, OrderDetailMixin, View):
         }
         last_payment.save(update_fields=['info'])
 
-        messages.success(request, _('Sending the latest invoice via e-mail to {email}.').format(email=request.POST['email']))
+        messages.success(request, _('Sending the latest invoice via email to {email}.').format(email=request.POST['email']))
         return redirect(self.get_order_url())

src/pretix/plugins/checkinlists/exporters.py

@@ -502,7 +502,7 @@ class CSVCheckinList(CheckInListMixin, ListExporter):
         if form_data['secrets']:
             headers.append(_('Secret'))
 
-        headers.append(_('E-mail'))
+        headers.append(_('Email'))
         headers.append(_('Phone number'))
 
         if self.event.has_subevents:

src/pretix/plugins/paypal2/views.py

@@ -264,7 +264,7 @@ def isu_return(request, *args, **kwargs):
             elif request.GET.get("isEmailConfirmed") == "false":  # Yes - literal!
                 messages.error(
                     request,
-                    _('The e-mail address on your PayPal account has not yet been confirmed. You will need to do '
+                    _('The email address on your PayPal account has not yet been confirmed. You will need to do '
                       'this before you can start accepting payments.')
                 )
             else:

src/pretix/plugins/sendmail/templates/pretixplugins/sendmail/rule_update.html

@@ -71,7 +71,7 @@
             </fieldset>
 
             <fieldset>
-            <legend>{% trans "E-mail preview" %}</legend>
+            <legend>{% trans "Email preview" %}</legend>
                 <div class="tab-pane mail-preview-group">
                     {% for locale, out in output.items %}
                         <div lang="{{ locale }}" class="mail-preview">

src/pretix/plugins/sendmail/templates/pretixplugins/sendmail/send_form.html

@@ -39,7 +39,7 @@
             </fieldset>
             {% if is_preview %}
             <fieldset>
-                <legend>{% trans "E-mail preview" %}</legend>
+                <legend>{% trans "Email preview" %}</legend>
                 <div class="tab-pane mail-preview-group">
                     {% for locale, out in output.items %}
                         <div lang="{{ locale }}" class="mail-preview">