inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

Browse Source 
80925: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      80870: ACE-2091 EOL Explorer.
       - Move of WebClient configuration, message bundles and extension points to Thor private module
       - Added handling to SSO endpoints to handle optional WebClient config service
       - Tested: Enterprise build, Cloud build, build unit tests, NTLM SSO/Cookie SSO path


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83133 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Erik Winlof
2014-09-04 05:54:57 +00:00
parent 90c223c2c3
commit 6722639949
239 changed files with 73 additions and 47626 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/java/org/alfresco/web/app/servlet/AuthenticationHelper.java
View File

@@ -109,11 +109,17 @@ public final class AuthenticationHelper
if (logger.isDebugEnabled())
logger.debug("Setting up the request thread.");
// setup faces context
FacesContext fc = Application.inPortalServer() ? AlfrescoFacesPortlet.getFacesContext(req) : FacesHelper
.getFacesContext(req, res, sc);
FacesContext fc = Application.inPortalServer() ? AlfrescoFacesPortlet.getFacesContext(req) : FacesHelper.getFacesContext(req, res, sc);
// Set the current locale and language (overriding the one already decoded from the Accept-Language header
I18NUtil.setLocale(Application.getLanguage(req.getSession(), Application.getClientConfig(fc).isLanguageSelect() && useInterfaceLanguage));
if (WebApplicationContextUtils.getRequiredWebApplicationContext(sc).containsBean(Application.BEAN_CONFIG_SERVICE))
{
I18NUtil.setLocale(Application.getLanguage(req.getSession(), Application.getClientConfig(fc).isLanguageSelect() && useInterfaceLanguage));
}
else
{
Application.getLanguage(req.getSession(), false);
}
if (logger.isDebugEnabled())
logger.debug("The general locale is : " + I18NUtil.getLocale());