[struts] branch master updated: WW-4929 Uses Accept-Language first even with cookies, then fallbacks to Request

[lukaszlenart]

This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git


The following commit(s) were added to refs/heads/master by this push:
     new a72d1a8  WW-4929 Uses Accept-Language first even with cookies, then 
fallbacks to Request
a72d1a8 is described below

commit a72d1a8ddfa82d0f11c6058a8a4489c24ae89141
Author: Lukasz Lenart <lukaszlen...@apache.org>
AuthorDate: Sat Nov 28 10:54:00 2020 +0100

    WW-4929 Uses Accept-Language first even with cookies, then fallbacks to 
Request
---
 core/src/main/java/org/apache/struts2/interceptor/I18nInterceptor.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/core/src/main/java/org/apache/struts2/interceptor/I18nInterceptor.java 
b/core/src/main/java/org/apache/struts2/interceptor/I18nInterceptor.java
index e7d489e..e0f978f 100644
--- a/core/src/main/java/org/apache/struts2/interceptor/I18nInterceptor.java
+++ b/core/src/main/java/org/apache/struts2/interceptor/I18nInterceptor.java
@@ -368,7 +368,7 @@ public class I18nInterceptor extends AbstractInterceptor {
         }
     }
 
-    protected class CookieLocaleHandler extends RequestLocaleHandler {
+    protected class CookieLocaleHandler extends AcceptLanguageLocaleHandler {
         protected CookieLocaleHandler(ActionInvocation invocation) {
             super(invocation);
         }