# HG changeset patch
# Parent 391be5f652646030da53d28b900864a49d67681d

diff -r 391be5f65264 nuxeo-platform-webapp/src/main/resources/web/nuxeo.war/login.jsp
--- a/nuxeo-platform-webapp/src/main/resources/web/nuxeo.war/login.jsp	Mon Nov 08 20:36:34 2010 +0100
+++ b/nuxeo-platform-webapp/src/main/resources/web/nuxeo.war/login.jsp	Mon Jan 31 11:11:52 2011 -0500
@@ -10,22 +10,27 @@
 <%
 String productName = Framework.getProperty("org.nuxeo.ecm.product.name");
 String productVersion = Framework.getProperty("org.nuxeo.ecm.product.version");
+String defaultLanguage = Framework.getProperty("org.nuxeo.ecm.product.language");
 String context = request.getContextPath();
 Locale locale = request.getLocale();
-String language = locale == null ? "en" : locale.getLanguage();
+String localeLanguage = locale == null ? "en" : locale.getLanguage();
 String country = locale == null ? "US" : locale.getCountry();
 String selectedLanguage = null;
-// handle variants
-if ("en".equals(language)) {
-    if ("US".equals(country) || "GB".equals(country)) {
-        selectedLanguage = "en_" + country;
-    } else {
-        selectedLanguage = "en_US";
-    }
-} else if ("pt".equals(language)) {
-    selectedLanguage = "pt_BR";
+// handle variants)
+if (defaultLanguage == null) {
+	if ("en".equals(localeLanguage)) {
+    	if ("US".equals(country) || "GB".equals(country)) {
+        	selectedLanguage = "en_" + country;
+    	} else {
+        	selectedLanguage = "en_US";
+    	}
+	} else if ("pt".equals(localeLanguage)) {
+    	selectedLanguage = "pt_BR";
+	} else {
+    	selectedLanguage = localeLanguage;
+	}
 } else {
-    selectedLanguage = language;
+	selectedLanguage = defaultLanguage;
 }
 
 boolean maintenanceMode = AdminStatusHelper.isInstanceInMaintenanceMode();