From f0cae5aa4affc1b9ed1b8f3612c7855bc42c810a Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Tue, 22 Jan 2013 03:13:09 +0200 Subject: [PATCH] i18n user db --- web/add/db/index.php | 31 ++++++++++++++----------- web/inc/i18n/ru.php | 6 ++--- web/templates/user/list_db.html | 41 +++++++++++++++++++-------------- 3 files changed, 45 insertions(+), 33 deletions(-) diff --git a/web/add/db/index.php b/web/add/db/index.php index ac6eaee31..4b6b272e3 100644 --- a/web/add/db/index.php +++ b/web/add/db/index.php @@ -22,9 +22,23 @@ if (!empty($_POST['ok'])) { if (empty($_POST['v_type'])) $errors[] = _('type'); if (empty($_POST['v_charset'])) $errors[] = _('charset'); + // Check for errors + if (empty($errors[0])) { + foreach ($errors as $i => $error) { + if ( $i == 0 ) { + $error_msg = $error; + } else { + $error_msg = $error_msg.", ".$error; + } + } + $_SESSION['error_msg'] = _('Error: field "%s" can not be blank.',$error_msg); + } + // Validate email - if (!filter_var($_POST['v_db_email'], FILTER_VALIDATE_EMAIL)) { - $_SESSION['error_msg'] = _('Please enter valid email address.'); + if (!empty($_POST['v_db_email'])) { + if (!filter_var($_POST['v_db_email'], FILTER_VALIDATE_EMAIL)) { + $_SESSION['error_msg'] = _('Please enter valid email address.'); + } } // Protect input @@ -35,17 +49,8 @@ if (!empty($_POST['ok'])) { $v_charset = $_POST['v_charset']; $v_db_email = $_POST['v_db_email']; - // Check for errors - if (!empty($errors[0])) { - foreach ($errors as $i => $error) { - if ( $i == 0 ) { - $error_msg = $error; - } else { - $error_msg = $error_msg.", ".$error; - } - } - $_SESSION['error_msg'] = _('Error: field "%s" can not be blank.',$error_msg); - } else { + + if (empty($_SESSION['error_msg'])) { // Add Database $v_type = escapeshellarg($_POST['v_type']); $v_charset = escapeshellarg($_POST['v_charset']); diff --git a/web/inc/i18n/ru.php b/web/inc/i18n/ru.php index e8507ef2a..7b3e89559 100644 --- a/web/inc/i18n/ru.php +++ b/web/inc/i18n/ru.php @@ -205,8 +205,8 @@ $LANG = array( 'Assigned user' => 'Пользователь', 'Assigned domain' => 'Домен', 'Adding Mail Domain' => 'Добавление почтового домена', - 'AntiSpam Support' => 'Поддержка Анти-спама', - 'AntiVirus Support' => 'Поддержка Антивируса', + 'AntiSpam Support' => 'Поддержка анти-спама', + 'AntiVirus Support' => 'Поддержка антивируса', 'DKIM Support' => 'Поддержка DKIM', 'Adding Mail Account' => 'Добавление почтового аккаунта', 'Advanced options' => 'Дополнительные опции', @@ -231,7 +231,7 @@ $LANG = array( 'Nginx Extentions' => 'Обработка Nginx', 'Nginx Template' => 'Шаблон для Nginx', 'Statistics Authorization' => 'Ограниченный доступ к статистике', - 'Additional FTP Account' => 'Отдельный ftp аккаунт', + 'Additional FTP Account' => 'Дополнительный ftp', 'Editing Cron Job' => 'Редактирование cron-задания', 'Save' => 'Сохранить', 'Editing Database' => 'Редактирование БД', diff --git a/web/templates/user/list_db.html b/web/templates/user/list_db.html index 9ff5c76dc..b9ad0b19e 100644 --- a/web/templates/user/list_db.html +++ b/web/templates/user/list_db.html @@ -49,26 +49,33 @@ - +
">
">
- - - - - - - -
- - delete - " /> - -
+ + + + + " /> + + + + + + + + + + + + + + +
@@ -140,7 +147,7 @@