Skip to content

Commit a265c64

Browse files
author
Till Brehm
committed
Merge branch '3535-forward-with-empty-email-destination' into 'develop'
Resolve "Forward with Empty email destination" Closes #3535 See merge request ispconfig/ispconfig3!1201
2 parents dadfdf6 + 474cd03 commit a265c64

27 files changed

+64
-1
lines changed

interface/web/mail/lib/lang/ar_mail_forward.lng

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ $wb['duplicate_mailbox_txt'] = 'There is already a mailbox with this email addre
77
$wb['domain_txt'] = 'Domain';
88
$wb['source_txt'] = 'Source Email';
99
$wb['greylisting_txt'] = 'Enable greylisting';
10+
$wb['destination_error_empty'] = 'The destination must not be empty.';
11+
$wb['destination_error_isemail'] = 'The destination contains at least one invalid email address.';
1012
$wb['email_error_isemail'] = 'Please enter a valid email address.';
1113
$wb['send_as_txt'] = 'Send as';
1214
$wb['send_as_exp'] = 'Allow target to send mail using this address as origin (if target is internal)';

interface/web/mail/lib/lang/bg_mail_forward.lng

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ $wb['duplicate_mailbox_txt'] = 'Вече съществува пощенска
77
$wb['domain_txt'] = 'Домейн';
88
$wb['source_txt'] = 'Source Email';
99
$wb['greylisting_txt'] = 'Enable greylisting';
10+
$wb['destination_error_empty'] = 'The destination must not be empty.';
11+
$wb['destination_error_isemail'] = 'The destination contains at least one invalid email address.';
1012
$wb['email_error_isemail'] = 'Please enter a valid email address.';
1113
$wb['send_as_txt'] = 'Send as';
1214
$wb['send_as_exp'] = 'Allow target to send mail using this address as origin (if target is internal)';

interface/web/mail/lib/lang/br_mail_forward.lng

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ $wb['limit_mailforward_txt'] = 'O limite de encaminhamentos de e-mail para esta
66
$wb['duplicate_mailbox_txt'] = 'Já existe um conta de e-mail idêntica.';
77
$wb['domain_txt'] = 'Domínio';
88
$wb['source_txt'] = 'Endereço de e-mail de origem';
9+
$wb['destination_error_empty'] = 'The destination must not be empty.';
10+
$wb['destination_error_isemail'] = 'The destination contains at least one invalid email address.';
911
$wb['email_error_isemail'] = 'Por favor informe um endereço de e-mail válido.';
1012
$wb['send_as_txt'] = 'Enviar como';
1113
$wb['send_as_exp'] = 'Permitir o destino enviar e-mails usando este endereço como origem (se o destino for interno)';

interface/web/mail/lib/lang/ca_mail_forward.lng

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ $wb['limit_mailforward_txt'] = 'Le nombre maximal de transferts d\'email pour vo
66
$wb['duplicate_mailbox_txt'] = 'Il y a déja une boite courriel avec cette adresse courriel';
77
$wb['domain_txt'] = 'Domaine';
88
$wb['source_txt'] = 'Source courriel';
9+
$wb['destination_error_empty'] = 'The destination must not be empty.';
10+
$wb['destination_error_isemail'] = 'The destination contains at least one invalid email address.';
911
$wb['email_error_isemail'] = 'Please enter a valid email address.';
1012
$wb['send_as_txt'] = 'Send as';
1113
$wb['send_as_exp'] = 'Allow target to send mail using this address as origin (if target is internal)';

interface/web/mail/lib/lang/cz_mail_forward.lng

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ $wb['limit_mailforward_txt'] = 'Byl dosažen maximální počet e-mail předáv
66
$wb['duplicate_mailbox_txt'] = 'Mailbox s touto adresou již existuje';
77
$wb['domain_txt'] = 'Doména';
88
$wb['source_txt'] = 'Zdrojový e-mail';
9+
$wb['destination_error_empty'] = 'The destination must not be empty.';
10+
$wb['destination_error_isemail'] = 'The destination contains at least one invalid email address.';
911
$wb['email_error_isemail'] = 'Zadejte prosím platnou e-mailovou adresu.';
1012
$wb['send_as_txt'] = 'Odeslat jako';
1113
$wb['send_as_exp'] = 'Allow target to send mail using this address as origin (if target is internal)';

interface/web/mail/lib/lang/de_mail_forward.lng

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ $wb['limit_mailforward_txt'] = 'Die maximale Anzahl an E-Mail Weiterleitungen f
66
$wb['duplicate_mailbox_txt'] = 'Es existiert bereits ein E-Mail Konto mit dieser Adresse.';
77
$wb['domain_txt'] = 'Domain';
88
$wb['source_txt'] = 'Quell E-Mail Adresse';
9+
$wb['destination_error_empty'] = 'Das Weiterleitungsziel darf nicht leer sein.';
10+
$wb['destination_error_isemail'] = 'Das Weiterleitungsziel enthält mindestens eine ungültige E-Mail-Adresse.';
911
$wb['email_error_isemail'] = 'Bitte geben Sie eine gültige E-Mail Adresse an.';
1012
$wb['send_as_txt'] = 'Senden als';
1113
$wb['send_as_exp'] = 'Ziel erlauben, die Adresse als Absender zu nutzen (Nur, falls das Ziel intern ist)';

interface/web/mail/lib/lang/dk_mail_forward.lng

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ $wb['limit_mailforward_txt'] = 'Max. antal af e-mail forwarders for din konto er
66
$wb['duplicate_mailbox_txt'] = 'Der er allerede en mailboks med denne e-mail adresse';
77
$wb['domain_txt'] = 'Domæne';
88
$wb['source_txt'] = 'Kilde E-mail';
9+
$wb['destination_error_empty'] = 'The destination must not be empty.';
10+
$wb['destination_error_isemail'] = 'The destination contains at least one invalid email address.';
911
$wb['email_error_isemail'] = 'Please enter a valid email address.';
1012
$wb['send_as_txt'] = 'Send as';
1113
$wb['send_as_exp'] = 'Allow target to send mail using this address as origin (if target is internal)';

interface/web/mail/lib/lang/el_mail_forward.lng

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ $wb['duplicate_mailbox_txt'] = 'Υπάρχει ήδη μια θυρίδα με
77
$wb['domain_txt'] = 'Domain';
88
$wb['source_txt'] = 'Source Email';
99
$wb['greylisting_txt'] = 'Enable greylisting';
10+
$wb['destination_error_empty'] = 'The destination must not be empty.';
11+
$wb['destination_error_isemail'] = 'The destination contains at least one invalid email address.';
1012
$wb['email_error_isemail'] = 'Please enter a valid email address.';
1113
$wb['send_as_txt'] = 'Send as';
1214
$wb['send_as_exp'] = 'Allow target to send mail using this address as origin (if target is internal)';

interface/web/mail/lib/lang/en_mail_forward.lng

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ $wb['limit_mailforward_txt'] = 'The max. number of email forwarders for your acc
66
$wb['duplicate_mailbox_txt'] = 'There is already a mailbox with this email address';
77
$wb['domain_txt'] = 'Domain';
88
$wb['source_txt'] = 'Source Email';
9+
$wb['destination_error_empty'] = 'The destination must not be empty.';
10+
$wb['destination_error_isemail'] = 'The destination contains at least one invalid email address.';
911
$wb['email_error_isemail'] = 'Please enter a valid email address.';
1012
$wb['send_as_txt'] = 'Send as';
1113
$wb['send_as_exp'] = 'Allow target to send mail using this address as origin (if target is internal)';

interface/web/mail/lib/lang/es_mail_forward.lng

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ $wb['active_txt'] = 'Habilitado';
33
$wb['destination_txt'] = 'Destino del correo';
44
$wb['domain_txt'] = 'Dominio';
55
$wb['duplicate_mailbox_txt'] = 'Ya existe un buzón con esta cuenta de correo.';
6+
$wb['destination_error_empty'] = 'The destination must not be empty.';
7+
$wb['destination_error_isemail'] = 'The destination contains at least one invalid email address.';
68
$wb['email_error_isemail'] = 'Por favor, introduzca una dirección de correo válida.';
79
$wb['email_txt'] = 'Correo';
810
$wb['greylisting_txt'] = 'Habilitar Lista Gris';

0 commit comments

Comments
 (0)