CGM_Public/pretix_original
2
0
Fork 1
mirror of https://github.com/pretix/pretix.git synced 2026-05-07 15:34:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

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

* Conflicts and word list

* Add MobilePay to wordlist

* fix usage in tests
This commit is contained in:
Raphael Michel
2024-11-18 17:21:29 +01:00
committed by GitHub
parent 3e934acfa0
commit 03d3c389da
111 changed files with 14808 additions and 14466 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/pretix/control/templates/pretixcontrol/email_setup.html
View File

@@ -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.

2
src/pretix/control/templates/pretixcontrol/email_setup_simple.html
View File

@@ -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 %}

2
src/pretix/control/templates/pretixcontrol/email_setup_smtp.html
View File

@@ -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 %}

6
src/pretix/control/templates/pretixcontrol/event/mail.html
View File

@@ -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 %}

2
src/pretix/control/templates/pretixcontrol/event/settings.html
View File

@@ -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">

2
src/pretix/control/templates/pretixcontrol/order/sendmail.html
View File

@@ -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>

2
src/pretix/control/templates/pretixcontrol/organizers/customer.html
View File

@@ -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 %}

4
src/pretix/control/templates/pretixcontrol/organizers/mail.html
View File

@@ -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" %}

2
src/pretix/control/templates/pretixcontrol/user/notifications.html
View File

@@ -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>

2
src/pretix/control/templates/pretixcontrol/users/index.html
View File

@@ -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>