Skip to content

[DERCBOT-1404] Fix locale string interpretation #1975

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
scezen wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

[DERCBOT-1404] Fix locale string interpretation #1975

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ccc97d6
Added method
scezen Dec 30, 2025
739c420
PR Review
scezen Jan 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 20 additions & 2 deletions bot/connector-rest/src/main/kotlin/RestConnector.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ class RestConnector(
}
val message: MessageRequest = mapper.readValue(context.body().asString())
val action = transformMessage(message)
val locale = Locale.forLanguageTag(context.pathParam("locale"))
val locale = parseLocale(context.pathParam("locale"))
action.state.sourceConnectorType = message.connectorType
action.state.targetConnectorType = message.targetConnectorType
action.metadata.debugEnabled = message.debugEnabled
Expand Down Expand Up @@ -205,4 +205,22 @@ class RestConnector(
else -> getTargetConnector(targetConnectorType)?.toConnectorMessage(message)?.invoke(this) ?: emptyList()
}
}
}

private fun parseLocale(rawLocale: String): Locale {
// Accept both BCP47 (fr-FR) and legacy underscore (fr_FR) formats.
val sanitized = rawLocale.replace('_', '-')
val fromTag = Locale.forLanguageTag(sanitized)
if (fromTag.language.isNotBlank()) {
return fromTag
}

// Fallback: manual split for legacy or non-standard formats
val legacyParts = rawLocale.replace('-', '_').split('_')
if (legacyParts.size >= 2 && legacyParts[0].isNotBlank()) {
return Locale(legacyParts[0], legacyParts[1])
}

//Last resort: use raw string or system default
return if (rawLocale.isNotBlank()) Locale(rawLocale) else Locale.getDefault()
}
}
Loading