occured -> occurred (#660)

* Fix duplicate source string

* occured -> occurred

All resources I could find listed this as misspelled, but I wasn't too
sure…
Also, it should be checked if all changes to the .po-files are respected
in the corresponding src-files.

src/pretix/base/services/orders.py

@@ -53,7 +53,7 @@ error_messages = {
                  'the quantity you selected. Please see below for details.'),
     'price_changed': _('The price of some of the items in your cart has changed in the '
                        'meantime. Please see below for details.'),
-    'internal': _("An internal error occured, please try again."),
+    'internal': _("An internal error occurred, please try again."),
     'empty': _("Your cart is empty."),
     'max_items_per_product': _("You cannot select more than %(max)s items of the product %(product)s. We removed the "
                                "surplus items from your cart."),

src/pretix/base/views/async.py

@@ -133,7 +133,7 @@ class AsyncAction:
             return str(exception)
         else:
             logger.error('Unexpected exception: %r' % exception)
-            return _('An unexpected error has occured.')
+            return _('An unexpected error has occurred.')
 
     def get_success_message(self, value):
         return _('The task has been completed.')

src/pretix/control/views/event.py

@@ -457,7 +457,7 @@ class MailSettings(EventSettingsViewMixin, EventSettingsFormView):
                 try:
                     backend.test(self.request.event.settings.mail_from)
                 except Exception as e:
-                    messages.warning(self.request, _('An error occured while contacting the SMTP server: %s') % str(e))
+                    messages.warning(self.request, _('An error occurred while contacting the SMTP server: %s') % str(e))
                 else:
                     if form.cleaned_data.get('smtp_use_custom'):
                         messages.success(self.request, _('Your changes have been saved and the connection attempt to '

src/pretix/control/views/orders.py

@@ -611,7 +611,7 @@ class OrderChange(OrderView):
         form_valid = self._process_add(ocm) and self._process_change(ocm) and self._process_other(ocm)
 
         if not form_valid:
-            messages.error(self.request, _('An error occured. Please see the details below.'))
+            messages.error(self.request, _('An error occurred. Please see the details below.'))
         else:
             try:
                 ocm.commit()

src/pretix/locale/de/LC_MESSAGES/django.po

@@ -2239,8 +2239,8 @@ msgstr ""
 "Der Preis einiger Produkte in Ihrem Warenkorb hat sich zwischenzeitlich "
 "geändert."
 
-#: pretix/base/services/orders.py:56
+#: pretix/base/services/orders.py:52
-msgid "An internal error occured, please try again."
+msgid "An internal error occurred, please try again."
 msgstr "Ein interner Fehler ist aufgetreten, bitte erneut versuchen."
 
 #: pretix/base/services/orders.py:57
@@ -2949,7 +2949,7 @@ msgid "This slug has an invalid value: %(value)s."
 msgstr "Diese Kurzform hat einen ungültigen Wert: %(value)s."
 
 #: pretix/base/views/async.py:136
-msgid "An unexpected error has occured."
+msgid "An unexpected error has occurred."
 msgstr "Ein unerwarteter Fehler ist aufgetreten."
 
 #: pretix/base/views/async.py:139
@@ -7957,7 +7957,7 @@ msgstr ""
 
 #: pretix/control/views/event.py:460
 #, python-format
-msgid "An error occured while contacting the SMTP server: %s"
+msgid "An error occurred while contacting the SMTP server: %s"
 msgstr "Ein Fehler trat auf beim Versuch, den SMTP-Server zu erreichen: %s"
 
 #: pretix/control/views/event.py:463
@@ -8249,8 +8249,13 @@ msgid "This action is only allowed for pending or paid orders."
 msgstr ""
 "Dieser Aktion ist nur für ausstehende und bezahlte Bestellungen möglich."
 
+<<<<<<< HEAD
 #: pretix/control/views/orders.py:614
 msgid "An error occured. Please see the details below."
+=======
+#: pretix/control/views/orders.py:607
+msgid "An error occurred. Please see the details below."
+>>>>>>> bb2cd0c3... occured -> occurred
 msgstr ""
 "Ein Fehler ist aufgetreten, bitte schauen Sie weiter unten für Details."
 
@@ -8813,7 +8818,7 @@ msgid ""
 msgstr "Der Import wird verarbeitet, bitte einen Moment Geduld …"
 
 #: pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/job_detail.html:18
-msgid "An internal error occured during processing your data."
+msgid "An internal error occurred during processing your data."
 msgstr "Beim Verarbeiten der Daten ist ein interner Fehler aufgetreten."
 
 #: pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/job_detail.html:22

src/pretix/locale/de/LC_MESSAGES/djangojs.po

@@ -103,7 +103,7 @@ msgstr ""
 #: pretix/static/pretixbase/js/asyncdownload.js:41
 #: pretix/static/pretixbase/js/asynctask.js:62
 #: pretix/static/pretixbase/js/asynctask.js:116
-msgid "An error of type {code} occured."
+msgid "An error of type {code} occurred."
 msgstr "Ein Fehler ist aufgetreten. Fehlercode: {code}"
 
 #: pretix/static/pretixbase/js/asyncdownload.js:54
@@ -168,10 +168,6 @@ msgstr "Drücken Sie Strg+C zum Kopieren!"
 msgid "An error has occurred."
 msgstr "Ein Fehler ist aufgetreten."
 
-#: pretix/static/pretixcontrol/js/ui/mail.js:23
-msgid "An error of type {code} occurred."
-msgstr "Ein Fehler vom Typ {code} ist aufgetreten."
-
 #: pretix/static/pretixcontrol/js/ui/mail.js:52
 msgid "Generating messages …"
 msgstr "Generiere Nachrichten…"

src/pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/job_detail.html

@@ -15,7 +15,7 @@
     {% else %}
         {% if job.state == "error" %}
             <div class="alert alert-danger">
-                {% trans "An internal error occured during processing your data." %}
+                {% trans "An internal error occurred during processing your data." %}
             </div>
         {% elif transactions_ignored == 0 and transactions_invalid == 0 and transactions_valid == 0 %}
             <div class="alert alert-info">

src/pretix/static/pretixbase/js/asyncdownload.js

@@ -38,7 +38,7 @@ function async_dl_check_error(jqXHR, textStatus, errorThrown) {
     if (c.length > 0) {
         ajaxErrDialog.show(c.first().html());
     } else if (jqXHR.status >= 400) {
-        alert(gettext('An error of type {code} occured.').replace(/\{code\}/, jqXHR.status));
+        alert(gettext('An error of type {code} occurred.').replace(/\{code\}/, jqXHR.status));
     }
 }
 

src/pretix/static/pretixbase/js/asynctask.js

@@ -59,7 +59,7 @@ function async_task_check_error(jqXHR, textStatus, errorThrown) {
         if (jqXHR.status >= 400 && jqXHR.status < 500) {
             $("body").data('ajaxing', false);
             waitingDialog.hide();
-            alert(gettext('An error of type {code} occured.').replace(/\{code\}/, jqXHR.status));
+            alert(gettext('An error of type {code} occurred.').replace(/\{code\}/, jqXHR.status));
         } else {
             // 500 can be an application error or overload in some cases :(
             $("#loadingmodal p").text(gettext('We currently cannot reach the server, but we keep trying.' +
@@ -113,7 +113,7 @@ function async_task_error(jqXHR, textStatus, errorThrown) {
     } else {
         if (jqXHR.status >= 400 && jqXHR.status < 500) {
             waitingDialog.hide();
-            alert(gettext('An error of type {code} occured.').replace(/\{code\}/, jqXHR.status));
+            alert(gettext('An error of type {code} occurred.').replace(/\{code\}/, jqXHR.status));
         } else {
             waitingDialog.hide();
             alert(gettext('We currently cannot reach the server. Please try again. ' +