Skip to content

Commit 7e35246

Browse files
AntennipasiAntennipasi
Antennipasi
authored and
Antennipasi
committed
Added more translations to monitor-module.
1 parent 14716ca commit 7e35246

File tree

6 files changed

+121
-51
lines changed

6 files changed

+121
-51
lines changed

‎interface/web/monitor/lib/lang/en.lng‎

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ $wb['no_data_memusage_txt'] = 'No data about the memory usage available at the m
1212
$wb['no_data_diskusage_txt'] = 'No data about the disk usage available at the moment. Please check again later.';
1313
$wb['no_data_cpuinfo_txt'] = 'No data about the CPU available at the moment. Please check again later.';
1414
$wb['no_data_services_txt'] = 'No data about the services available at the moment. Please check again later.';
15+
$wb['no_data_updates_txt'] = 'No data about updates available at the moment. Please check again later.';
16+
$wb['no_data_raid_txt'] = 'No data about RAID available at the moment. Please check again later.';
17+
$wb['no_data_rkhunter_txt'] = 'No data about RKHunter available at the moment. Please check again later.';
18+
$wb['no_data_mailq_txt'] = 'No data Mailqueue available at the moment. Please check again later.';
1519
$wb['no_logdata_txt'] = 'No log data available at the moment. Please check again later.';
1620
$wb['Monitoring'] = 'Monitoring';
1721
$wb['Server to Monitor'] = 'Server to Monitor';
@@ -41,4 +45,30 @@ $wb['Show Clamav-Log'] = 'Show Clamav-Log';
4145
$wb['Show ISPConfig-Log'] = 'Show ISPConfig-Log';
4246
$wb['Show RKHunter-Log'] = 'Show RKHunter-Log';
4347
$wb['Show Jobqueue'] = 'Show Jobqueue';
44-
?>
48+
$wb['monitor_diskusage_filesystem_txt'] = 'Filesystem';
49+
$wb['monitor_diskusage_type_txt'] = 'Type';
50+
$wb['monitor_diskusage_size_txt'] = 'Size';
51+
$wb['monitor_diskusage_used_txt'] = 'Used';
52+
$wb['monitor_diskusage_available_txt'] = 'Available';
53+
$wb['monitor_diskusage_usage_txt'] = 'Use%';
54+
$wb['monitor_diskusage_mounted_txt'] = 'Mounted on';
55+
$wb['monitor_nomdadm_txt'] = 'mdadm is not installed or your Server has no supported RAID';
56+
$wb['monitor_norkhunter_txt'] = 'RKHunter is not installed, so there is no log data';
57+
$wb['monitor_services_online_txt'] = 'Online';
58+
$wb['monitor_services_offline_txt'] = 'Offline';
59+
$wb['monitor_services_web_txt'] = 'Web-Server:';
60+
$wb['monitor_services_ftp_txt'] = 'FTP-Server:';
61+
$wb['monitor_services_smtp_txt'] = 'SMTP-Server:';
62+
$wb['monitor_services_pop_txt'] = 'POP3-Server:';
63+
$wb['monitor_services_imap_txt'] = 'IMAP-Server:';
64+
$wb['monitor_services_mydns_txt'] = 'myDNS-Server:';
65+
$wb['monitor_services_mysql_txt'] = 'mySQL-Server:';
66+
$wb['monitor_settings_datafromdate_txt'] = 'Data from: ';
67+
$wb['monitor_settings_datetimeformat_txt'] = 'Y-m-d H:i';
68+
$wb['monitor_settings_server_txt'] = 'Server: ';
69+
$wb['monitor_title_updatestate_txt'] = 'Update State';
70+
$wb['monitor_title_mailq_txt'] = 'Mailqueue';
71+
$wb['monitor_title_raidstate_txt'] = 'RAID-State';
72+
$wb['monitor_title_rkhunterlog_txt'] = 'RKHunter-Log';
73+
$wb['monitor_updates_nosupport_txt'] = 'Your distribution is not supported for this monitoring';
74+
?>

‎interface/web/monitor/lib/lang/fi.lng‎

Lines changed: 31 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,11 @@ $wb['no_data_memusage_txt'] = 'Tietoja muistin käytöstä ei ole tällä hetkel
1212
$wb['no_data_diskusage_txt'] = 'Tietoja levytilan käytöstä ei ole tällä hetkellä saatavana. Yritä myöhemmin uudelleen.';
1313
$wb['no_data_cpuinfo_txt'] = 'Tietoja prosessorin kuormasta ei ole tällä hetkellä saatavana. Yritä myöhemmin uudelleen.';
1414
$wb['no_data_services_txt'] = 'Tietoja palveluiden tilasta ei ole tällä hetkellä saatavana. Yritä myöhemmin uudelleen.';
15-
$wb['no_logdata_txt'] = 'Lokiietoja ei ole tällä hetkellä saatavana. Yritä myöhemmin uudelleen.';
15+
$wb['no_data_updates_txt'] = 'Tietoja päivitysten tilasta ei ole tällä hetkellä saatavana. Yritä myöhemmin uudelleen.';
16+
$wb['no_data_raid_txt'] = 'Tietoja RAID-laitteiden tilasta ei ole tällä hetkellä saatavana. Yritä myöhemmin uudelleen.';
17+
$wb['no_data_rkhunter_txt'] = 'Tietoja RKHunter-tuloksista ei ole tällä hetkellä saatavana. Yritä myöhemmin uudelleen.';
18+
$wb['no_data_mailq_txt'] = 'Tietoja postipalvelimen jonosta ei ole tällä hetkellä saatavana. Yritä myöhemmin uudelleen.';
19+
$wb['no_logdata_txt'] = 'Lokitietoja ei ole tällä hetkellä saatavana. Yritä myöhemmin uudelleen.';
1620
$wb['Monitoring'] = 'Valvonta';
1721
$wb['Server to Monitor'] = 'Mitä palvelinta valvotaan';
1822
$wb['Logfiles'] = 'Lokitiedostot';
@@ -41,5 +45,30 @@ $wb['Show ISPConfig-Log'] = 'Näytä ISPConfig-Loki';
4145
$wb['Show ISPC Cron-Log'] = 'Näytä ISPC Cron-Loki';
4246
$wb['Show RKHunter-Log'] = 'Näytä RKHunter-Loki';
4347
$wb['Show Jobqueue'] = 'Näytä työjono';
48+
$wb['monitor_diskusage_filesystem_txt'] = 'Levyosio';
49+
$wb['monitor_diskusage_type_txt'] = 'Tyyppi';
50+
$wb['monitor_diskusage_size_txt'] = 'Koko';
51+
$wb['monitor_diskusage_used_txt'] = 'Käytetty';
52+
$wb['monitor_diskusage_available_txt'] = 'Vapaana';
53+
$wb['monitor_diskusage_usage_txt'] = 'Käyttöaste';
54+
$wb['monitor_diskusage_mounted_txt'] = 'Liitospiste';
55+
$wb['monitor_nomdadm_txt'] = 'mdadm ei ole asennettuna tai palelimessasi ei ole tuettuja RAID-laitteita.';
56+
$wb['monitor_norkhunter_txt'] = 'RKHunter ei ole asennettuna, joten siitä ei ole tulostietoja.';
57+
$wb['monitor_services_online_txt'] = 'Käynnissä';
58+
$wb['monitor_services_offline_txt'] = 'Sammuksissa';
59+
$wb['monitor_services_web_txt'] = 'WWW-palvelin:';
60+
$wb['monitor_services_ftp_txt'] = 'FTP-palvelin:';
61+
$wb['monitor_services_smtp_txt'] = 'SMTP-palvelin:';
62+
$wb['monitor_services_pop_txt'] = 'POP3-palvelin:';
63+
$wb['monitor_services_imap_txt'] = 'IMAP-palvelin:';
64+
$wb['monitor_services_mydns_txt'] = 'myDNS-palvelin:';
65+
$wb['monitor_services_mysql_txt'] = 'mySQL-palvelin:';
66+
$wb['monitor_settings_datetimeformat_txt'] = 'd.m.Y H:i';
67+
$wb['monitor_settings_datafromdate_txt'] = 'Tietojen päiväys: ';
68+
$wb['monitor_settings_server_txt'] = 'Palvelin: ';
69+
$wb['monitor_title_updatestate_txt'] = 'Päivitysten tila';
70+
$wb['monitor_title_mailq_txt'] = 'Sähköpostijono';
71+
$wb['monitor_title_raidstate_txt'] = 'RAID-laitteiden tila';
72+
$wb['monitor_title_rkhunterlog_txt'] = 'RKHunter-tulokset';
73+
$wb['monitor_updates_nosupport_txt'] = 'Käyttämäsi Linux-jakelu ei tue päivitysten valvontaa.';
4474
?>
45-

‎interface/web/monitor/show_data.php‎

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,70 +39,75 @@
3939
/* Get the dataType to show */
4040
$dataType = $_GET["type"];
4141

42+
/* Get some translations */
43+
$monTransDate = $app->lng("monitor_settings_datafromdate_txt");
44+
$monTransSrv = $app->lng("monitor_settings_server_txt");
45+
46+
4247
$output = '';
4348

4449
switch($dataType) {
4550
case 'server_load':
4651
$template = 'templates/show_data.htm';
4752
$output .= showServerLoad();
4853
$time = getDataTime('server_load');
49-
$title = $app->lng("Server Load").' (Server: ' . $_SESSION['monitor']['server_name'] . ')';
54+
$title = $app->lng("Server Load").' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
5055
$description = '';
5156
break;
5257
case 'disk_usage':
5358
$template = 'templates/show_data.htm';
5459
$output .= showDiskUsage();
5560
$time = getDataTime('disk_usage');
56-
$title = $app->lng("Disk usage").' (Server: ' . $_SESSION['monitor']['server_name'] . ')';
61+
$title = $app->lng("Disk usage").' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
5762
$description = '';
5863
break;
5964
case 'mem_usage':
6065
$template = 'templates/show_data.htm';
6166
$output .= showMemUsage();
6267
$time = getDataTime('mem_usage');
63-
$title = $app->lng("Memory usage").' (Server: ' . $_SESSION['monitor']['server_name'] . ')';
68+
$title = $app->lng("Memory usage").' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
6469
$description = '';
6570
break;
6671
case 'cpu_info':
6772
$template = 'templates/show_data.htm';
6873
$output .= showCpuInfo();
6974
$time = getDataTime('cpu_info');
70-
$title = $app->lng("CPU info").' (Server: ' . $_SESSION['monitor']['server_name'] . ')';
75+
$title = $app->lng("CPU info").' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
7176
$description = '';
7277
break;
7378
case 'services':
7479
$template = 'templates/show_data.htm';
7580
$output .= showServices();
7681
$time = getDataTime('services');
77-
$title = $app->lng("Status of services").' (Server: ' . $_SESSION['monitor']['server_name'] . ')';
82+
$title = $app->lng("Status of services").' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
7883
$description = '';
7984
break;
8085
case 'system_update':
8186
$template = 'templates/show_data.htm';
8287
$output .= showSystemUpdate();
8388
$time = getDataTime('system_update');
84-
$title = "Update State" . ' (Server: ' . $_SESSION['monitor']['server_name'] . ')';
89+
$title = $app->lng("monitor_title_updatestate_txt"). ' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
8590
$description = '';
8691
break;
8792
case 'mailq':
8893
$template = 'templates/show_data.htm';
8994
$output .= showMailq();
9095
$time = getDataTime('mailq');
91-
$title = "Mailq" . ' (Server: ' . $_SESSION['monitor']['server_name'] . ')';
96+
$title = $app->lng("monitor_title_mailq_txt"). ' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
9297
$description = '';
9398
break;
9499
case 'raid_state':
95100
$template = 'templates/show_data.htm';
96101
$output .= showRaidState();
97102
$time = getDataTime('raid_state');
98-
$title = "RAID-State" . ' (Server: ' . $_SESSION['monitor']['server_name'] . ')';
103+
$title = $app->lng("monitor_title_raidstate_txt"). ' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
99104
$description = '';
100105
break;
101106
case 'rkhunter':
102107
$template = 'templates/show_data.htm';
103108
$output .= showRKHunter();
104109
$time = getDataTime('rkhunter');
105-
$title = "RKHunter-Log" . ' (Server: ' . $_SESSION['monitor']['server_name'] . ')';
110+
$title = $app->lng("monitor_title_rkhunterlog_txt"). ' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
106111
$description = '';
107112
break;
108113
default:
@@ -120,7 +125,8 @@
120125
$app->tpl->setVar("title", $title);
121126
$app->tpl->setVar("description", $description);
122127
$app->tpl->setVar("time", $time);
128+
$app->tpl->setVar("monTransDate", $monTransDate);
123129

124130
$app->tpl_defaults();
125131
$app->tpl->pparse();
126-
?>
132+
?>

‎interface/web/monitor/show_sys_state.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171

7272
/*
7373
Creating the array with the refresh intervals
74-
Attention: the core-moule ist triggered every 5 minutes,
74+
Attention: the core-module ist triggered every 5 minutes,
7575
so reload every 2 minutes is impossible!
7676
*/
7777
$refresh = (isset($_GET["refresh"]))?intval($_GET["refresh"]):0;
@@ -505,4 +505,4 @@ function _setState($oldState, $newState)
505505
}
506506
}
507507

508-
?>
508+
?>

‎interface/web/monitor/templates/show_data.htm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ <h2><tmpl_var name="title"></h2>
33
<div class="panel panel_system">
44

55
<div class="pnl_formarea">
6-
<fieldset><legend>Data from: <tmpl_var name="time"></legend>
6+
<fieldset><legend><tmpl_var name="monTransDate"><tmpl_var name="time"></legend>
77
<div class="systemmonitor"><tmpl_var name="output"></div>
88
</fieldset>
99
</div>

0 commit comments

Comments
 (0)