Skip to content

Commit f0cae5a

Browse files
serghey-rodinserghey-rodin
committed
i18n user db
1 parent c6b7c0b commit f0cae5a

File tree

3 files changed

+45
-33
lines changed

3 files changed

+45
-33
lines changed

‎web/add/db/index.php‎

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,23 @@
2222
if (empty($_POST['v_type'])) $errors[] = _('type');
2323
if (empty($_POST['v_charset'])) $errors[] = _('charset');
2424

25+
// Check for errors
26+
if (empty($errors[0])) {
27+
foreach ($errors as $i => $error) {
28+
if ( $i == 0 ) {
29+
$error_msg = $error;
30+
} else {
31+
$error_msg = $error_msg.", ".$error;
32+
}
33+
}
34+
$_SESSION['error_msg'] = _('Error: field "%s" can not be blank.',$error_msg);
35+
}
36+
2537
// Validate email
26-
if (!filter_var($_POST['v_db_email'], FILTER_VALIDATE_EMAIL)) {
27-
$_SESSION['error_msg'] = _('Please enter valid email address.');
38+
if (!empty($_POST['v_db_email'])) {
39+
if (!filter_var($_POST['v_db_email'], FILTER_VALIDATE_EMAIL)) {
40+
$_SESSION['error_msg'] = _('Please enter valid email address.');
41+
}
2842
}
2943

3044
// Protect input
@@ -35,17 +49,8 @@
3549
$v_charset = $_POST['v_charset'];
3650
$v_db_email = $_POST['v_db_email'];
3751

38-
// Check for errors
39-
if (!empty($errors[0])) {
40-
foreach ($errors as $i => $error) {
41-
if ( $i == 0 ) {
42-
$error_msg = $error;
43-
} else {
44-
$error_msg = $error_msg.", ".$error;
45-
}
46-
}
47-
$_SESSION['error_msg'] = _('Error: field "%s" can not be blank.',$error_msg);
48-
} else {
52+
53+
if (empty($_SESSION['error_msg'])) {
4954
// Add Database
5055
$v_type = escapeshellarg($_POST['v_type']);
5156
$v_charset = escapeshellarg($_POST['v_charset']);

‎web/inc/i18n/ru.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -205,8 +205,8 @@
205205
'Assigned user' => 'Пользователь',
206206
'Assigned domain' => 'Домен',
207207
'Adding Mail Domain' => 'Добавление почтового домена',
208-
'AntiSpam Support' => 'Поддержка Анти-спама',
209-
'AntiVirus Support' => 'Поддержка Антивируса',
208+
'AntiSpam Support' => 'Поддержка анти-спама',
209+
'AntiVirus Support' => 'Поддержка антивируса',
210210
'DKIM Support' => 'Поддержка DKIM',
211211
'Adding Mail Account' => 'Добавление почтового аккаунта',
212212
'Advanced options' => 'Дополнительные опции',
@@ -231,7 +231,7 @@
231231
'Nginx Extentions' => 'Обработка Nginx',
232232
'Nginx Template' => 'Шаблон для Nginx',
233233
'Statistics Authorization' => 'Ограниченный доступ к статистике',
234-
'Additional FTP Account' => 'Отдельный ftp аккаунт',
234+
'Additional FTP Account' => 'Дополнительный ftp',
235235
'Editing Cron Job' => 'Редактирование cron-задания',
236236
'Save' => 'Сохранить',
237237
'Editing Database' => 'Редактирование БД',

‎web/templates/user/list_db.html‎

Lines changed: 24 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -49,26 +49,33 @@
4949
<td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
5050
<table class="data-col1">
5151
<tr><td style="padding: 18 0 4 18;"><input type="checkbox" name="database[]" value="<?php echo $key ?>" ></td></tr>
52-
<tr><td><a class="data-date" title="<?php echo $data[$key]['DATE']." ".$data[$key]['TIME'] ?>"><?php echo date("d M Y", strtotime($data[$key]['DATE'])) ?></td></tr>
52+
<tr><td><a class="data-date" title="<?php echo $data[$key]['DATE']." ".$data[$key]['TIME'] ?>"><?php echo strftime("%d %b %Y", strtotime($data[$key]['DATE'])) ?></td></tr>
5353
<tr><td class="data-<?php echo $status ?>"><b><?php echo _($status); ?></b></td></tr>
5454
</table>
5555
</td>
5656
<td class="data-dotted" width="830px" style="vertical-align:top;">
57-
<table width="830px">
58-
<tr>
59-
<td></td>
60-
<td class="data-controls" width="128px"><a href="<?php echo $db_admin_link; ?>" target="_blank"><img src="/images/new_window.png" width="8px" height="8px"> <?php print _('open %s',$db_admin);?> </a></td>
61-
<td class="data-controls" width="50px"><a href="/edit/db/?database=<?php echo $key ?>"><img src="/images/edit.png" width="8px" height="8px"> <?php print _('edit');?></a></td>
62-
<td class="data-controls do_delete" width="70px">
63-
<img src="/images/delete.png" width="7px" height="7px" class="do_delete">
64-
<a id="delete_link_<?php echo $i ?>" class="do_delete"> delete</a>
65-
<input type="hidden" name="delete_url" value="/delete/db/?database=<?php echo "$key" ?>" />
66-
<div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print _('Confirmation');?>">
67-
<p class="counter-value"><?php print _('DATABASE_ACTION_CONFIRMATION',_('delete'),$key);?></p>
68-
</div>
69-
</td>
70-
</tr>
71-
</table>
57+
<a id="delete_link_<?php echo $i ?>" class="do_delete">
58+
<span class="data-controls do_delete">
59+
<img src="/images/delete.png" width="7px" height="7px">
60+
<?php echo _('delete') ?>
61+
<input type="hidden" name="delete_url" value="/delete/db/?database=<?php echo "$key" ?>" />
62+
<div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print _('Confirmation');?>">
63+
<p class="counter-value"><?php print _('DATABASE_ACTION_CONFIRMATION',_('delete'),$key);?></p>
64+
</div>
65+
</span>
66+
</a>
67+
<a href="/edit/db/?database=<?php echo $key ?>">
68+
<span class="data-controls" width="50px">
69+
<img src="/images/edit.png" width="8px" height="8px">
70+
<?php print _('edit');?>
71+
</span>
72+
</a>
73+
<a href="<?php echo $db_admin_link; ?>" target="_blank">
74+
<span class="data-controls" width="128px">
75+
<img src="/images/new_window.png" width="8px" height="8px">
76+
<?php print _('open %s',$db_admin);?>
77+
</span>
78+
</a>
7279
<table class="data-col2" width="830px">
7380
<tr>
7481
<td colspan=3 class="domain" style="padding: 0 0 0 4px;">
@@ -140,7 +147,7 @@
140147
<td>
141148
<?php
142149
if ( $i == 1) {
143-
echo _('one database');
150+
echo _('1 database');
144151
} else {
145152
echo _('%s databases',$i);
146153
}

0 commit comments

Comments
 (0)