Skip to content

Commit 4726068

Browse files
author
cfoe
committed
menu restructuring and language file cleanup
1 parent a1cd2cf commit 4726068

File tree

25 files changed

+1081
-724
lines changed

25 files changed

+1081
-724
lines changed

‎interface/web/admin/form/users.tform.php‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -60,16 +60,16 @@
6060
6161
*/
6262

63-
$form['title'] = 'Users';
63+
$form['title'] = 'Users';
6464
$form['description'] = 'Form to edit systemusers.';
65-
$form['name'] = 'users';
66-
$form['action'] = 'users_edit.php';
67-
$form['db_table'] = 'sys_user';
65+
$form['name'] = 'users';
66+
$form['action'] = 'users_edit.php';
67+
$form['db_table'] = 'sys_user';
6868
$form['db_table_idx'] = 'userid';
69-
$form["db_history"] = "no";
69+
$form["db_history"] = "no";
7070
$form['tab_default'] = 'users';
7171
$form['list_default'] = 'users_list.php';
72-
$form['auth'] = 'yes';
72+
$form['auth'] = 'yes';
7373

7474
//* 0 = id of the user, > 0 id must match with id of current user
7575
$form['auth_preset']['userid'] = 0;
@@ -137,14 +137,14 @@
137137
'username' => array (
138138
'datatype' => 'VARCHAR',
139139
'formtype' => 'TEXT',
140-
'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
141-
'errmsg'=> 'username_empty'),
142-
1 => array ( 'type' => 'UNIQUE',
143-
'errmsg'=> 'username_unique'),
144-
2 => array ( 'type' => 'REGEX',
145-
'regex' => '/^[\w\.\-\_]{0,64}$/',
146-
'errmsg'=> 'username_err'),
147-
),
140+
'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
141+
'errmsg'=> 'username_empty'),
142+
1 => array ( 'type' => 'UNIQUE',
143+
'errmsg'=> 'username_unique'),
144+
2 => array ( 'type' => 'REGEX',
145+
'regex' => '/^[\w\.\-\_]{0,64}$/',
146+
'errmsg'=> 'username_err'),
147+
),
148148
'regex' => '',
149149
'errmsg' => '',
150150
'default' => '',
@@ -158,7 +158,7 @@
158158
'passwort' => array (
159159
'datatype' => 'VARCHAR',
160160
'formtype' => 'PASSWORD',
161-
'encryption'=> 'CRYPT',
161+
'encryption' => 'CRYPT',
162162
'regex' => '',
163163
'errmsg' => '',
164164
'default' => '',

‎interface/web/admin/lib/lang/ar.lng‎

Lines changed: 43 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,61 @@
11
<?php
2-
$wb['Firewall'] = 'Firewall';
2+
//Errors
3+
$wb[1001] = "Username or password is empty.";
4+
$wb[1002] = "Username or password is wrong.";
5+
36
$wb['Groups'] = 'Groups';
47
$wb['groups_description'] = 'Form to edit systemuser groups.';
5-
$wb['Server'] = 'Server';
6-
$wb['Services'] = 'Services';
8+
9+
$wb['Servers'] = 'Servers';
710
$wb['Config'] = 'Config';
8-
$wb['Server Config'] = 'Server Config';
9-
$wb['Mail'] = 'Mail';
10-
$wb['Getmail'] = 'Getmail';
11-
$wb['Web'] = 'Web';
12-
$wb['FastCGI'] = 'FastCGI';
13-
$wb['Jailkit'] = 'Jailkit';
14-
$wb['System'] = 'System';
11+
1512
$wb['Add user'] = 'Add user';
1613
$wb['Edit user'] = 'Edit user';
17-
$wb['CP Users'] = 'CP Users';
1814
$wb['Add group'] = 'Add group';
1915
$wb['Edit group'] = 'Edit group';
2016
$wb['Edit server'] = 'Edit server';
21-
$wb['Edit Server IP'] = 'Server IP addresses';
22-
$wb['Servers'] = 'Servers';
17+
2318
$wb['Sync. Now'] = 'Sync. Now';
2419
$wb['DB Sync.'] = 'DB Sync.';
25-
$wb['Languages'] = 'Languages';
26-
$wb['New Language'] = 'New Language';
27-
$wb['Export'] = 'Export';
28-
$wb['Import'] = 'Import';
29-
$wb['Language Editor'] = 'Language Editor';
30-
$wb['Software'] = 'Software';
31-
$wb['Repositories'] = 'Repositories';
20+
21+
// subnav
22+
$wb['User Management'] = 'User Management';
23+
$wb['CP Users'] = 'CP Users';
24+
$wb['Remote Users'] = 'Remote Users';
25+
26+
$wb['System'] = 'System';
3227
$wb['Server Services'] = 'Server Services';
33-
$wb['Interface Config'] = 'Interface Config';
28+
$wb['Services'] = 'Services';
29+
$wb['Server Config'] = 'Server Config';
30+
$wb['Server'] = 'Server';
31+
$wb['Mail'] = 'Mail';
32+
$wb['Getmail'] = 'Getmail';
33+
$wb['Web'] = 'Web';
34+
$wb['FastCGI'] = 'FastCGI';
35+
$wb['Jailkit'] = 'Jailkit';
36+
$wb['Rescue'] = 'Rescue';
37+
$wb['Server IP addresses'] = 'Server IP addresses';
38+
$wb['Additional PHP Versions'] = 'Additional PHP Versions';
39+
$wb['Firewall'] = 'Firewall';
40+
41+
$wb['Interface'] = 'Interface';
42+
$wb['Interface Config'] = 'Main Config';
43+
$wb['Domains'] = 'Domains';
44+
$wb['Misc'] = 'Misc';
45+
46+
$wb['Software'] = 'Apps & Addons';
47+
$wb['Repositories'] = 'Repositories';
3448
$wb['Packages'] = 'Packages';
3549
$wb['Updates'] = 'Updates';
50+
51+
$wb['Language Editor'] = 'Language Editor';
52+
$wb['Languages'] = 'Languages';
53+
$wb['New Language'] = 'New Language';
3654
$wb['Merge'] = 'Merge';
37-
$wb['Remote Users'] = 'Remote Users';
55+
$wb['Export'] = 'Export';
56+
$wb['Import'] = 'Import';
57+
3858
$wb['Remote Actions'] = 'Remote Actions';
3959
$wb['Do OS-Update'] = 'Do OS-Update';
4060
$wb['Do ISPConfig-Update'] = 'Do ISPConfig-Update';
41-
$wb['1001'] = 'Username or password is empty.';
42-
$wb['1002'] = 'Username or password is wrong.';
43-
?>
61+
?>

‎interface/web/admin/lib/lang/bg.lng‎

Lines changed: 42 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,61 @@
11
<?php
2-
$wb['Firewall'] = 'Защитна стена';
2+
//Errors
3+
$wb['1001'] = 'Потребителско име паролата са празни.';
4+
$wb['1002'] = 'Потребителско име или паролата са сгрешени.';
5+
36
$wb['Groups'] = 'Групи';
47
$wb['groups_description'] = 'Редактиране на групи';
5-
$wb['Server'] = 'Сървър';
6-
$wb['Services'] = 'Услуги';
8+
9+
$wb['Servers'] = 'Сървъри';
710
$wb['Config'] = 'Настройки';
8-
$wb['Server Config'] = 'Настройки на сървъра';
9-
$wb['Mail'] = 'Поща';
10-
$wb['Getmail'] = 'Getmail';
11-
$wb['Web'] = 'Уеб';
12-
$wb['FastCGI'] = 'FastCGI';
13-
$wb['Jailkit'] = 'Jailkit';
14-
$wb['System'] = 'Система';
11+
1512
$wb['Add user'] = 'Нов потребител';
1613
$wb['Edit user'] = 'Редактиране на потребител';
17-
$wb['CP Users'] = 'Потребители';
1814
$wb['Add group'] = 'Нова група';
1915
$wb['Edit group'] = 'Редактиране на група';
2016
$wb['Edit server'] = 'Редактиране на сървър';
21-
$wb['Edit Server IP'] = 'Редактиране на IP адреса';
22-
$wb['Servers'] = 'Сървъри';
17+
2318
$wb['Sync. Now'] = 'Синхронизирай сега';
2419
$wb['DB Sync.'] = 'DB Sync.';
25-
$wb['Languages'] = 'Езици';
26-
$wb['New Language'] = 'Нов език';
27-
$wb['Export'] = 'Експортиране';
28-
$wb['Import'] = 'Импортиране';
29-
$wb['Language Editor'] = 'Редактор за езиците';
20+
21+
// subnav
22+
$wb['User Management'] = 'User Management';
23+
$wb['CP Users'] = 'Потребители';
24+
$wb['Remote Users'] = 'Дистанционни потребители';
25+
26+
$wb['System'] = 'Система';
27+
$wb['Server Services'] = 'Услуги на сървъра';
28+
$wb['Services'] = 'Услуги';
29+
$wb['Server Config'] = 'Настройки на сървъра';
30+
$wb['Server'] = 'Сървър';
31+
$wb['Mail'] = 'Поща';
32+
$wb['Getmail'] = 'Getmail';
33+
$wb['Web'] = 'Уеб';
34+
$wb['FastCGI'] = 'FastCGI';
35+
$wb['Jailkit'] = 'Jailkit';
36+
$wb['Rescue'] = 'Rescue';
37+
$wb['Server IP addresses'] = 'Редактиране на IP адреса';
38+
$wb['Additional PHP Versions'] = 'Additional PHP Versions';
39+
$wb['Firewall'] = 'Firewall';
40+
41+
$wb['Interface'] = 'Interface';
42+
$wb['Interface Config'] = 'Main Config';
43+
$wb['Domains'] = 'Domains';
44+
$wb['Misc'] = 'Misc';
45+
3046
$wb['Software'] = 'Софтуер';
3147
$wb['Repositories'] = 'Хранилища';
32-
$wb['Server Services'] = 'Услуги на сървъра';
33-
$wb['Interface Config'] = 'Конфигуриране на интерфейса';
3448
$wb['Packages'] = 'Пакети';
3549
$wb['Updates'] = 'Ъпдейти';
50+
51+
$wb['Language Editor'] = 'Редактор за езиците';
52+
$wb['Languages'] = 'Езици';
53+
$wb['New Language'] = 'Нов език';
3654
$wb['Merge'] = 'Merge';
37-
$wb['Remote Users'] = 'Дистанционни потребители';
55+
$wb['Export'] = 'Експортиране';
56+
$wb['Import'] = 'Импортиране';
57+
3858
$wb['Remote Actions'] = 'Дистанционни действия';
3959
$wb['Do OS-Update'] = 'Ъпдейт на системата';
4060
$wb['Do ISPConfig-Update'] = 'Ъпдейт на ISPConfig';
41-
$wb['1001'] = 'Потребителско име паролата са празни.';
42-
$wb['1002'] = 'Потребителско име или паролата са сгрешени.';
43-
?>
44-
45-
46-
47-
61+
?>

‎interface/web/admin/lib/lang/br.lng‎

Lines changed: 42 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,61 @@
11
<?php
2-
$wb['Firewall'] = 'Firewall';
2+
//Errors
3+
$wb[1001] = "Username or password is empty.";
4+
$wb[1002] = "Username or password is wrong.";
5+
36
$wb['Groups'] = 'Grupos';
47
$wb['groups_description'] = 'Formulário para edição dos Grupos de usuários do sistema.';
5-
$wb['Server'] = 'Servidor';
6-
$wb['Services'] = 'Serviços';
8+
9+
$wb['Servers'] = 'Servidores';
710
$wb['Config'] = 'Configuração';
8-
$wb['Server Config'] = 'Configuração do Servidor';
9-
$wb['Mail'] = 'Mail';
10-
$wb['Getmail'] = 'Getmail';
11-
$wb['Web'] = 'Web';
12-
$wb['FastCGI'] = 'FastCGI';
13-
$wb['Jailkit'] = 'Jailkit';
14-
$wb['System'] = 'Sistema';
11+
1512
$wb['Add user'] = 'Adicionar Usuário';
1613
$wb['Edit user'] = 'Editar Usuário';
17-
$wb['CP Users'] = 'Usuários';
1814
$wb['Add group'] = 'Adicionar Grupo';
1915
$wb['Edit group'] = 'Editar Grupo';
2016
$wb['Edit server'] = 'Editar Servidor';
21-
$wb['Edit Server IP'] = 'Editar Endereço IP do Servidor';
22-
$wb['Servers'] = 'Servidores';
17+
2318
$wb['Sync. Now'] = 'Sincronizar agora';
2419
$wb['DB Sync.'] = 'Sincronizar Banco de Dados';
25-
$wb['Languages'] = 'Idiomas';
26-
$wb['New Language'] = 'Novo Idioma';
27-
$wb['Export'] = 'Exportar';
28-
$wb['Import'] = 'Importar';
29-
$wb['Language Editor'] = 'Editor de Idiomas';
20+
21+
// subnav
22+
$wb['User Management'] = 'User Management';
23+
$wb['CP Users'] = 'Usuários CP';
24+
$wb['Remote Users'] = 'Usuários Remotos';
25+
26+
$wb['System'] = 'Sistema';
27+
$wb['Server Services'] = 'Serviços do Servidor';
28+
$wb['Services'] = 'Serviços';
29+
$wb['Server Config'] = 'Configuração do Servidor';
30+
$wb['Server'] = 'Servidor';
31+
$wb['Mail'] = 'Mail';
32+
$wb['Getmail'] = 'Getmail';
33+
$wb['Web'] = 'Web';
34+
$wb['FastCGI'] = 'FastCGI';
35+
$wb['Jailkit'] = 'Jailkit';
36+
$wb['Rescue'] = 'Rescue';
37+
$wb['Server IP addresses'] = 'Endereço IP do Servidor';
38+
$wb['Additional PHP Versions'] = 'Additional PHP Versions';
39+
$wb['Firewall'] = 'Firewall';
40+
41+
$wb['Interface'] = 'Interface';
42+
$wb['Interface Config'] = 'Main Config';
43+
$wb['Domains'] = 'Domains';
44+
$wb['Misc'] = 'Misc';
45+
3046
$wb['Software'] = 'Software';
3147
$wb['Repositories'] = 'Repositórios';
32-
$wb['Server Services'] = 'Serviços do Servidor';
33-
$wb['Interface Config'] = 'Configuração da Interface';
3448
$wb['Packages'] = 'Pacotes';
3549
$wb['Updates'] = 'Updates';
50+
51+
$wb['Language Editor'] = 'Editor de Idiomas';
52+
$wb['Languages'] = 'Idiomas';
53+
$wb['New Language'] = 'Novo Idioma';
3654
$wb['Merge'] = 'Mesclar';
37-
$wb['Remote Users'] = 'Usuários Remotos';
55+
$wb['Export'] = 'Exportar';
56+
$wb['Import'] = 'Importar';
57+
3858
$wb['Remote Actions'] = 'Ações Remotas';
3959
$wb['Do OS-Update'] = 'Fazer Atualização do SO';
4060
$wb['Do ISPConfig-Update'] = 'Fazer Atualização do ISPConfig';
41-
$wb['1001'] = 'Username or password is empty.';
42-
$wb['1002'] = 'Username or password is wrong.';
43-
?>
61+
?>

0 commit comments

Comments
 (0)