Skip to content

Commit a460495

Browse files
author
thom
committed
Add autoresponder changes from !1058 for mailusers (#5697)
1 parent 2d2e17b commit a460495

22 files changed

+31
-27
lines changed

interface/web/mailuser/form/mail_user_autoresponder.tform.php

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -94,16 +94,20 @@
9494
'autoresponder_start_date' => array (
9595
'datatype' => 'DATETIME',
9696
'formtype' => 'DATETIME',
97-
'validators'=> array ( 0 => array ( 'type' => 'CUSTOM',
98-
'class' => 'validate_autoresponder',
99-
'function' => 'start_date',
100-
'errmsg'=> 'autoresponder_start_date_isfuture'),
101-
),
97+
'validators'=> array (
98+
0 => array ( 'type' => 'ISDATETIME',
99+
'allowempty' => 'y',
100+
'errmsg'=> 'autoresponder_start_date_is_no_date'),
101+
)
102102
),
103103
'autoresponder_end_date' => array (
104104
'datatype' => 'DATETIME',
105105
'formtype' => 'DATETIME',
106-
'validators' => array ( 0 => array ( 'type' => 'CUSTOM',
106+
'validators'=> array (
107+
0 => array ( 'type' => 'ISDATETIME',
108+
'allowempty' => 'y',
109+
'errmsg'=> 'autoresponder_end_date_is_no_date'),
110+
1 => array ( 'type' => 'CUSTOM',
107111
'class' => 'validate_autoresponder',
108112
'function' => 'end_date',
109113
'errmsg'=> 'autoresponder_end_date_isgreater'),

interface/web/mailuser/lib/lang/ar_mail_user_autoresponder.lng

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ $wb['autoresponder_txt'] = 'Active';
66
$wb['autoresponder_start_date_txt'] = 'Start on';
77
$wb['autoresponder_start_date_isfuture'] = 'Start date cannot be in the past.';
88
$wb['autoresponder_end_date_txt'] = 'End by';
9-
$wb['autoresponder_end_date_isgreater'] = 'End date must be set and be later than start date.';
9+
$wb['autoresponder_end_date_isgreater'] = 'End date must be later than start date.';
1010
$wb['autoresponder_active'] = 'Enable the autoresponder';
1111
$wb['now_txt'] = 'Now';
1212
$wb['autoresponder_subject_txt'] = 'Subject';

interface/web/mailuser/lib/lang/bg_mail_user_autoresponder.lng

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ $wb['autoresponder_txt'] = 'Active';
66
$wb['autoresponder_start_date_txt'] = 'Start on';
77
$wb['autoresponder_start_date_isfuture'] = 'Start date cannot be in the past.';
88
$wb['autoresponder_end_date_txt'] = 'End by';
9-
$wb['autoresponder_end_date_isgreater'] = 'End date must be set and be later than start date.';
9+
$wb['autoresponder_end_date_isgreater'] = 'End date must be later than start date.';
1010
$wb['autoresponder_active'] = 'Enable the autoresponder';
1111
$wb['now_txt'] = 'Now';
1212
$wb['autoresponder_subject_txt'] = 'Subject';

interface/web/mailuser/lib/lang/br_mail_user_autoresponder.lng

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ $wb['autoresponder_txt'] = 'Ativo';
66
$wb['autoresponder_start_date_txt'] = 'Iniciar em';
77
$wb['autoresponder_start_date_isfuture'] = 'O campo "Iniciar em" não pode ser menor que data atual.';
88
$wb['autoresponder_end_date_txt'] = 'Terminar em';
9-
$wb['autoresponder_end_date_isgreater'] = 'O campo "Terminar em" não pode ser menor que "Iniciar em".';
9+
$wb['autoresponder_end_date_isgreater'] = 'End date must be later than start date.';
1010
$wb['autoresponder_active'] = 'Habilitar auto-resposta';
1111
$wb['now_txt'] = 'Agora';
1212
$wb['autoresponder_subject_txt'] = 'Assunto';

interface/web/mailuser/lib/lang/ca_mail_user_autoresponder.lng

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ $wb['autoresponder_txt'] = 'Active';
66
$wb['autoresponder_start_date_txt'] = 'Start on';
77
$wb['autoresponder_start_date_isfuture'] = 'Start date cannot be in the past.';
88
$wb['autoresponder_end_date_txt'] = 'End by';
9-
$wb['autoresponder_end_date_isgreater'] = 'End date must be set and be later than start date.';
9+
$wb['autoresponder_end_date_isgreater'] = 'End date must be later than start date.';
1010
$wb['autoresponder_active'] = 'Enable the autoresponder';
1111
$wb['now_txt'] = 'Now';
1212
$wb['autoresponder_subject_txt'] = 'Subject';

interface/web/mailuser/lib/lang/cz_mail_user_autoresponder.lng

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ $wb['autoresponder_txt'] = 'Aktivní';
66
$wb['autoresponder_start_date_txt'] = 'Začít od';
77
$wb['autoresponder_start_date_isfuture'] = 'Datum zahájení nesmí být v minulosti.';
88
$wb['autoresponder_end_date_txt'] = 'Skončit';
9-
$wb['autoresponder_end_date_isgreater'] = 'Datum ukončení musí být nastaven a musí být pozdější než datum zahájení.';
9+
$wb['autoresponder_end_date_isgreater'] = 'End date must be later than start date.';
1010
$wb['autoresponder_active'] = 'Povolit automatický odpovídač';
1111
$wb['now_txt'] = 'Nyní';
1212
$wb['autoresponder_subject_txt'] = 'Předmět e-mailu';

interface/web/mailuser/lib/lang/de_mail_user_autoresponder.lng

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ $wb['autoresponder_txt'] = 'Aktiv';
66
$wb['autoresponder_start_date_txt'] = 'Start am';
77
$wb['autoresponder_start_date_isfuture'] = 'Start Datum kann nicht in der Vergangenheit sein.';
88
$wb['autoresponder_end_date_txt'] = 'Ende am';
9-
$wb['autoresponder_end_date_isgreater'] = 'End Datum muss gesetzt werden und nach dem Start Datum sein.';
9+
$wb['autoresponder_end_date_isgreater'] = 'End Datum muss nach dem Start Datum sein.';
1010
$wb['autoresponder_active'] = 'Autoresponder aktivieren';
1111
$wb['now_txt'] = 'Jetzt';
1212
$wb['autoresponder_subject_txt'] = 'Betreff';

interface/web/mailuser/lib/lang/dk_mail_user_autoresponder.lng

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ $wb['autoresponder_txt'] = 'Aktiv';
66
$wb['autoresponder_start_date_txt'] = 'Start d.';
77
$wb['autoresponder_start_date_isfuture'] = 'Start dato kan ikke være i fortid.';
88
$wb['autoresponder_end_date_txt'] = 'Slut d.';
9-
$wb['autoresponder_end_date_isgreater'] = 'Slut dato skal indtastes og være senere end start dato.';
9+
$wb['autoresponder_end_date_isgreater'] = 'End date must be later than start date.';
1010
$wb['autoresponder_active'] = 'Aktiver autosvarer';
1111
$wb['now_txt'] = 'Nu';
1212
$wb['autoresponder_subject_txt'] = 'Emne';

interface/web/mailuser/lib/lang/el_mail_user_autoresponder.lng

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ $wb['autoresponder_txt'] = 'Active';
66
$wb['autoresponder_start_date_txt'] = 'Start on';
77
$wb['autoresponder_start_date_isfuture'] = 'Start date cannot be in the past.';
88
$wb['autoresponder_end_date_txt'] = 'End by';
9-
$wb['autoresponder_end_date_isgreater'] = 'End date must be set and be later than start date.';
9+
$wb['autoresponder_end_date_isgreater'] = 'End date must be later than start date.';
1010
$wb['autoresponder_active'] = 'Enable the autoresponder';
1111
$wb['now_txt'] = 'Now';
1212
$wb['autoresponder_subject_txt'] = 'Subject';

interface/web/mailuser/lib/lang/es_mail_user_autoresponder.lng

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
$wb['autoresponder_active'] = 'Activar auto respuesta';
3-
$wb['autoresponder_end_date_isgreater'] = 'Debe indicar la fecha de finalización y esta debe ser mayor a la de inicio.';
3+
$wb['autoresponder_end_date_isgreater'] = 'End date must be later than start date.';
44
$wb['autoresponder_end_date_txt'] = 'Finaliza el';
55
$wb['autoresponder_start_date_txt'] = 'Comienza el';
66
$wb['autoresponder_subject'] = 'Estoy fuera de la oficina';

0 commit comments

Comments
 (0)