Fixing #5733 - Accent-based Translation (#5734)

* Fixing #5733 - French Translation Cacti does not work using the French Language * Update CHANGELOG --------- Co-authored-by: Mark Brugnoli-Vinten <[email protected]>
Cacti · May 18, 2024 · c164319 · c164319
1 parent 2a3ac8e
commit c164319
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -125,7 +125,8 @@ Cacti CHANGELOG
 -issue#5726: Poller cache is not updating when changing hostname
 -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#5743: Fix automation expressions for device rules
+-issue#5732: Web Basic Authentication does not log user logins
+-issue#5733: When using Accent-based languages, translations may not work properly
 -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

diff --git a/lib/html.php b/lib/html.php
@@ -391,11 +391,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']));
 			}
 
@@ -485,11 +485,11 @@ function html_graph_thumbnail_area(&$graph_array, $no_graphs_message = '', $extr
 
 		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']));
 			}
 
@@ -2823,7 +2823,7 @@ function html_common_header($title, $selectedTheme = '') {
 		var showHideFilter = '<?php print __esc('Click to Show/Hide Filter');?>';
 		var spikeKillResults = '<?php print __esc('SpikeKill Results');?>';
 		var standardGraphicalUserInterface = '<?php print __esc('Standard Mode');?>';
-		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 testFailed = '<?php print __esc('Connection Failed');?>';
 		var testSuccessful = '<?php print __esc('Connection Successful');?>';
 		var theme = '<?php print $selectedTheme;?>';