admin/spring-projects-spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework synced 2026-06-08 17:33:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '7.0.x'

Browse Source
This commit is contained in:
Brian Clozel
2026-03-23 14:35:05 +01:00
parent 447e1ee0cd 4b211643bb
commit a302ad88f3
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/AcceptHeaderLocaleResolver.java
+1 -1
View File
@@ -85,7 +85,7 @@ public class AcceptHeaderLocaleResolver extends AbstractLocaleResolver {
@Override
public Locale resolveLocale(HttpServletRequest request) {
Locale defaultLocale = getDefaultLocale();
if (defaultLocale != null && request.getHeader("Accept-Language") == null) {
if (defaultLocale != null && !StringUtils.hasText(request.getHeader("Accept-Language"))) {
return defaultLocale;
}
Locale requestLocale = request.getLocale();
spring-webmvc/src/test/java/org/springframework/web/servlet/i18n/AcceptHeaderLocaleResolverTests.java
+8
View File
@@ -105,6 +105,14 @@ class AcceptHeaderLocaleResolverTests {
assertThat(this.resolver.resolveLocale(request)).isEqualTo(US);
}
@Test
void defaultLocaleWithBlankAcceptLanguageHeader() {
this.resolver.setDefaultLocale(JAPANESE);
MockHttpServletRequest request = new MockHttpServletRequest();
request.addHeader("Accept-Language", "");
assertThat(this.resolver.resolveLocale(request)).isEqualTo(JAPANESE);
}
private HttpServletRequest request(Locale... locales) {
MockHttpServletRequest request = new MockHttpServletRequest();