Merge pull request traccar#5466 from zhanghx0905/master

Fix: Set UTF-8 Encoding for Proper Rendering of Chinese Characters in Server Title
dineshkummarc · Nov 18, 2024 · 4c0156e · 4c0156e
2 parents 249f25e + 2020f60
commit 4c0156e
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/main/java/org/traccar/web/OverrideFilter.java b/src/main/java/org/traccar/web/OverrideFilter.java
@@ -30,6 +30,7 @@
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 
 @Singleton
 public class OverrideFilter implements Filter {
@@ -70,12 +71,12 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha
                 String description = server.getString("description", "Traccar GPS Tracking System");
                 String colorPrimary = server.getString("colorPrimary", "#1a237e");
 
-                String alteredContent = new String(wrappedResponse.getCapture())
+                String alteredContent = new String(wrappedResponse.getCapture(), StandardCharsets.UTF_8)
                         .replace("${title}", title)
                         .replace("${description}", description)
                         .replace("${colorPrimary}", colorPrimary);
 
-                byte[] data = alteredContent.getBytes();
+                byte[] data = alteredContent.getBytes(StandardCharsets.UTF_8);
                 response.setContentLength(data.length);
                 response.getOutputStream().write(data);