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:
Juergen Hoeller
2026-06-03 23:04:51 +02:00
parent 783388e9f8 2e653246b5
commit 2fc99eb12f
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/CookieLocaleResolver.java
+3 -2
View File
@@ -340,15 +340,16 @@ public class CookieLocaleResolver extends AbstractLocaleContextResolver {
Locale locale = null;
TimeZone zone = null;
ResponseCookie cookie = this.cookie;
if (localeContext != null) {
locale = localeContext.getLocale();
if (localeContext instanceof TimeZoneAwareLocaleContext timeZoneAwareLocaleContext) {
zone = timeZoneAwareLocaleContext.getTimeZone();
}
String value = (locale != null ? toLocaleValue(locale) : "-") + (zone != null ? '/' + zone.getID() : "");
this.cookie = this.cookie.mutate().value(value).build();
cookie = this.cookie.mutate().value(value).build();
}
response.addHeader(HttpHeaders.SET_COOKIE, this.cookie.toString());
response.addHeader(HttpHeaders.SET_COOKIE, cookie.toString());
request.setAttribute(LOCALE_REQUEST_ATTRIBUTE_NAME,
(locale != null ? locale : this.defaultLocaleFunction.apply(request)));
request.setAttribute(TIME_ZONE_REQUEST_ATTRIBUTE_NAME,