Index: /FCKeditor.Java/trunk/java-core/pom.xml
===================================================================
--- /FCKeditor.Java/trunk/java-core/pom.xml	(revision 2215)
+++ /FCKeditor.Java/trunk/java-core/pom.xml	(revision 2216)
@@ -23,4 +23,10 @@
 			<artifactId>servlet-api</artifactId>
 			<version>2.4</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>jstl</artifactId>
+			<version>1.1.2</version>
 			<scope>provided</scope>
 		</dependency>
Index: /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/connector/ConnectorServlet.java
===================================================================
--- /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/connector/ConnectorServlet.java	(revision 2215)
+++ /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/connector/ConnectorServlet.java	(revision 2216)
@@ -36,4 +36,5 @@
 import net.fckeditor.handlers.RequestCycleHandler;
 import net.fckeditor.handlers.ResourceTypeHandler;
+import net.fckeditor.localization.JstlResolver;
 import net.fckeditor.response.UploadResponse;
 import net.fckeditor.response.XmlResponse;
@@ -100,4 +101,5 @@
 	        throws ServletException, IOException {
 		logger.debug("Entering ConnectorServlet#doGet");
+		System.out.println(new JstlResolver().resolveLocale(request));
 
 		response.setCharacterEncoding("UTF-8");
Index: /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/localization/JstlResolver.java
===================================================================
--- /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/localization/JstlResolver.java	(revision 2216)
+++ /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/localization/JstlResolver.java	(revision 2216)
@@ -0,0 +1,15 @@
+package net.fckeditor.localization;
+
+import java.util.Locale;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.jsp.jstl.core.Config;
+
+public class JstlResolver implements LocaleResolver {
+
+	public Locale resolveLocale(HttpServletRequest request) {
+		
+		return (Locale) Config.get(request, Config.FMT_LOCALE);
+	}
+
+}
Index: /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/localization/LocaleResolver.java
===================================================================
--- /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/localization/LocaleResolver.java	(revision 2216)
+++ /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/localization/LocaleResolver.java	(revision 2216)
@@ -0,0 +1,21 @@
+package net.fckeditor.localization;
+
+import java.util.Locale;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * 
+ * @version $Id$
+ *
+ */
+public interface LocaleResolver {
+	
+	/**
+	 * 
+	 * @param request
+	 * @return
+	 */
+	public Locale resolveLocale(HttpServletRequest request);
+
+}
Index: /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/localization/impl/AcceptLanguageHeaderResolver.java
===================================================================
--- /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/localization/impl/AcceptLanguageHeaderResolver.java	(revision 2216)
+++ /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/localization/impl/AcceptLanguageHeaderResolver.java	(revision 2216)
@@ -0,0 +1,37 @@
+package net.fckeditor.localization.impl;
+
+import java.util.Locale;
+
+import javax.servlet.ServletRequest;
+import javax.servlet.http.HttpServletRequest;
+
+import net.fckeditor.localization.LocaleResolver;
+import net.fckeditor.tool.Utils;
+
+/**
+ * This implementation simply returns the user locale with
+ * {@link ServletRequest#getLocale()} but it has an advantage over the named
+ * method. If the <code>Accept-Language</code> header is empty, the default
+ * server locale will be returned. This behavior is undesired and can lead to
+ * wrong localized messages. Instead, this implementation will only return the
+ * locale if the header is not empty.
+ * 
+ * @version $Id$
+ * 
+ */
+public class AcceptLanguageHeaderResolver implements LocaleResolver {
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see net.fckeditor.localization.LocaleResolver#resolveLocale(javax.servlet.http.HttpServletRequest)
+	 */
+	public Locale resolveLocale(HttpServletRequest request) {
+
+		if (Utils.isNotEmpty(request.getHeader("Accept-Language")))
+			return request.getLocale();
+		else
+			return null;
+	}
+
+}