Merge branch '2.1.x'

Closes gh-17588
This commit is contained in:
Andy Wilkinson 2019-07-19 15:44:19 +01:00
commit ff9d0cf49b
1 changed files with 2 additions and 1 deletions

View File

@ -2157,7 +2157,8 @@ a `messages` resource bundle at the root of the classpath.
NOTE: The auto-configuration applies when the default properties file for the configured
resource bundle is available (i.e. `messages.properties` by default). If your resource
bundle contains only language-specific properties files, you are required to add the
default.
default. If no properties file is found that matches any of the configured base names,
there will be no auto-configured `MessageSource`.
The basename of the resource bundle as well as several other attributes can be configured
using the `spring.messages` namespace, as shown in the following example: