Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-07 15:46:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

WW-4929 Uses Accept-Language first, then fallbacks to Request

Browse Source
This commit is contained in:
Lukasz Lenart
2020-11-28 10:46:48 +01:00
parent 3949cd03e5
commit 2fb9b9c77f
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/org/apache/struts2/interceptor/I18nInterceptor.java
+11 -13
View File
@@ -161,7 +161,7 @@ public class I18nInterceptor extends AbstractInterceptor {
} else if (this.storage == Storage.REQUEST) {
localeHandler = new RequestLocaleHandler(invocation);
} else {
localeHandler = new AcceptLanguageHandler(invocation);
localeHandler = new AcceptLanguageLocaleHandler(invocation);
}
LOG.debug("Using LocaleFinder implementation {}", localeHandler.getClass().getName());
@@ -276,32 +276,30 @@ public class I18nInterceptor extends AbstractInterceptor {
}
}
protected class AcceptLanguageHandler extends RequestLocaleHandler {
protected class AcceptLanguageLocaleHandler extends RequestLocaleHandler {
protected AcceptLanguageHandler(ActionInvocation invocation) {
protected AcceptLanguageLocaleHandler(ActionInvocation invocation) {
super(invocation);
}
@Override
@SuppressWarnings("rawtypes")
public Locale find() {
Enumeration locales = actionInvocation.getInvocationContext().getServletRequest().getLocales();
while (locales.hasMoreElements()) {
Locale locale = (Locale) locales.nextElement();
if (supportedLocale.contains(locale)) {
return locale;
if (supportedLocale.size() > 0) {
Enumeration locales = actionInvocation.getInvocationContext().getServletRequest().getLocales();
while (locales.hasMoreElements()) {
Locale locale = (Locale) locales.nextElement();
if (supportedLocale.contains(locale)) {
return locale;
}
}
}
return super.find();
}
@Override
public boolean shouldStore() {
return false;
}
}
protected class SessionLocaleHandler extends RequestLocaleHandler {
protected class SessionLocaleHandler extends AcceptLanguageLocaleHandler {
protected SessionLocaleHandler(ActionInvocation invocation) {
super(invocation);