From e08b76704af9db01e0bb9aa4a93310c8818c5c0a Mon Sep 17 00:00:00 2001
From: LucasC <lucas.charpentier@xwiki.com>
Date: Thu, 6 Jun 2024 17:36:18 +0200
Subject: [PATCH] XWIKI-22137: Tour button on the bottom right in French
 doesn't display properly characters with accents  (#3144)

* Removed the json escaping from the button text content
* Refactored the button creation

Co-authored-by: Manuel Leduc <manuel.leduc@xwiki.com>
(cherry picked from commit cd2d76226fded85b1ac0f2821eddccbe7910d0d0)
---
 .../src/main/resources/TourCode/TourJS.xml                    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-ui/src/main/resources/TourCode/TourJS.xml b/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-ui/src/main/resources/TourCode/TourJS.xml
index cffd3a253d0..264117fb585 100644
--- a/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-ui/src/main/resources/TourCode/TourJS.xml
+++ b/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-ui/src/main/resources/TourCode/TourJS.xml
@@ -172,7 +172,9 @@
     // Create the popover
     var popover = $('&lt;div class="popover-content"&gt;#tr("tour.popover.show.hint")&lt;/div&gt;').appendTo(buttonContainer);
     // Create the button that will start the tour again
-    var button = $($jsontool.serialize("&lt;button id='tourResume' class='btn btn-default btn-xs'&gt;$services.icon.renderHTML('info') #tr('tour.popover.show')&lt;/button&gt;")).appendTo(buttonContainer);
+    const button = $('&lt;button id=\'tourResume\' class=\'btn btn-default btn-xs\'&gt;&lt;/button&gt;')
+      .html("$escapetool.javascript($services.icon.renderHTML('info')) #tr('tour.popover.show')")
+      .appendTo(buttonContainer);
 
     if (showPopover) {
       buttonContainer.addClass('opened');
-- 
GitLab