From 459d824cf3ca05160cee1cde2451b410d6cd2770 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Fri, 06 Jan 2012 06:26:50 -0500
Subject: [PATCH] Fixed: FS#1962 - mail_user mail filters for maildrop not working correctly (or misleading) - Updated russian language file.
---
interface/lib/lang/ru.lng | 141 +++++++++++++++++++++++-----------------------
interface/lib/plugins/mail_user_filter_plugin.inc.php | 4
2 files changed, 72 insertions(+), 73 deletions(-)
diff --git a/interface/lib/lang/ru.lng b/interface/lib/lang/ru.lng
index baabff7..0568b5e 100644
--- a/interface/lib/lang/ru.lng
+++ b/interface/lib/lang/ru.lng
@@ -1,71 +1,70 @@
-<?php
-$wb['conf_format_dateshort'] = 'Y-m-d';
-$wb['conf_format_datelong'] = 'l dS of F Y';
-$wb['conf_format_timeshort'] = 'H:i';
-$wb['conf_format_timelong'] = 'H:i:s';
-$wb['conf_format_datetime'] = 'Y-m-d H:i';
-$wb['number_format_decimals'] = '2';
-$wb['number_format_dec_point'] = '.';
-$wb['number_format_thousands_sep'] = '';
-$wb['delete_confirmation'] = 'Вы действительно хотите удалить эту запись?';
-$wb['error_no_view_permission'] = 'Вы не имеете прав для удаления или запись отсутсвует!';
-$wb['error_no_delete_permission'] = 'Вы не имеете прав для удаления этой записи!';
-$wb['page_txt'] = 'Страница';
-$wb['page_of_txt'] = 'из';
-$wb['page_next_txt'] = 'Далее';
-$wb['page_back_txt'] = 'Назад';
-$wb['delete_txt'] = 'Удалить';
-$wb['filter_txt'] = 'Фильтр';
-$wb['add_new_record_txt'] = 'Добавить новую запись';
-$wb['btn_save_txt'] = 'Сохранить';
-$wb['btn_cancel_txt'] = 'Отмена';
-$wb['toolsarea_head_txt'] = 'Утилиты';
-$wb['page_and_txt'] = 'и';
-$wb['top_menu_system'] = 'Сиситема';
-$wb['top_menu_client'] = 'Клиент';
-$wb['top_menu_email'] = 'Почта';
-$wb['top_menu_monitor'] = 'Монитор';
-$wb['top_menu_sites'] = 'Сайты';
-$wb['top_menu_dns'] = 'ДНС';
-$wb['top_menu_tools'] = 'Утилиты';
-$wb['top_menu_help'] = 'Помощь';
-$wb['top_menu_billing'] = 'Billing';
-$wb['top_menu_domain'] = 'Domains';
-$wb['top_menu_dashboard'] = 'Home';
-$wb['latest_news_txt'] = 'Latest news';
-$wb['error_301'] = 'Module not permitted for the current user.';
-$wb['error_302'] = 'Module invalid.';
-$wb['error_1001'] = 'The username and password cannot be empty !';
-$wb['error_1002'] = 'The username and/or password are not correct !';
-$wb['error_1003'] = 'The username is deactivated!';
-$wb['top_menu_vm'] = 'VServer';
-$wb['datepicker_nextText'] = 'Next';
-$wb['datepicker_prevText'] = 'Prev';
-$wb['daynamesmin_su'] = 'Su';
-$wb['daynamesmin_mo'] = 'Mo';
-$wb['daynamesmin_tu'] = 'Tu';
-$wb['daynamesmin_we'] = 'We';
-$wb['daynamesmin_th'] = 'Th';
-$wb['daynamesmin_fr'] = 'Fr';
-$wb['daynamesmin_sa'] = 'Sa';
-$wb['daynames_sunday'] = 'Sunday';
-$wb['daynames_monday'] = 'Monday';
-$wb['daynames_tuesday'] = 'Tuesday';
-$wb['daynames_wednesday'] = 'Wednesday';
-$wb['daynames_thursday'] = 'Thursday';
-$wb['daynames_friday'] = 'Friday';
-$wb['daynames_saturday'] = 'Saturday';
-$wb['monthnamesshort_jan'] = 'Jan';
-$wb['monthnamesshort_feb'] = 'Feb';
-$wb['monthnamesshort_mar'] = 'Mar';
-$wb['monthnamesshort_apr'] = 'Apr';
-$wb['monthnamesshort_may'] = 'May';
-$wb['monthnamesshort_jun'] = 'Jun';
-$wb['monthnamesshort_jul'] = 'Jul';
-$wb['monthnamesshort_aug'] = 'Aug';
-$wb['monthnamesshort_sep'] = 'Sep';
-$wb['monthnamesshort_oct'] = 'Oct';
-$wb['monthnamesshort_nov'] = 'Nov';
-$wb['monthnamesshort_dec'] = 'Dec';
-$wb['logout_txt'] = 'LOGOUT';
-?>
+<?php
+$wb['conf_format_dateshort'] = "Y-m-d";
+$wb['conf_format_datelong'] = "l dS of F Y";
+$wb['conf_format_timeshort'] = "H:i";
+$wb['conf_format_timelong'] = "H:i:s";
+$wb['conf_format_datetime'] = "Y-m-d H:i";
+$wb['number_format_decimals'] = "2";
+$wb['number_format_dec_point'] = ",";
+$wb['number_format_thousands_sep'] = "";
+$wb['delete_confirmation'] = "Вы действительно хотите удалить эту запись?";
+$wb['error_no_view_permission'] = "Вы не имеете прав для удаления или запись отсутсвует!";
+$wb['error_no_delete_permission'] = "Вы не имеете прав для удаления этой записи!";
+$wb['page_txt'] = "Страница";
+$wb['page_of_txt'] = "из";
+$wb['page_next_txt'] = "Далее";
+$wb['page_back_txt'] = "Назад";
+$wb['delete_txt'] = "Удалить";
+$wb['filter_txt'] = "Фильтр";
+$wb['add_new_record_txt'] = "Добавить новую запись";
+$wb['btn_save_txt'] = "Сохранить";
+$wb['btn_cancel_txt'] = "Отмена";
+$wb['toolsarea_head_txt'] = "Утилиты";
+$wb['page_and_txt'] = "и";
+$wb['top_menu_system'] = "Система";
+$wb['top_menu_client'] = "Клиент";
+$wb['top_menu_email'] = "Почта";
+$wb['top_menu_monitor'] = "Монитор";
+$wb['top_menu_sites'] = "Сайты";
+$wb['top_menu_dns'] = "ДНС";
+$wb['top_menu_tools'] = "Утилиты";
+$wb['top_menu_help'] = "Помощь";
+$wb['top_menu_billing'] = "Билинг";
+$wb['top_menu_domain'] = "Домены";
+$wb['top_menu_dashboard'] = "Главная";
+$wb['latest_news_txt'] = "Последние новости";
+$wb['error_301'] = "Модуль не доступен текущему пользователю.";
+$wb['error_302'] = "Модуль неиспарвный.";
+$wb['error_1001'] = "Имя пользователя и пароль не могут быть пустыми!";
+$wb['error_1002'] = "Имя пользователя и/или пароль некорректны !";
+$wb['error_1003'] = "Имя пользователя отключено!";
+$wb['top_menu_vm'] = "VServer";
+$wb['datepicker_nextText'] = "Далее";
+$wb['datepicker_prevText'] = "Назад";
+$wb['daynamesmin_su'] = "Вс";
+$wb['daynamesmin_mo'] = "Пн";
+$wb['daynamesmin_tu'] = "Вт";
+$wb['daynamesmin_we'] = "Ср";
+$wb['daynamesmin_th'] = "Чт";
+$wb['daynamesmin_fr'] = "Пт";
+$wb['daynamesmin_sa'] = "Сб";
+$wb['daynames_sunday'] = "Воскресенье";
+$wb['daynames_monday'] = "Понедельник";
+$wb['daynames_tuesday'] = "Вторник";
+$wb['daynames_wednesday'] = "Среда";
+$wb['daynames_thursday'] = "Черверг";
+$wb['daynames_friday'] = "Пятница";
+$wb['daynames_saturday'] = "Суббота";
+$wb['monthnamesshort_jan'] = "Янв";
+$wb['monthnamesshort_feb'] = "Фев";
+$wb['monthnamesshort_mar'] = "Мар";
+$wb['monthnamesshort_apr'] = "Апр";
+$wb['monthnamesshort_may'] = "Май";
+$wb['monthnamesshort_jun'] = "Июн";
+$wb['monthnamesshort_jul'] = "Июл";
+$wb['monthnamesshort_aug'] = "Авг";
+$wb['monthnamesshort_sep'] = "Сен";
+$wb['monthnamesshort_oct'] = "Окт";
+$wb['monthnamesshort_nov'] = "Ноя";
+$wb['monthnamesshort_dec'] = "Дек";
+?>
\ No newline at end of file
diff --git a/interface/lib/plugins/mail_user_filter_plugin.inc.php b/interface/lib/plugins/mail_user_filter_plugin.inc.php
index 7715e3f..3b62524 100644
--- a/interface/lib/plugins/mail_user_filter_plugin.inc.php
+++ b/interface/lib/plugins/mail_user_filter_plugin.inc.php
@@ -169,7 +169,7 @@
";
}
- $content .= "if (/^".$page_form->dataRecord["source"].":";
+ $content .= "if (/^".$page_form->dataRecord["source"].": ";
$searchterm = preg_quote($page_form->dataRecord["searchterm"]);
@@ -178,7 +178,7 @@
} elseif ($page_form->dataRecord["op"] == 'is') {
$content .= $searchterm."$/:h)\n";
} elseif ($page_form->dataRecord["op"] == 'begins') {
- $content .= " ".$searchterm."/:h)\n";
+ $content .= $searchterm."/:h)\n";
} elseif ($page_form->dataRecord["op"] == 'ends') {
$content .= ".*".$searchterm."$/:h)\n";
}
--
Gitblit v1.9.1