Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-05 22:56:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

WW-4722 Checks proper scope for stored locale

Browse Source
This commit is contained in:
Lukasz Lenart
2016-12-02 19:30:36 +01:00
parent 484ce1d191
commit baffa9a68b
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/org/apache/struts2/interceptor/I18nInterceptor.java
+13 -8
View File
@@ -235,16 +235,21 @@ public class I18nInterceptor extends AbstractInterceptor {
* @return the read locale
*/
protected Locale readStoredLocale(ActionInvocation invocation) {
Locale locale = readStoredLocalFromSession(invocation);
if (locale != null) {
LOG.debug("Found stored Locale {} in session, using it!", locale);
return locale;
Locale locale;
if (storage == Storage.COOKIE) {
locale = readStoredLocalFromSession(invocation);
if (locale != null) {
LOG.debug("Found stored Locale {} in session, using it!", locale);
return locale;
}
}
Locale cookie = readStoredLocaleFromCookie(invocation);
if (cookie != null) {
LOG.debug("Found stored Locale {} in cookies, using it!", locale);
return cookie;
if (storage == Storage.SESSION) {
locale = readStoredLocaleFromCookie(invocation);
if (locale != null) {
LOG.debug("Found stored Locale {} in cookies, using it!", locale);
return locale;
}
}
LOG.debug("Neither locale was in session nor in cookies, searching current Invocation context");