Support of different Accept-Language HTTP header variants (eclipse-ar…

…chived#2699) The content of the Accept-Language HTTP header variants my contain comma-separated values. In this case the created Locale was not valid. Now only the first parameter passed in the header is used. Signed-off-by: Martin Herbst <[email protected]>
chaton78 · May 7, 2017 · c4b22d7 · c4b22d7
1 parent ae845d3
commit c4b22d7
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/...org.eclipse.smarthome.io.rest/src/main/java/org/eclipse/smarthome/io/rest/LocaleUtil.java b/...org.eclipse.smarthome.io.rest/src/main/java/org/eclipse/smarthome/io/rest/LocaleUtil.java
@@ -17,6 +17,7 @@
  *
  * @author Dennis Nobel - Initial contribution
  * @author Markus Rathgeb - Use locale provider
+ * @author Martin Herbst - Support of different language definition variants
  */
 public class LocaleUtil {
 
@@ -31,7 +32,13 @@ public class LocaleUtil {
     public static Locale getLocale(String acceptLanguageHttpHeader) {
         Locale locale = RESTActivator.getLocale();
         if (acceptLanguageHttpHeader != null) {
-            String[] split = acceptLanguageHttpHeader.split("-");
+            int pos = acceptLanguageHttpHeader.indexOf(',');
+            String[] split;
+            if (pos > -1) {
+                split = acceptLanguageHttpHeader.substring(0, pos).split("-");
+            } else {
+                split = acceptLanguageHttpHeader.split("-");
+            }
             if (split.length == 2) {
                 locale = new Locale(split[0], split[1]);
             } else {