Fix encoding issue

Author: maximkr

Dockerfile

@@ -95,6 +95,9 @@ RUN mkdir -p /data/trackstudio/upload /data/trackstudio/index \
 # Copy WAR built in the builder stage
 COPY --from=builder --chown=tomcat:tomcat /app/build/libs/TrackStudio.war $CATALINA_HOME/webapps/
 
+# Set JVM encoding for UTF-8 support
+ENV CATALINA_OPTS="-Dfile.encoding=UTF-8"
+
 # Switch to non-root user
 USER tomcat
 

build.gradle.kts

@@ -18,6 +18,24 @@ tasks.compileJava {
     options.encoding = "UTF-8"
 }
 
+tasks.compileTestJava {
+    options.encoding = "UTF-8"
+}
+
+tasks.processResources {
+    filteringCharset = "UTF-8"
+    // JSTL читает .properties как ISO-8859-1. Конвертируем language_*.properties
+    // из UTF-8 в ASCII с \uXXXX, как делал Maven (native2ascii),
+    // чтобы на рантайме текст отображался корректно.
+    filesMatching("**/language_*.properties") {
+        filter(org.apache.tools.ant.filters.EscapeUnicode::class.java)
+    }
+}
+
+tasks.processTestResources {
+    filteringCharset = "UTF-8"
+}
+
 repositories {
     mavenCentral()
 }
@@ -84,4 +102,11 @@ tasks.war {
 // Юнит-тесты JUnit4
 tasks.test {
     useJUnit()
+    systemProperty("file.encoding", "UTF-8")
+}
+
+// Настройка Javadoc для UTF-8 (на случай генерации документации)
+tasks.javadoc {
+    options.encoding = "UTF-8"
+    (options as StandardJavadocDocletOptions).charSet = "UTF-8"
 }

docker-compose.yml

@@ -42,7 +42,7 @@ services:
     depends_on:
       - migrator 
     environment:
-      CATALINA_OPTS: -Dhibernate.connection.url=${DB_URL} -Dhibernate.connection.username=${DB_USER} -Dhibernate.connection.password=${DB_PASS}
+      CATALINA_OPTS: -Dfile.encoding=UTF-8 -Dhibernate.connection.url=${DB_URL} -Dhibernate.connection.username=${DB_USER} -Dhibernate.connection.password=${DB_PASS}
     volumes:
       - tsindex:/data/trackstudio/index
       - tsupload:/data/trackstudio/upload

src/main/webapp/WEB-INF/tlds/trackstudiotags.tld

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE taglib
         PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
         "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">

src/main/webapp/WEB-INF/tlds/x-1_0-rt.tld

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE taglib
   PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
   "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">

src/main/webapp/WEB-INF/tlds/x-1_0.tld

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE taglib
   PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
   "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">

src/main/webapp/WEB-INF/web.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <web-app
         xmlns="http://java.sun.com/xml/ns/j2ee"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"