Merged V3.1 to HEAD

13084: Merged V2.1-A to V3.1 7984: *RECORD-ONLY* Final part of fix for ACT 819, by default the web-client now generates WebScript content download API based URLs to allow relative paths to be resolved in HTML content files 13086: Merged V2.1-A to V3.1 7986: *RECORD-ONLY* Additional for ACT 819, View In Browser details page links and cm:link objects to content now output Content API webscript urls 13090: Merged V2.1-A to V3.1 7986: Language locale auto-selection based on browser locale - see ACT 1053 NOTE: a web-client-config setting has been added to enable this - it is off by default. 13093: Merged V2.1-A to V3.1 8255: Filetypes and PanelGenerator enhancements 13094: Merged V2.1-A to V3.1 8547: Branding changes from Mike [just filetypes merged] 13095: Merged V2.1-A to V3.1 8555: Webdav path support for ExternalAccessServlet browse navigation 13103: Merged V2.1-A to V3.1 8592: Fix for login page issue with language locale auto-selection - see ACT 1053 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13559 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2026-09-16 18:13:21 +00:00 · 2009-03-11 11:16:01 +00:00
parent 3af6eec220
commit 57afebd2cd
26 changed files with 223 additions and 28 deletions
@@ -28,9 +28,12 @@
 <%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
 <%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>

+<%@ page import="org.alfresco.web.app.servlet.BaseServlet" %>
 <%@ page import="org.alfresco.web.app.servlet.AuthenticationHelper" %>
 <%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+<%@ page import="javax.faces.context.FacesContext" %>
 <%@ page import="javax.servlet.http.Cookie" %>
+<%@ page import="java.util.Locale" %>

 <%@ page buffer="16kb" contentType="text/html;charset=UTF-8" %>
 <%@ page isELIgnored="false" %>
@@ -55,6 +58,9 @@
         session.setAttribute(AuthenticationHelper.SESSION_USERNAME, authCookie.getValue());
      }
   }
+   
+   // setup system locale from the Accept-Language header value
+   Locale locale = BaseServlet.setLanguageFromRequestHeader(request);
 %>

 <body bgcolor="#ffffff" style="background-image: url(<%=request.getContextPath()%>/images/logo/AlfrescoFadedBG.png); background-repeat: no-repeat; background-attachment: fixed">
@@ -62,6 +68,13 @@
 <r:page titleId="title_login">

 <f:view>
+<%
+   FacesContext fc = FacesContext.getCurrentInstance();
+
+   // set locale for JSF framework usage
+   fc.getViewRoot().setLocale(locale);
+%>
+   
   <%-- load a bundle of properties I18N strings here --%>
   <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
   
@@ -116,11 +129,11 @@
               
               <tr>
                  <td>
-                     <h:outputText value="#{msg.language}"/>:
+                     <h:outputText value="#{msg.language}:" rendered="#{LoginBean.languageSelect}" />
                  </td>
                  <td>
                     <%-- language selection drop-down --%>
-                     <h:selectOneMenu id="language" value="#{UserPreferencesBean.language}" style="width:150px" onchange="document.forms['loginForm'].submit(); return true;">
+                     <h:selectOneMenu id="language" value="#{UserPreferencesBean.language}" style="width:150px" onchange="document.forms['loginForm'].submit(); return true;" rendered="#{LoginBean.languageSelect}">
                        <f:selectItems value="#{UserPreferencesBean.languages}" />
                     </h:selectOneMenu>
                  </td>
@@ -120,9 +120,9 @@
            <f:selectItems value="#{UserPreferencesBean.startLocations}" />
         </h:selectOneMenu>
         
-         <h:outputText value="#{msg.interface_language}:" />
+         <h:outputText value="#{msg.interface_language}:" rendered="#{LoginBean.languageSelect}" />
         <h:selectOneMenu
-               id="language" value="#{UserPreferencesBean.language}"
+               id="language" value="#{UserPreferencesBean.language}" rendered="#{LoginBean.languageSelect}"
               onchange="document.forms['dialog'].submit(); return true;">
            <f:selectItems value="#{UserPreferencesBean.languages}" />
         </h:selectOneMenu>