. Fix for AWC-511

- Locale was not being set to a default for Guest user - created some issues later in certain circumstances

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2343 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2006-02-10 17:53:00 +00:00
parent 11b84ca0cb
commit ec63a96311

View File

@@ -405,11 +405,12 @@ public class Application
*
* @param context FacesContext for the current user
*
* @return Current language Locale set or null if none set
* @return Current language Locale set or the VM default if none set
*/
public static Locale getLanguage(FacesContext context)
{
return (Locale)context.getExternalContext().getSessionMap().get(LOCALE);
Locale locale = (Locale)context.getExternalContext().getSessionMap().get(LOCALE);
return locale != null ? locale : Locale.getDefault();
}
/**
@@ -417,11 +418,12 @@ public class Application
*
* @param session HttpSession for the current user
*
* @return Current language Locale set or null if none set
* @return Current language Locale set or the VM default if none set
*/
public static Locale getLanguage(HttpSession session)
{
return (Locale)session.getAttribute(LOCALE);
Locale locale = (Locale)session.getAttribute(LOCALE);
return locale != null ? locale : Locale.getDefault();
}
/**
@@ -429,11 +431,12 @@ public class Application
*
* @param session PortletSession for the current user
*
* @return Current language Locale set or null if none set
* @return Current language Locale set or the VM default if none set
*/
public static Locale getLanguage(PortletSession session)
{
return (Locale)session.getAttribute(LOCALE);
Locale locale = (Locale)session.getAttribute(LOCALE);
return locale != null ? locale : Locale.getDefault();
}
/**