diff --git a/src/main/java/org/mtransit/commons/StringsCleaner.kt b/src/main/java/org/mtransit/commons/StringsCleaner.kt index ac20f7e..f747d05 100644 --- a/src/main/java/org/mtransit/commons/StringsCleaner.kt +++ b/src/main/java/org/mtransit/commons/StringsCleaner.kt @@ -11,9 +11,24 @@ object StringsCleaner { return routeLongName } + @JvmOverloads @JvmStatic - fun cleanTripHeadsign(originalTripHeadsign: String, languages: List?): String { + fun cleanTripHeadsign( + originalTripHeadsign: String, + languages: List?, + removeVia: Boolean = false, + ): String { var tripHeadsign = originalTripHeadsign + 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 }