From 2ddcb5d33eb8b9adeecd8c01196313ef8a7963b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mathieu=20M=C3=A9a?= <mathieu.mea@gmail.com>
Date: Thu, 3 Jul 2025 22:13:24 -0400
Subject: [PATCH 1/4] No-code parser > trip head-sign clean > remove "Via"
 option

---
 src/main/java/org/mtransit/commons/StringsCleaner.kt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/mtransit/commons/StringsCleaner.kt b/src/main/java/org/mtransit/commons/StringsCleaner.kt
index ac20f7e..f6140b2 100644
--- a/src/main/java/org/mtransit/commons/StringsCleaner.kt
+++ b/src/main/java/org/mtransit/commons/StringsCleaner.kt
@@ -12,8 +12,11 @@ object StringsCleaner {
     }
 
     @JvmStatic
-    fun cleanTripHeadsign(originalTripHeadsign: String, languages: List<Locale>?): String {
+    fun cleanTripHeadsign(originalTripHeadsign: String, languages: List<Locale>?, removeVia: Boolean): String {
         var tripHeadsign = originalTripHeadsign
+        if (removeVia) {
+            tripHeadsign = CleanUtils.keepToAndRemoveVia(tripHeadsign)
+        }
         tripHeadsign = cleanString(tripHeadsign, languages, short = true)
         return tripHeadsign
     }

From 02f9c365b5dbdbaa52323016312c4f1482b6863f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mathieu=20M=C3=A9a?= <mathieu.mea@gmail.com>
Date: Thu, 3 Jul 2025 22:18:41 -0400
Subject: [PATCH 2/4] always cleanup "to/towards"

---
 src/main/java/org/mtransit/commons/StringsCleaner.kt | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/mtransit/commons/StringsCleaner.kt b/src/main/java/org/mtransit/commons/StringsCleaner.kt
index f6140b2..3c72b95 100644
--- a/src/main/java/org/mtransit/commons/StringsCleaner.kt
+++ b/src/main/java/org/mtransit/commons/StringsCleaner.kt
@@ -14,8 +14,15 @@ object StringsCleaner {
     @JvmStatic
     fun cleanTripHeadsign(originalTripHeadsign: String, languages: List<Locale>?, removeVia: Boolean): String {
         var tripHeadsign = originalTripHeadsign
-        if (removeVia) {
-            tripHeadsign = CleanUtils.keepToAndRemoveVia(tripHeadsign)
+        if (languages?.contains(Locale.ENGLISH) == true) {
+            if (removeVia) {
+                tripHeadsign = CleanUtils.keepToAndRemoveVia(tripHeadsign)
+            } else {
+                tripHeadsign = CleanUtils.keepTo(tripHeadsign)
+            }
+        }
+        if (languages?.contains(Locale.FRENCH) == true) {
+            tripHeadsign = CleanUtils.keepToFR(tripHeadsign)
         }
         tripHeadsign = cleanString(tripHeadsign, languages, short = true)
         return tripHeadsign

From cd7f3ad38b7c0cf469594a6814748999a66c7fb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mathieu=20M=C3=A9a?= <mathieu.mea@gmail.com>
Date: Fri, 4 Jul 2025 20:27:24 -0400
Subject: [PATCH 3/4] compat with `parser`

---
 src/main/java/org/mtransit/commons/StringsCleaner.kt | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/mtransit/commons/StringsCleaner.kt b/src/main/java/org/mtransit/commons/StringsCleaner.kt
index 3c72b95..a636127 100644
--- a/src/main/java/org/mtransit/commons/StringsCleaner.kt
+++ b/src/main/java/org/mtransit/commons/StringsCleaner.kt
@@ -12,7 +12,11 @@ object StringsCleaner {
     }
 
     @JvmStatic
-    fun cleanTripHeadsign(originalTripHeadsign: String, languages: List<Locale>?, removeVia: Boolean): String {
+    fun cleanTripHeadsign(
+        originalTripHeadsign: String,
+        languages: List<Locale>?,
+        removeVia: Boolean = false,
+    ): String {
         var tripHeadsign = originalTripHeadsign
         if (languages?.contains(Locale.ENGLISH) == true) {
             if (removeVia) {

From 51b931305441a55a1ad732e97bf359dcacc70b9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mathieu=20M=C3=A9a?= <mathieu.mea@gmail.com>
Date: Fri, 4 Jul 2025 20:33:50 -0400
Subject: [PATCH 4/4] compat with `parser` (2)

---
 src/main/java/org/mtransit/commons/StringsCleaner.kt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/org/mtransit/commons/StringsCleaner.kt b/src/main/java/org/mtransit/commons/StringsCleaner.kt
index a636127..f747d05 100644
--- a/src/main/java/org/mtransit/commons/StringsCleaner.kt
+++ b/src/main/java/org/mtransit/commons/StringsCleaner.kt
@@ -11,6 +11,7 @@ object StringsCleaner {
         return routeLongName
     }
 
+    @JvmOverloads
     @JvmStatic
     fun cleanTripHeadsign(
         originalTripHeadsign: String,