Commit ff9d0cf4 authored by Andy Wilkinson's avatar Andy Wilkinson

Merge branch '2.1.x'

Closes gh-17588
parents 78871d7a 74f0e42c
...@@ -2157,7 +2157,8 @@ a `messages` resource bundle at the root of the classpath. ...@@ -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 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 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 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 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: using the `spring.messages` namespace, as shown in the following example:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment