Skip to content

fix: advanced format patterns in translation provider #1817

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

Merged
0utplay merged 2 commits into from
Dec 8, 2025
Merged

fix: advanced format patterns in translation provider #1817

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
11d2777
fix: advanced format pattern in translation provider
derklaro Dec 8, 2025
8191cc6
stricter regex, bit more test coverage
derklaro Dec 8, 2025
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 ...r/api/src/main/java/eu/cloudnetservice/driver/language/PropertiesTranslationProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
*/
public final class PropertiesTranslationProvider implements TranslationProvider {

// https://regex101.com/r/FaX3tj/1
private static final Pattern TRANSLATION_ARG_FORMAT_PATTERN = Pattern.compile("\\{(\\d+)\\$.+?\\$}");
// https://regex101.com/r/Xs7lNp/1
private static final Pattern TRANSLATION_ARG_FORMAT_PATTERN = Pattern.compile("\\{(\\d+|\\d+,.+?)\\$.+?\\$}");

// a lock that must be held when using a MessageFormat to format a translation
// this is due to the fact that MessageFormats are not thread safe, but we don't expect
Expand Down
17 changes: 17 additions & 0 deletions driver/impl/src/test/java/eu/cloudnetservice/driver/impl/language/I18nTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,4 +173,21 @@ void testTranslationProvidersUnregisterByClassLoader() {
Assertions.assertEquals("<missing translation for 1 in en-US>", i18n.translate("1"));
Assertions.assertEquals("<missing translation for 2 in en-US>", i18n.translate("2"));
}

@Test
void testAdvancedMessageFormatPatternsArePickedUp() {
var properties = new Properties();
properties.put("1", "Hello {0$name$}, your status is {1, choice, 0#deactivated|1#active$status$}");
properties.put("2", "{0} {1$name$} {2,number,integer$an int$} {3,choice,0#hello|1#world|2#test$some description$}");
var provider = PropertiesTranslationProvider.fromProperties(properties);

var i18n = I18n.i18n();
i18n.registerProvider(i18n.selectedLanguage(), provider);

Assertions.assertEquals("Hello Rob, your status is active", i18n.translate("1", "Rob", 1));
Assertions.assertEquals("Hello Klaro, your status is deactivated", i18n.translate("1", "Klaro", 0));

Assertions.assertEquals("World Rob 56,789 test", provider.translate("2", "World", "Rob", 56789, 2));
Assertions.assertEquals("Hello World 1,234,568 world", provider.translate("2", "Hello", "World", 1234567.89, 1));
}
}
Loading