CGM_Public/pretix_cgo
1
0
Fork 0
forked from CGM_Public/pretix_original
Code Pull Requests Actions Activity

Correct english typos (#662)

Browse Source 
* Check that vouchers selected via API are for the correct event

* Choose different subject for reminder mails if auto-expiry is off

* correct english typos

As with PR #660, it should be checked whether the changes to the
.po-files are respected in the corresponding src-files.
This commit is contained in:
Jakob Schnell
2017-11-03 11:40:52 +01:00
committed by Raphael Michel
parent 1285e9aa69
commit 4614d04be4
12 changed files with 53 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/pretix/control/forms/event.py
View File

@@ -68,7 +68,7 @@ class EventWizardBasicsForm(I18nModelForm):
label=_("Sales tax rate"),
help_text=_("Do you need to pay sales tax on your tickets? In this case, please enter the applicable tax rate "
"here in percent. If you have a more complicated tax situation, you can add more tax rates and "
"detailled configuration later."),
"detailed configuration later."),
required=False
)
@@ -265,7 +265,7 @@ class EventSettingsForm(SettingsForm):
last_order_modification_date = RelativeDateTimeField(
label=_('Last date of modifications'),
help_text=_("The last date users can modify details of their orders, such as attendee names or "
"answers to questions. If you use the event series feature and an order contains tickest for "
"answers to questions. If you use the event series feature and an order contains tickets for "
"multiple event dates, the earliest date will be used."),
required=False,
)

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

@@ -37,7 +37,7 @@
You can either send them one-by-one in an order of your choice by clicking the
buttons next to a line in this table (if sufficient quota is available) or you can
press the big button below this text to send out as many vouchers as currently
possible to the persons who waitet longest.
possible to the persons who waited longest.
{% endblocktrans %}
</p>
{% endif %}

4
src/pretix/control/views/user.py
View File

@@ -242,7 +242,7 @@ class User2FADeviceConfirmU2FView(RecentAuthenticationRequiredMixin, TemplateVie
if not self.request.user.require_2fa:
note = ' ' + str(_('Please note that you still need to enable two-factor authentication for your '
'account using the buttons below to make a second factor required for logging '
'into your accont.'))
'into your account.'))
messages.success(request, str(_('The device has been verified and can now be used.')) + note)
return redirect(reverse('control:user.settings.2fa'))
except Exception:
@@ -291,7 +291,7 @@ class User2FADeviceConfirmTOTPView(RecentAuthenticationRequiredMixin, TemplateVi
if not self.request.user.require_2fa:
note = ' ' + str(_('Please note that you still need to enable two-factor authentication for your '
'account using the buttons below to make a second factor required for logging '
'into your accont.'))
'into your account.'))
messages.success(request, str(_('The device has been verified and can now be used.')) + note)
return redirect(reverse('control:user.settings.2fa'))
else: