CGM_Public/pretix_cgo
1
0
Fork 0
forked from CGM_Public/pretix_original
Code Pull Requests Actions 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

2
src/tests/base/test_mail.py
View File

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

4
src/tests/base/test_modelimport_orders.py
View File

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

2
src/tests/control/test_orders.py
View File

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

3
src/tests/plugins/banktransfer/test_presale.py
View File

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

2
src/tests/plugins/sendmail/test_sendmail.py
View File

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

14
src/tests/plugins/test_checkinlist.py
View File

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

2
src/tests/templates/mailtest.txt
View File

@@ -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 }}.
The language code used for rendering this email is {{ LANGUAGE_CODE }}.