Skip to content

Format i18n message arguments with the message locale #4500

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
Meemaw wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Format i18n message arguments with the message locale #4500

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
3 changes: 2 additions & 1 deletion src/main/java/graphql/i18n/I18n.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ private String msgImpl(String msgKey, Object[] msgArgs) {
} catch (MissingResourceException e) {
assertShouldNeverHappen("There must be a resource bundle key called %s", msgKey);
}
return new MessageFormat(msgPattern).format(msgArgs);
// format any arguments (eg numbers) with the same locale as the message rather than the JVM default locale
return new MessageFormat(msgPattern, locale).format(msgArgs);
}
}
19 changes: 19 additions & 0 deletions src/test/groovy/graphql/i18n/I18nTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,25 @@ class I18nTest extends Specification {
message == "Validierungsfehler ({0}) : Type definition '{1}' ist nicht ausführbar"
}

def "message arguments are formatted with the message locale not the JVM default locale"() {
// Slovenian formats -1 with a unicode minus sign and groups thousands with a dot
def originalDefault = Locale.getDefault()
def originalFormatDefault = Locale.getDefault(Locale.Category.FORMAT)
Locale.setDefault(Locale.forLanguageTag("sl-SI"))

when:
def englishMessage = I18n.i18n(BundleType.Parsing, Locale.ENGLISH).msg("InvalidSyntaxMoreTokens.noMessage", -1, 1234)
def germanMessage = I18n.i18n(BundleType.Parsing, Locale.GERMAN).msg("InvalidSyntaxMoreTokens.noMessage", -1, 1234)

then:
englishMessage.endsWith("Offending token at line -1 column 1,234")
germanMessage.endsWith("Ungültiges Token in Zeile -1 Spalte 1.234")

cleanup:
Locale.setDefault(originalDefault)
Locale.setDefault(Locale.Category.FORMAT, originalFormatDefault)
}

def "integration test of valid messages"() {
def sdl = """
type Query {
Expand Down