# HG changeset patch
# User Jaroslav Tulach <jtulach@netbeans.org>
# Date 1287867103 -7200
# Node ID aa1c63b5814951fd122e2a864dd5552237b1b5ec
# Parent  15fcdfc4cd4a081411a59909f8d9dca61bafe249
rekonq sends some strange language feel which cannot be parsed by Jersey. It is 'Bad Accept-Language field: cs,en-US;q=0.9,en;q=0.8, cz, en_US'

diff -r 15fcdfc4cd4a -r aa1c63b58149 freemarkerdor/src/main/java/cz/xelfi/quoridor/freemarkerdor/UI.java
--- a/freemarkerdor/src/main/java/cz/xelfi/quoridor/freemarkerdor/UI.java	Tue Sep 14 09:46:43 2010 +0200
+++ b/freemarkerdor/src/main/java/cz/xelfi/quoridor/freemarkerdor/UI.java	Sat Oct 23 22:51:43 2010 +0200
@@ -32,6 +32,7 @@
 import java.io.StringWriter;
 import java.net.URI;
 import java.text.MessageFormat;
+import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
@@ -51,6 +52,7 @@
 import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
+import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.CacheControl;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.Cookie;
@@ -558,16 +560,20 @@
             }
         }
         if (rb == null) {
-            for (Locale l : headers.getAcceptableLanguages()) {
-                try {
-                    rb = ResourceBundle.getBundle("cz.xelfi.quoridor.freemarkerdor.UI.Bundle", l);
-                    if (locale != null) {
-                        locale[0] = l;
+            try {
+                for (Locale l : headers.getAcceptableLanguages()) {
+                    try {
+                        rb = ResourceBundle.getBundle("cz.xelfi.quoridor.freemarkerdor.UI.Bundle", l);
+                        if (locale != null) {
+                            locale[0] = l;
+                        }
+                        break;
+                    } catch (MissingResourceException e) {
+                        // OK
                     }
-                    break;
-                } catch (MissingResourceException e) {
-                    // OK
                 }
+            } catch (WebApplicationException ex) {
+                // OK, can't parse header
             }
         }
         if (rb == null) {
diff -r 15fcdfc4cd4a -r aa1c63b58149 pom.xml
--- a/pom.xml	Tue Sep 14 09:46:43 2010 +0200
+++ b/pom.xml	Sat Oct 23 22:51:43 2010 +0200
@@ -50,7 +50,7 @@
       <quoridorVersion>1.4</quoridorVersion>
       <webidorVersion>1.17</webidorVersion>
       <visidorVersion>1.0-SNAPSHOT</visidorVersion>
-      <freemarkerVersion>1.60</freemarkerVersion>
+      <freemarkerVersion>1.61</freemarkerVersion>
       <emailerVersion>1.1</emailerVersion>
       <statisticsVersion>1.8</statisticsVersion>
       <wsdorVersion>1.0</wsdorVersion>