diff --git a/includes/helper/email_helper.php b/includes/helper/email_helper.php index 1d84cb34..b5ef0186 100644 --- a/includes/helper/email_helper.php +++ b/includes/helper/email_helper.php @@ -26,8 +26,8 @@ function engelsystem_email_to_user($recipientUser, $title, $message, $notIfItsMe ); if (!$status) { - error(sprintf(__('User %s could not be notified by email due to an error.'), $recipientUser->displayName)); - engelsystem_log(sprintf('User %s could not be notified by email due to an error.', $recipientUser->name)); + error(sprintf(__('User %s could not be notified by e-mail due to an error.'), $recipientUser->displayName)); + engelsystem_log(sprintf('User %s could not be notified by e-mail due to an error.', $recipientUser->name)); } return $status; diff --git a/resources/lang/de_DE/default.po b/resources/lang/de_DE/default.po index 997ef5be..d434b051 100644 --- a/resources/lang/de_DE/default.po +++ b/resources/lang/de_DE/default.po @@ -25,7 +25,7 @@ msgid "here is a message for you from the %s:" msgstr "hier ist eine Nachricht aus dem %s für Dich:" msgid "" -"This email is autogenerated and has not been signed. You got this email " +"This e-mail is autogenerated and has not been signed. You got this e-mail " "because you are registered in the %s." msgstr "" "Diese E-Mail wurde automatisch generiert und muss daher nicht unterschrieben " @@ -146,9 +146,9 @@ msgstr "Hinweis: Cookies müssen aktiviert sein!" msgid "Confirm password" msgstr "Passwort wiederholen" -msgid "We sent you an email containing your password recovery link." +msgid "We sent you an e-mail containing your password recovery link." msgstr "" -"Wir haben dir eine eMail mit einem Link zum Passwort-zurücksetzen geschickt." +"Wir haben dir eine E-Mail mit einem Link zum Passwort-zurücksetzen geschickt." msgid "Password saved." msgstr "Passwort gespeichert." @@ -158,10 +158,10 @@ msgstr "Passwort wiederherstellen" msgid "" "We will send you an e-mail with a password recovery link. Please use the " -"email address you used for registration." +"e-mail address you used for registration." msgstr "" -"Wir werden eine eMail mit einem Link schicken, mit dem du das Passwort " -"zurücksetzen kannst. Bitte benutze die Mailadresse, die du bei der Anmeldung " +"Wir werden eine E-Mail mit einem Link schicken, mit dem du das Passwort " +"zurücksetzen kannst. Bitte benutze die E-Mail-Adresse, die du bei der Anmeldung " "verwendet hast." msgid "Recover" @@ -457,7 +457,7 @@ msgstr "Genug" msgid "All users" msgstr "Alle Benutzer" -msgid "User %s could not be notified by email due to an error." +msgid "User %s could not be notified by e-mail due to an error." msgstr "" "Aufgrund eines Fehlers konnte dem User %s keine E-Mail gesendet werden." @@ -1654,7 +1654,7 @@ msgid "general.email" msgstr "E-Mail" msgid "settings.profile.email.already-taken" -msgstr "Die E-Mail-Adresse ist bereits vergeben." +msgstr "Diese E-Mail-Adresse ist bereits vergeben." msgid "settings.profile.email_shiftinfo" msgstr "Das %s darf mir E-Mails senden (z.B. wenn sich meine Schichten ändern)." @@ -1666,7 +1666,7 @@ msgid "settings.profile.email_messages" msgstr "Benachrichtige mich bei neuen privaten Nachrichten." msgid "settings.profile.email_by_human_allowed" -msgstr "Erlaube Himmel-Engeln mich per Mail zu kontaktieren." +msgstr "Erlaube Himmel-Engeln mich per E-Mail zu kontaktieren." msgid "settings.profile.email_goody" msgstr "Um gegebenenfalls Voucher für das nächste gleichartige Event zu erhalten stimme ich zu, " diff --git a/resources/lang/en_US/additional.po b/resources/lang/en_US/additional.po index 9f6f6964..2fd3611d 100644 --- a/resources/lang/en_US/additional.po +++ b/resources/lang/en_US/additional.po @@ -45,10 +45,10 @@ msgstr "" "Use up to 24 letters, numbers or connecting punctuations (.-_) for your nickname." msgid "validation.email.required" -msgstr "The email address is required." +msgstr "The e-mail address is required." msgid "validation.email.email" -msgstr "This email address is not valid." +msgstr "This e-mail address is not valid." msgid "validation.password.length" msgstr "Your new password is too short." diff --git a/resources/lang/en_US/default.po b/resources/lang/en_US/default.po index c531b80d..101912b7 100644 --- a/resources/lang/en_US/default.po +++ b/resources/lang/en_US/default.po @@ -269,13 +269,13 @@ msgid "settings.profile.mobile_show" msgstr "Show mobile number to other users to contact me." msgid "settings.profile.email-preferences" -msgstr "E-Mail preferences" +msgstr "E-mail preferences" msgid "general.email" -msgstr "E-Mail" +msgstr "E-mail" msgid "settings.profile.email.already-taken" -msgstr "The email is already taken." +msgstr "This e-mail address is already taken." msgid "settings.profile.email_shiftinfo" msgstr "The %s is allowed to send me an e-mail (e.g. when my shifts change)." @@ -576,7 +576,7 @@ msgid "angeltypes.can-change-later" msgstr "You can change your selection later in the settings." msgid "angeltypes.email" -msgstr "E-Mail" +msgstr "E-mail" msgid "angeltypes.shift.self_signup.info" msgstr "Angel types which have shift self signup enabled allow angels to self sign up for there shifts, " diff --git a/resources/views/emails/mail.twig b/resources/views/emails/mail.twig index ce15d8a3..dd9e6bd9 100644 --- a/resources/views/emails/mail.twig +++ b/resources/views/emails/mail.twig @@ -10,5 +10,5 @@ {%- if config('enable_show_day_of_event') and day_of_event is defined %} , {{ __('event.day', [day_of_event]) }} {% endif %} -{{ __('This email is autogenerated and has not been signed. You got this email because you are registered in the %s.', [config('app_name')]) }} +{{ __('This e-mail is autogenerated and has not been signed. You got this e-mail because you are registered in the %s.', [config('app_name')]) }} {% endblock %} diff --git a/resources/views/pages/password/reset-success.twig b/resources/views/pages/password/reset-success.twig index 19b8a93e..436b928d 100644 --- a/resources/views/pages/password/reset-success.twig +++ b/resources/views/pages/password/reset-success.twig @@ -4,7 +4,7 @@ {% block row_content %}
{% if type == 'email' %} - {{ m.alert(__('We sent you an email containing your password recovery link.'), 'info') }} + {{ m.alert(__('We sent you an e-mail containing your password recovery link.'), 'info') }} {% elseif type == 'reset' %} {{ m.alert(__('Password saved.'), 'success') }} {% endif %} diff --git a/resources/views/pages/password/reset.twig b/resources/views/pages/password/reset.twig index 16f695f0..a2886648 100644 --- a/resources/views/pages/password/reset.twig +++ b/resources/views/pages/password/reset.twig @@ -16,7 +16,7 @@
{{ csrf() }} - {{ __('We will send you an e-mail with a password recovery link. Please use the email address you used for registration.') }} + {{ __('We will send you an e-mail with a password recovery link. Please use the e-mail address you used for registration.') }} {{ f.input('email', __('general.email'), { 'type': 'email', 'required': true,