From 595cd00e834dcbc5b745257ca44f2aa1c9b56ca6 Mon Sep 17 00:00:00 2001
From: TheWitness <thewitness@cacti.net>
Date: Sun, 28 Apr 2024 17:25:08 -0400
Subject: [PATCH] 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 <netniv@hotmail.com>
---
 CHANGELOG    |  1 +
 lib/html.php | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 36190ce3bc..f84ef6a3b6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -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: 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
index 05289e6591..95d7d012ee 100644
--- a/lib/html.php
+++ b/lib/html.php
@@ -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']));
 			}
 
@@ -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']));
 			}
 
@@ -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');?>';