From 93ef006753cd5b04f55225120bd183076cfc460d Mon Sep 17 00:00:00 2001 From: Marius Cramer <m.cramer@pixcept.de> Date: Wed, 5 Feb 2014 09:59:42 +0100 Subject: [PATCH] Implemented: FS#3150 - Add description text to spamfilter levels --- interface/web/mail/form/spamfilter_blacklist.tform.php | 2 +- interface/web/mail/form/spamfilter_users.tform.php | 2 +- interface/web/mail/form/spamfilter_whitelist.tform.php | 2 +- interface/web/mail/lib/lang/de_spamfilter_blacklist.lng | 3 +++ interface/web/mail/lib/lang/de_spamfilter_users.lng | 3 +++ interface/web/mail/lib/lang/de_spamfilter_whitelist.lng | 3 +++ interface/web/mail/lib/lang/en_spamfilter_blacklist.lng | 3 +++ interface/web/mail/lib/lang/en_spamfilter_users.lng | 3 +++ interface/web/mail/lib/lang/en_spamfilter_whitelist.lng | 3 +++ 9 files changed, 21 insertions(+), 3 deletions(-) diff --git a/interface/web/mail/form/spamfilter_blacklist.tform.php b/interface/web/mail/form/spamfilter_blacklist.tform.php index 091fb45063..495ce5f5fa 100644 --- a/interface/web/mail/form/spamfilter_blacklist.tform.php +++ b/interface/web/mail/form/spamfilter_blacklist.tform.php @@ -101,7 +101,7 @@ $form["tabs"]['blacklist'] = array ( 'datatype' => 'INTEGER', 'formtype' => 'SELECT', 'default' => 5, - 'value' => array(1 => 1, 2 => 2, 3 => 3, 4 => 4, 5 => 5, 6 => 6, 7 => 7, 8 => 8, 9 => 9, 10 => 10) + 'value' => array(1 => '1 - lowest', 2 => 2, 3 => 3, 4 => 4, 5 => '5 - medium', 6 => 6, 7 => 7, 8 => 8, 9 => 9, 10 => '10 - highest') ), 'active' => array ( 'datatype' => 'VARCHAR', diff --git a/interface/web/mail/form/spamfilter_users.tform.php b/interface/web/mail/form/spamfilter_users.tform.php index 7bd6c460f7..2bbb12c0cf 100644 --- a/interface/web/mail/form/spamfilter_users.tform.php +++ b/interface/web/mail/form/spamfilter_users.tform.php @@ -73,7 +73,7 @@ $form["tabs"]['users'] = array ( 'datatype' => 'INTEGER', 'formtype' => 'SELECT', 'default' => 5, - 'value' => array(1 => 1, 2 => 2, 3 => 3, 4 => 4, 5 => 5, 6 => 6, 7 => 7, 8 => 8, 9 => 9, 10 => 10) + 'value' => array(1 => '1 - lowest', 2 => 2, 3 => 3, 4 => 4, 5 => '5 - medium', 6 => 6, 7 => 7, 8 => 8, 9 => 9, 10 => '10 - highest') ), 'policy_id' => array ( 'datatype' => 'INTEGER', diff --git a/interface/web/mail/form/spamfilter_whitelist.tform.php b/interface/web/mail/form/spamfilter_whitelist.tform.php index bf2ae439c4..ddd54d1635 100644 --- a/interface/web/mail/form/spamfilter_whitelist.tform.php +++ b/interface/web/mail/form/spamfilter_whitelist.tform.php @@ -108,7 +108,7 @@ $form["tabs"]['whitelist'] = array ( 'datatype' => 'INTEGER', 'formtype' => 'SELECT', 'default' => 5, - 'value' => array(1 => 1, 2 => 2, 3 => 3, 4 => 4, 5 => 5, 6 => 6, 7 => 7, 8 => 8, 9 => 9, 10 => 10) + 'value' => array(1 => '1 - lowest', 2 => 2, 3 => 3, 4 => 4, 5 => '5 - medium', 6 => 6, 7 => 7, 8 => 8, 9 => 9, 10 => '10 - highest') ), 'active' => array ( 'datatype' => 'VARCHAR', diff --git a/interface/web/mail/lib/lang/de_spamfilter_blacklist.lng b/interface/web/mail/lib/lang/de_spamfilter_blacklist.lng index 58ce054b74..46cc31de65 100644 --- a/interface/web/mail/lib/lang/de_spamfilter_blacklist.lng +++ b/interface/web/mail/lib/lang/de_spamfilter_blacklist.lng @@ -6,4 +6,7 @@ $wb['email_txt'] = 'E-Mail Adresse'; $wb['priority_txt'] = 'Priorität'; $wb['active_txt'] = 'Aktiv'; $wb['limit_spamfilter_wblist_txt'] = 'Die maximale Anzahl an White- oder Blacklist Einträgen für ihr Konto wurde erreicht.'; +$wb['10 - highest'] = '10 - höchste'; +$wb['5 - medium'] = '5 - normal'; +$wb['1 - lowest'] = '1 - niedrigste'; ?> \ No newline at end of file diff --git a/interface/web/mail/lib/lang/de_spamfilter_users.lng b/interface/web/mail/lib/lang/de_spamfilter_users.lng index b5e6807f21..faed4f4a21 100644 --- a/interface/web/mail/lib/lang/de_spamfilter_users.lng +++ b/interface/web/mail/lib/lang/de_spamfilter_users.lng @@ -7,4 +7,7 @@ $wb['fullname_txt'] = 'Name'; $wb['local_txt'] = 'Lokal'; $wb['email_error_notempty'] = 'Die E-Mail-Adresse darf nicht leer sein.'; $wb['fullname_error_notempty'] = 'Der Name darf nicht leer sein.'; +$wb['10 - highest'] = '10 - höchste'; +$wb['5 - medium'] = '5 - normal'; +$wb['1 - lowest'] = '1 - niedrigste'; ?> \ No newline at end of file diff --git a/interface/web/mail/lib/lang/de_spamfilter_whitelist.lng b/interface/web/mail/lib/lang/de_spamfilter_whitelist.lng index 1017b7ee77..5e150a55e7 100644 --- a/interface/web/mail/lib/lang/de_spamfilter_whitelist.lng +++ b/interface/web/mail/lib/lang/de_spamfilter_whitelist.lng @@ -6,4 +6,7 @@ $wb['email_txt'] = 'E-Mail'; $wb['priority_txt'] = 'Priorität'; $wb['active_txt'] = 'Aktiv'; $wb['limit_spamfilter_wblist_txt'] = 'Die maximale Anzahl an White- oder Blacklist Einträgen für Ihr Konto wurde erreicht.'; +$wb['10 - highest'] = '10 - höchste'; +$wb['5 - medium'] = '5 - normal'; +$wb['1 - lowest'] = '1 - niedrigste'; ?> \ No newline at end of file diff --git a/interface/web/mail/lib/lang/en_spamfilter_blacklist.lng b/interface/web/mail/lib/lang/en_spamfilter_blacklist.lng index 6478b1f2fc..b71e5966fd 100644 --- a/interface/web/mail/lib/lang/en_spamfilter_blacklist.lng +++ b/interface/web/mail/lib/lang/en_spamfilter_blacklist.lng @@ -6,4 +6,7 @@ $wb["email_txt"] = 'Email'; $wb["priority_txt"] = 'Priority'; $wb["active_txt"] = 'Active'; $wb["limit_spamfilter_wblist_txt"] = 'The max. number of White- or Blacklist records for your account is reached.'; +$wb['10 - highest'] = '10 - highest'; +$wb['5 - medium'] = '5 - medium'; +$wb['1 - lowest'] = '1 - lowest'; ?> \ No newline at end of file diff --git a/interface/web/mail/lib/lang/en_spamfilter_users.lng b/interface/web/mail/lib/lang/en_spamfilter_users.lng index 38d51aee43..280ae9a1c8 100644 --- a/interface/web/mail/lib/lang/en_spamfilter_users.lng +++ b/interface/web/mail/lib/lang/en_spamfilter_users.lng @@ -7,4 +7,7 @@ $wb["fullname_txt"] = 'Name'; $wb["local_txt"] = 'Local'; $wb['email_error_notempty'] = 'The email address must not be empty.'; $wb['fullname_error_notempty'] = 'The name must not be empty.'; +$wb['10 - highest'] = '10 - highest'; +$wb['5 - medium'] = '5 - medium'; +$wb['1 - lowest'] = '1 - lowest'; ?> \ No newline at end of file diff --git a/interface/web/mail/lib/lang/en_spamfilter_whitelist.lng b/interface/web/mail/lib/lang/en_spamfilter_whitelist.lng index 6478b1f2fc..b71e5966fd 100644 --- a/interface/web/mail/lib/lang/en_spamfilter_whitelist.lng +++ b/interface/web/mail/lib/lang/en_spamfilter_whitelist.lng @@ -6,4 +6,7 @@ $wb["email_txt"] = 'Email'; $wb["priority_txt"] = 'Priority'; $wb["active_txt"] = 'Active'; $wb["limit_spamfilter_wblist_txt"] = 'The max. number of White- or Blacklist records for your account is reached.'; +$wb['10 - highest'] = '10 - highest'; +$wb['5 - medium'] = '5 - medium'; +$wb['1 - lowest'] = '1 - lowest'; ?> \ No newline at end of file -- GitLab