Merge pull request #76 from dBucik/fix_locales
fix: 🐛 Fix fallbacking of locale to the code to prevent errors
pull/1580/head
commit
dbc0710142
|
@ -58,6 +58,8 @@ public class JsonMessageSource extends AbstractMessageSource {
|
|||
this.config = config;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@Override
|
||||
protected MessageFormat resolveCode(String code, Locale locale) {
|
||||
|
||||
|
@ -73,7 +75,7 @@ public class JsonMessageSource extends AbstractMessageSource {
|
|||
|
||||
if (value == null) {
|
||||
// if it's still null, return null
|
||||
return null;
|
||||
return new MessageFormat(code, locale);
|
||||
} else {
|
||||
// otherwise format the message
|
||||
return new MessageFormat(value, locale);
|
||||
|
|
|
@ -43,7 +43,8 @@ public class TestJsonMessageSource {
|
|||
|
||||
@Test
|
||||
public void verifyWhenLocaleDoesNotExist_cannotResolveCode() {
|
||||
String code = "test";
|
||||
MessageFormat mf = jsonMessageSource.resolveCode("test", localeThatDoesNotHaveAFile);
|
||||
assertNull(mf);
|
||||
assertEquals(code, mf.toPattern());
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue