Skip to content

Commit

Permalink
Fixing #5733 - French Translation
Browse files Browse the repository at this point in the history
Cacti does not work using the French Language
  • Loading branch information
TheWitness committed Apr 21, 2024
1 parent 3682d28 commit 4d1439e
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 11 deletions.
1 change: 1 addition & 0 deletions CHANGELOG
Expand Up @@ -25,6 +25,7 @@ Cacti CHANGELOG
-issue#5727: Incorrect values status_fail_date and status_rec_date with cmd poller
-issue#5731: After Marking a Tree for Editing - Saving the Tree Unpublishes the Tree
-issue#5732: Web Basic Authentication does not log user logins
-issue#5733: Cacti does not work using the French Language
-feature#5692: Add a "device enabled/disabled" indicator next to the graphs
-feature#5710: Notify the admin periodically when a remote data collector goes into heartbeat status
-feature#5716: Add Aruba Clearpass template
Expand Down
22 changes: 11 additions & 11 deletions lib/html.php
Expand Up @@ -308,11 +308,11 @@ function html_graph_area(&$graph_array, $no_graphs_message = '', $extra_url_args

foreach ($graph_array as $graph) {
if (!isset($graph['host_id'])) {
list($graph['host_id'], $graph['disabled']) = db_fetch_row_prepared('SELECT host_id, disabled
FROM graph_local AS gl
LEFT JOIN host AS h
ON gl.host_id = h.id
WHERE gl.id = ?',
list($graph['host_id'], $graph['disabled']) = db_fetch_row_prepared('SELECT host_id, disabled
FROM graph_local AS gl
LEFT JOIN host AS h
ON gl.host_id = h.id
WHERE gl.id = ?',
array($graph['local_graph_id']));
}

Expand Down Expand Up @@ -397,11 +397,11 @@ function html_graph_thumbnail_area(&$graph_array, $no_graphs_message = '', $extr
$start = true;
foreach ($graph_array as $graph) {
if (!isset($graph['host_id'])) {
list($graph['host_id'], $graph['disabled']) = db_fetch_row_prepared('SELECT host_id, disabled
FROM graph_local AS gl
LEFT JOIN host AS h
ON gl.host_id = h.id
WHERE gl.id = ?',
list($graph['host_id'], $graph['disabled']) = db_fetch_row_prepared('SELECT host_id, disabled
FROM graph_local AS gl
LEFT JOIN host AS h
ON gl.host_id = h.id
WHERE gl.id = ?',
array($graph['local_graph_id']));
}

Expand Down Expand Up @@ -2493,7 +2493,7 @@ function html_common_header($title, $selectedTheme = '') {
var theme='<?php print $selectedTheme;?>';
var hScroll=<?php print read_user_setting('enable_hscroll', '') == 'on' ? 'true':'false';?>;
var userSettings=<?php print is_view_allowed('graph_settings') ? 'true':'false';?>;
var tableConstraints='<?php print __('Allow or limit the table columns to extend beyond the current windows limits.');?>';
var tableConstraints='<?php print __esc('Allow or limit the table columns to extend beyond the current windows limits.');?>';
var searchFilter='<?php print __esc('Enter a search term');?>';
var searchRFilter='<?php print __esc('Enter a regular expression');?>';
var noFileSelected='<?php print __esc('No file selected');?>';
Expand Down

0 comments on commit 4d1439e

Please sign in to comment.