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
2024-11-18 17:21:29 +01:00
parent 3e934acfa0
commit 03d3c389da
111 changed files with 14808 additions and 14466 deletions
--- a/src/pretix/control/forms/filter.py
+++ b/src/pretix/control/forms/filter.py
@@ -549,7 +549,7 @@ class EventOrderExpertFilterForm(EventOrderFilterForm):
    )
    email = forms.CharField(
        required=False,
-        label=_('E-mail address')
+        label=_('Email address')
    )
    comment = forms.CharField(
        required=False,
@@ -563,7 +563,7 @@ class EventOrderExpertFilterForm(EventOrderFilterForm):
    email_known_to_work = forms.NullBooleanField(
        required=False,
        widget=FilterNullBooleanSelect,
-        label=_('E-mail address verified'),
+        label=_('Email address verified'),
    )
    total = forms.DecimalField(
        localize=True,
@@ -648,7 +648,7 @@ class EventOrderExpertFilterForm(EventOrderFilterForm):
        )
        self.fields['attendee_email'] = forms.CharField(
            required=False,
-            label=_('Attendee e-mail address')
+            label=_('Attendee email address')
        )
        self.fields['attendee_address_company'] = forms.CharField(
            required=False,
--- a/src/pretix/control/forms/global_settings.py
+++ b/src/pretix/control/forms/global_settings.py
@@ -128,7 +128,7 @@ class UpdateSettingsForm(SettingsForm):
    )
    update_check_email = forms.EmailField(
        required=False,
-        label=_("E-mail notifications"),
+        label=_("Email notifications"),
        help_text=_("We will notify you at this address if we detect that a new update is available. This "
                    "address will not be transmitted to pretix.eu, the emails will be sent by this server "
                    "locally.")
--- a/src/pretix/control/forms/users.py
+++ b/src/pretix/control/forms/users.py
@@ -40,7 +40,7 @@ class StaffSessionForm(forms.ModelForm):

 class UserEditForm(forms.ModelForm):
    error_messages = {
-        'duplicate_identifier': _("There already is an account associated with this e-mail address. "
+        'duplicate_identifier': _("There already is an account associated with this email address. "
                                  "Please choose a different one."),
        'pw_mismatch': _("Please enter the same password twice"),
    }
--- a/src/pretix/control/navigation.py
+++ b/src/pretix/control/navigation.py
@@ -78,7 +78,7 @@ def get_event_navigation(request: HttpRequest):
                'active': url.url_name == 'event.settings.tickets',
            },
            {
-                'label': _('E-mail'),
+                'label': _('Email'),
                'url': reverse('control:event.settings.mail', kwargs={
                    'event': request.event.slug,
                    'organizer': request.event.organizer.slug,
@@ -498,7 +498,7 @@ def get_organizer_navigation(request):
                    'active': url.url_name.startswith('organizer.propert'),
                },
                {
-                    'label': _('E-mail'),
+                    'label': _('Email'),
                    'url': reverse('control:organizer.settings.mail', kwargs={
                        'organizer': request.organizer.slug,
                    }),
--- a/src/pretix/control/templates/pretixcontrol/email_setup.html
+++ b/src/pretix/control/templates/pretixcontrol/email_setup.html
@@ -5,7 +5,7 @@
 {% load static %}
 {% block title %}{% trans "Organizer" %}{% endblock %}
 {% block content %}
-    <h1>{% trans "E-mail sending" %}</h1>
+    <h1>{% trans "Email sending" %}</h1>
    <form action="" method="post" class="form-horizontal">
        {% csrf_token %}
        <div class="panel-group" id="email">
@@ -27,7 +27,7 @@
                    <div class="panel-body form-horizontal">
                        <p>
                            {% blocktrans trimmed %}
-                                E-mails will be sent through the system's default server. They will show the following
+                                Emails will be sent through the system's default server. They will show the following
                                sender information:
                            {% endblocktrans %}
                        </p>
@@ -62,7 +62,7 @@
                    <div class="panel-body form-horizontal">
                        <p>
                            {% blocktrans trimmed %}
-                                E-mails will be sent through the system's default server but with your own sender
+                                Emails will be sent through the system's default server but with your own sender
                                address.
                                This will make your emails look more personalized and coming directly from you, but it
                                also might require some extra steps to ensure good deliverability.
--- a/src/pretix/control/templates/pretixcontrol/email_setup_simple.html
+++ b/src/pretix/control/templates/pretixcontrol/email_setup_simple.html
@@ -5,7 +5,7 @@
 {% load static %}
 {% block title %}{% trans "Organizer" %}{% endblock %}
 {% block content %}
-    <h1>{% trans "E-mail sending" %}</h1>
+    <h1>{% trans "Email sending" %}</h1>
    <form action="" method="post" class="form-horizontal">
        {% csrf_token %}
        {% for k, v in request.POST.items %}
--- a/src/pretix/control/templates/pretixcontrol/email_setup_smtp.html
+++ b/src/pretix/control/templates/pretixcontrol/email_setup_smtp.html
@@ -5,7 +5,7 @@
 {% load static %}
 {% block title %}{% trans "Organizer" %}{% endblock %}
 {% block content %}
-    <h1>{% trans "E-mail sending" %}</h1>
+    <h1>{% trans "Email sending" %}</h1>
    <form action="" method="post" class="form-horizontal">
        {% csrf_token %}
        {% for k, v in request.POST.items %}
--- a/src/pretix/control/templates/pretixcontrol/event/mail.html
+++ b/src/pretix/control/templates/pretixcontrol/event/mail.html
@@ -4,7 +4,7 @@
 {% load hierarkey_form %}
 {% load static %}
 {% block inside %}
-    <h1>{% trans "E-mail settings" %}</h1>
+    <h1>{% trans "Email settings" %}</h1>
    <form action="" method="post" class="form-horizontal" enctype="multipart/form-data"
            mail-preview-url="{% url "control:event.settings.mail.preview" event=request.event.slug organizer=request.event.organizer.slug %}">
        {% csrf_token %}
@@ -63,7 +63,7 @@
                {% bootstrap_field form.mail_attach_ical_description layout="control" %}
            </fieldset>
            <fieldset>
-                <legend>{% trans "E-mail design" %}</legend>
+                <legend>{% trans "Email design" %}</legend>
                <div class="row">
                    {% for r in renderers.values %}
                        <div class="col-md-3">
@@ -84,7 +84,7 @@
                </div>
            </fieldset>
            <fieldset>
-                <legend>{% trans "E-mail content" %}</legend>
+                <legend>{% trans "Email content" %}</legend>
                <h4>{% trans "Text" %}</h4>
                <div class="panel-group" id="questions_group">
                    {% blocktrans asvar title_placed_order %}Placed order{% endblocktrans %}
--- a/src/pretix/control/templates/pretixcontrol/event/settings.html
+++ b/src/pretix/control/templates/pretixcontrol/event/settings.html
@@ -67,7 +67,7 @@
                <h4>{% trans "Customer data (once per order)" %}</h4>
                <div class="form-group">
                    <label class="control-label col-md-3">
-                        {% trans "E-mail" %}
+                        {% trans "Email" %}
                    </label>
                    <div class="col-md-9">
                        <div class="checkbox">
--- a/src/pretix/control/templates/pretixcontrol/order/sendmail.html
+++ b/src/pretix/control/templates/pretixcontrol/order/sendmail.html
@@ -24,7 +24,7 @@
            {% endif %}
            {% if request.method == "POST" %}
                <fieldset>
-                    <legend>{% trans "E-mail preview" %}</legend>
+                    <legend>{% trans "Email preview" %}</legend>
                    <div class="tab-pane mail-preview-group">
                        <div lang="{{ order.locale }}" class="mail-preview">
                            <strong>{{ preview_output.subject }}</strong><br><br>
--- a/src/pretix/control/templates/pretixcontrol/organizers/customer.html
+++ b/src/pretix/control/templates/pretixcontrol/organizers/customer.html
@@ -46,7 +46,7 @@
                                        {% trans "active" %}
                                    {% endif %}
                                </dd>
-                                <dt>{% trans "E-mail" %}</dt>
+                                <dt>{% trans "Email" %}</dt>
                                <dd>
                                    {{ customer.email|default_if_none:"" }}
                                    {% if customer.email and not customer.provider %}
--- a/src/pretix/control/templates/pretixcontrol/organizers/mail.html
+++ b/src/pretix/control/templates/pretixcontrol/organizers/mail.html
@@ -8,7 +8,7 @@
 {% endblock %}
 {% block title %}{% trans "Organizer" %}{% endblock %}
 {% block content %}
-    <h1>{% trans "E-mail settings" %}</h1>
+    <h1>{% trans "Email settings" %}</h1>

    <form action="" method="post" class="form-horizontal" enctype="multipart/form-data"
          mail-preview-url="{% url "control:organizer.settings.mail.preview" organizer=request.organizer.slug %}">
@@ -55,7 +55,7 @@
                {% bootstrap_field form.mail_bcc layout="control" %}
            </fieldset>
            <fieldset>
-                <legend>{% trans "E-mail content" %}</legend>
+                <legend>{% trans "Email content" %}</legend>
                <div class="panel-group" id="questions_group">
                    {% blocktrans asvar title_customer_registration %}Customer account registration{% endblocktrans %}
                    {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="customer_registration" title=title_customer_registration items="mail_subject_customer_registration,mail_text_customer_registration" %}
--- a/src/pretix/control/templates/pretixcontrol/user/notifications.html
+++ b/src/pretix/control/templates/pretixcontrol/user/notifications.html
@@ -54,7 +54,7 @@
                <thead>
                <tr>
                    <th>{% trans "Notification type" %}</th>
-                    <th class="text-center">{% trans "E-Mail notification" %}</th>
+                    <th class="text-center">{% trans "Email notification" %}</th>
                </tr>
                </thead>
                <tbody>
--- a/src/pretix/control/templates/pretixcontrol/users/index.html
+++ b/src/pretix/control/templates/pretixcontrol/users/index.html
@@ -39,7 +39,7 @@
        <thead>
        <tr>
            <th>
-                {% trans "E-mail address" %}
+                {% trans "Email address" %}
                <a href="?{% url_replace request 'ordering' '-email' %}"><i class="fa fa-caret-down"></i></a>
                <a href="?{% url_replace request 'ordering' 'email' %}"><i class="fa fa-caret-up"></i></a>
            </th>
--- a/src/pretix/control/views/auth.py
+++ b/src/pretix/control/views/auth.py
@@ -343,7 +343,7 @@ class Forgot(TemplateView):
                logger.warning('Backend password reset for unregistered e-mail \"' + email + '\" requested.')

            except SendMailException:
-                logger.exception('Sending password reset e-mail to \"' + email + '\" failed.')
+                logger.exception('Sending password reset email to \"' + email + '\" failed.')

            except RepeatedResetDenied:
                pass
@@ -354,10 +354,10 @@ class Forgot(TemplateView):

            finally:
                if has_redis:
-                    messages.info(request, _('If the address is registered to valid account, then we have sent you an e-mail containing further instructions. '
+                    messages.info(request, _('If the address is registered to valid account, then we have sent you an email containing further instructions. '
                                             'Please note that we will send at most one email every 24 hours.'))
                else:
-                    messages.info(request, _('If the address is registered to valid account, then we have sent you an e-mail containing further instructions.'))
+                    messages.info(request, _('If the address is registered to valid account, then we have sent you an email containing further instructions.'))

                return redirect('control:auth.forgot')
        else:
--- a/src/pretix/control/views/event.py
+++ b/src/pretix/control/views/event.py
@@ -807,7 +807,7 @@ class MailSettingsRendererPreview(MailSettingsPreview):
                r._csp_ignore = True
                return r
        else:
-            raise Http404(_('Unknown e-mail renderer.'))
+            raise Http404(_('Unknown email renderer.'))


 class TicketSettingsPreview(EventPermissionRequiredMixin, View):
--- a/src/pretix/control/views/users.py
+++ b/src/pretix/control/views/users.py
@@ -145,7 +145,7 @@ class UserResetView(AdministratorPermissionRequiredMixin, RecentAuthenticationRe

        self.object.log_action('pretix.control.auth.user.forgot_password.mail_sent',
                               user=request.user)
-        messages.success(request, _('We sent out an e-mail containing further instructions.'))
+        messages.success(request, _('We sent out an email containing further instructions.'))
        return redirect(self.get_success_url())

    def get_success_url(self):
--- a/src/pretix/control/views/waitinglist.py
+++ b/src/pretix/control/views/waitinglist.py
@@ -304,7 +304,7 @@ class WaitingListView(EventPermissionRequiredMixin, WaitingListQuerySetMixin, Pa
        writer = csv.writer(output, quoting=csv.QUOTE_NONNUMERIC, delimiter=",")

        headers = [
-            _('Name'), _('E-mail address'), _('Phone number'), _('Product'), _('On list since'), _('Status'), _('Voucher code'),
+            _('Name'), _('Email address'), _('Phone number'), _('Product'), _('On list since'), _('Status'), _('Voucher code'),
            _('Language'), _('Priority')
        ]
        if self.request.event.has_subevents: