root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

MockHttpServletResponse uses correct language header 

Issue: SPR-16311
This commit is contained in:
Rossen Stoyanchev 2017-12-19 13:56:16 -05:00
parent 99cbfd32c3
commit 6df1a7874a
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java
View File

@ -311,7 +311,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
@Override
public void setLocale(Locale locale) {
this.locale = locale;
doAddHeaderValue(HttpHeaders.ACCEPT_LANGUAGE, locale.toLanguageTag(), true);
doAddHeaderValue(HttpHeaders.CONTENT_LANGUAGE, locale.toLanguageTag(), true);
}
@Override
@ -591,11 +591,11 @@ public class MockHttpServletResponse implements HttpServletResponse {
Integer.parseInt(value.toString()));
return true;
}
else if (HttpHeaders.ACCEPT_LANGUAGE.equalsIgnoreCase(name)) {
else if (HttpHeaders.CONTENT_LANGUAGE.equalsIgnoreCase(name)) {
HttpHeaders headers = new HttpHeaders();
headers.add(HttpHeaders.ACCEPT_LANGUAGE, value.toString());
List<Locale> locales = headers.getAcceptLanguageAsLocales();
this.locale = (!locales.isEmpty() ? locales.get(0) : Locale.getDefault());
headers.add(HttpHeaders.CONTENT_LANGUAGE, value.toString());
Locale language = headers.getContentLanguage();
this.locale = language != null ? language : Locale.getDefault();
return true;
}
else {

10
spring-web/src/test/java/org/springframework/mock/web/test/MockHttpServletResponse.java
View File

@ -303,7 +303,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
@Override
public void setLocale(Locale locale) {
this.locale = locale;
doAddHeaderValue(HttpHeaders.ACCEPT_LANGUAGE, locale.toLanguageTag(), true);
doAddHeaderValue(HttpHeaders.CONTENT_LANGUAGE, locale.toLanguageTag(), true);
}
@Override
@ -579,11 +579,11 @@ public class MockHttpServletResponse implements HttpServletResponse {
Integer.parseInt(value.toString()));
return true;
}
else if (HttpHeaders.ACCEPT_LANGUAGE.equalsIgnoreCase(name)) {
else if (HttpHeaders.CONTENT_LANGUAGE.equalsIgnoreCase(name)) {
HttpHeaders headers = new HttpHeaders();
headers.add(HttpHeaders.ACCEPT_LANGUAGE, value.toString());
List<Locale> locales = headers.getAcceptLanguageAsLocales();
this.locale = (!locales.isEmpty() ? locales.get(0) : Locale.getDefault());
headers.add(HttpHeaders.CONTENT_LANGUAGE, value.toString());
Locale language = headers.getContentLanguage();
this.locale = language != null ? language : Locale.getDefault();
return true;
}
else {