Skip to content

Commit

Permalink
[SHIBUI-894]
Browse files Browse the repository at this point in the history
Attempt at fixing i18n to fall back to the default messages.properties
file instead of the system's one.
  • Loading branch information
Bill Smith committed Sep 27, 2018
1 parent bad7af0 commit b2c8e95
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ public MappedResourceBundleMessageSource messageSource() {
MappedResourceBundleMessageSource source = new MappedResourceBundleMessageSource();
source.setBasenames("i18n/messages");
source.setUseCodeAsDefaultMessage(true);
source.setFallbackToSystemLocale(false);
return source;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ class InternationalizationMessagesControllerTests extends Specification {
when:
def result = mockMvc.perform(
get(messagesUrl)
.header("Accept-Language", "es"))
.header("Accept-Language", "ja_JP"))

then:
result.andExpect(content().json(expectedEnglishResult))
Expand Down

0 comments on commit b2c8e95

Please sign in to comment.