Skip to content

fix: improve number placeholder regex in PluralTranslationUtil #3331

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

Open
dkrizan wants to merge 1 commit into
base: main
Choose a base branch
from
+13 −7
Open

fix: improve number placeholder regex in PluralTranslationUtil #3331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions backend/data/src/main/kotlin/io/tolgee/service/machineTranslation/PluralTranslationUtil.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@ class PluralTranslationUtil(

companion object {
const val REPLACE_NUMBER_PLACEHOLDER = "{%{REPLACE_NUMBER}%}"
private const val TOLGEE_TAG_OPEN = "<x id=\"tolgee-number\">"
private const val TOLGEE_TAG_OPEN = "<x tolgee-id=\"tolgee-number\">"
private const val TOLGEE_TAG_CLOSE = "</x>"
val TOLGEE_TAG_REGEX = "$TOLGEE_TAG_OPEN.*?$TOLGEE_TAG_CLOSE".toRegex()
val TOLGEE_TAG_REGEX = "<x tolgee-id=\"[^\">]*?\">.*?</x>".toRegex()

/**
* Returns all target forms with examples from source
Expand Down
16 changes: 11 additions & 5 deletions backend/data/src/test/kotlin/io/tolgee/unit/util/PluralTranslationUtilTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,20 @@ class PluralTranslationUtilTest {

result.toMap().assert.isEqualTo(
mapOf(
"one" to "<x id=\"tolgee-number\">1</x> apple",
"few" to "<x id=\"tolgee-number\">2</x> apples",
"many" to "<x id=\"tolgee-number\">0.5</x> apples",
"other" to "<x id=\"tolgee-number\">10</x> apples",
"one" to "<x tolgee-id=\"tolgee-number\">1</x> apple",
"few" to "<x tolgee-id=\"tolgee-number\">2</x> apples",
"many" to "<x tolgee-id=\"tolgee-number\">0.5</x> apples",
"other" to "<x tolgee-id=\"tolgee-number\">10</x> apples",
"=1" to "one apple",
"=2" to "Two apples",
"=5" to "<x id=\"tolgee-number\">5</x> apples",
"=5" to "<x tolgee-id=\"tolgee-number\">5</x> apples",
),
)
}

@Test
fun `strips translated x tags`() {
val text = "C'e <x tolgee-id=\"numero-tolleranza\">1</x> mela"
text.replace(PluralTranslationUtil.TOLGEE_TAG_REGEX, "#").assert.isEqualTo("C'e # mela")
}
}
Loading