paxton
/
mailcow
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Web] Some language updates for sys mails

master
André 2018-10-12 10:57:47 +02:00
parent 23e6e52f4f
commit 5ce15eac4b
4 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/web/admin.php
View File

@ -10,7 +10,7 @@ $tfa_data = get_tfa();
<ul class="nav nav-tabs" role="tablist">
<li role="presentation" class="active"><a href="#tab-access" aria-controls="tab-access" role="tab" data-toggle="tab"><?=$lang['admin']['access'];?></a></li>
<li role="presentation"><a href="#tab-config" aria-controls="tab-config" role="tab" data-toggle="tab"><?=$lang['admin']['configuration'];?></a></li>
<li role="presentation"><a href="#tab-sys-mails" aria-controls="tab-sys-mails" role="tab" data-toggle="tab">System mails</a></li>
<li role="presentation"><a href="#tab-sys-mails" aria-controls="tab-sys-mails" role="tab" data-toggle="tab"><?=$lang['admin']['sys_mails'];?></a></li>
</ul>
<div class="tab-content" style="padding-top:20px">
@ -849,7 +849,7 @@ $tfa_data = get_tfa();
</div>
<div class="form-group">
<div class="col-sm-offset-2 col-sm-10">
<button class="btn btn-default" type="submit" id="mass_send" name="mass_send" disabled><span class="glyphicon glyphicon-envelope"></span> Send</button>
<button class="btn btn-default" type="submit" id="mass_send" name="mass_send" disabled><span class="glyphicon glyphicon-envelope"></span> <?=$lang['admin']['send'];?></button>
</div>
</div>
</form>

6
data/web/inc/functions.inc.php
View File

@ -47,7 +47,7 @@ function sys_mail($_data) {
$_SESSION['return'][] = array(
'type' => 'danger',
'log' => array(__FUNCTION__),
'msg' => 'From address must be a valid email address'
'msg' => 'from_invalid'
);
return false;
}
@ -55,7 +55,7 @@ function sys_mail($_data) {
$_SESSION['return'][] = array(
'type' => 'danger',
'log' => array(__FUNCTION__),
'msg' => 'Subject must not be empty'
'msg' => 'subject_empty'
);
return false;
}
@ -63,7 +63,7 @@ function sys_mail($_data) {
$_SESSION['return'][] = array(
'type' => 'danger',
'log' => array(__FUNCTION__),
'msg' => 'Text must not be empty'
'msg' => 'text_empty'
);
return false;
}

20
data/web/lang/lang.de.php
View File

@ -690,14 +690,18 @@ $lang['success']['tls_policy_map_entry_deleted'] = 'TLS-Richtlinie mit der ID %s
$lang['mailbox']['add_tls_policy_map'] = "TLS-Richtlinieneintrag hinzufügen";
$lang['danger']['tls_policy_map_parameter_invalid'] = "Parameter ist ungültig";
$lang['admin']['sys_mails'] = 'System mails';
$lang['admin']['subject'] = 'Subject';
$lang['admin']['from'] = 'From';
$lang['admin']['include_exclude'] = 'Include/Exclude';
$lang['admin']['include_exclude_info'] = 'By default - with no selection - <b>all mailboxes</b> are addressed';
$lang['admin']['excludes'] = 'Excludes these recipients';
$lang['admin']['includes'] = 'Include these recipients';
$lang['admin']['sys_mails'] = 'System E-Mails';
$lang['admin']['subject'] = 'Betreff';
$lang['admin']['from'] = 'Absender';
$lang['admin']['include_exclude'] = 'Ein- und Ausschlüsse';
$lang['admin']['include_exclude_info'] = 'Ohne Auswahl werden alle Mailboxen adressiert.';
$lang['admin']['excludes'] = 'Diese Empfänger ausschließen';
$lang['admin']['includes'] = 'Diese Empfänger einschließen';
$lang['admin']['text'] = 'Text';
$lang['admin']['activate_send'] = 'Activate send button';
$lang['admin']['activate_send'] = 'Senden-Button freischalten';
$lang['admin']['send'] = 'Senden';
$lang['warning']['ip_invalid'] = 'Ungültige IP übersprungen: %s';
$lang['danger']['text_empty'] = 'Text darf nicht leer sein';
$lang['danger']['subject_empty'] = 'Betreff darf nicht leer sein';
$lang['danger']['from_invalid'] = 'From address must be a valid email address';

4
data/web/lang/lang.en.php
View File

@ -723,5 +723,9 @@ $lang['admin']['excludes'] = 'Excludes these recipients';
$lang['admin']['includes'] = 'Include these recipients';
$lang['admin']['text'] = 'Text';
$lang['admin']['activate_send'] = 'Activate send button';
$lang['admin']['send'] = 'Send';
$lang['warning']['ip_invalid'] = 'Skipped invalid IP: %s';
$lang['danger']['text_empty'] = 'Text must not be empty';
$lang['danger']['subject_empty'] = 'Subject must not be empty';
$lang['danger']['from_invalid'] = 'Absender darf nicht leer sein';