Merged BRANCHES/DEV/V3.4-BUG-FIX to HEAD:

31287: Merged BRANCHES/DEV/BELARUS/V3.4-BUG-FIX-2011_10_07 to BRANCHES/DEV/V3.4-BUG-FIX:
        31234: ALF-3756 : Browser locales can lead to inconsistencies across browsers



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@31305 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Matt Ward
2011-10-18 09:08:06 +00:00
parent efdda5d864
commit fc258f3e00

View File

@@ -152,6 +152,9 @@ public class MLPropertyInterceptor implements MethodInterceptor
// What locale must be used for filtering
Locale contentLocale = I18NUtil.getContentLocale();
// ALF-3756 fix, ignore the country and variant
contentLocale = new Locale(contentLocale.getLanguage());
if (methodName.equals("getProperty"))
{
NodeRef nodeRef = (NodeRef) args[0];