Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

When using Accent-based languages, translations may not work properly #5734

Merged
merged 2 commits into from Apr 28, 2024
Merged

When using Accent-based languages, translations may not work properly #5734

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d1439e
Fixing #5733 - French Translation
TheWitness Apr 21, 2024
d68efc9
Update CHANGELOG
netniV Apr 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG
View file
Open in desktop
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
netniV marked this conversation as resolved.
Show resolved Hide resolved
-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
View file
Open in desktop
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