svn commit: r1833880 - /velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/BrowserTool.java

[cbrisson]

Author: cbrisson
Date: Wed Jun 20 00:40:59 2018
New Revision: 1833880

URL: http://svn.apache.org/viewvc?rev=1833880&view=rev
Log:
[tools] Fix BrowserTool Accept-Language header parsing

Modified:
    
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/BrowserTool.java

Modified: 
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/BrowserTool.java
URL: 
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/BrowserTool.java?rev=1833880&r1=1833879&r2=1833880&view=diff
==============================================================================
--- 
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/BrowserTool.java
 (original)
+++ 
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/BrowserTool.java
 Wed Jun 20 00:40:59 2018
@@ -117,7 +117,7 @@ public class BrowserTool extends Browser
     private List<String> languagesFilter = null;
     private String preferredLanguage = null;
 
-    private static Pattern quality = 
Pattern.compile("^q\\s*=\\s*(\\d(?:0(?:.\\d{0,3})?|1(?:.0{0,3}))?)$");
+    private static Pattern quality = 
Pattern.compile("^q\\s*=\\s*((?:0|1)(?:.\\d{0,3})?)$");
 
     /**
      * Retrieves the User-Agent header from the request (if any).
@@ -538,7 +538,7 @@ public class BrowserTool extends Browser
         // fallback
         if(preferredLanguage == null)
         {
-            preferredLanguage = filterLanguageTag(languagesFilter == null ? 
getLocale().getDisplayName() : languagesFilter.get(0));
+            preferredLanguage = filterLanguageTag(languagesFilter == null ? 
getLocale().getLanguage() : languagesFilter.get(0));
         }
         // preferredLanguage should now never be null
         assert(preferredLanguage != null);