From fc258f3e00044cbb1b350bc231db480b0973b3af Mon Sep 17 00:00:00 2001 From: Matt Ward Date: Tue, 18 Oct 2011 09:08:06 +0000 Subject: [PATCH] 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 --- .../java/org/alfresco/repo/node/MLPropertyInterceptor.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/source/java/org/alfresco/repo/node/MLPropertyInterceptor.java b/source/java/org/alfresco/repo/node/MLPropertyInterceptor.java index 15f1725fdc..a6a58fce9d 100644 --- a/source/java/org/alfresco/repo/node/MLPropertyInterceptor.java +++ b/source/java/org/alfresco/repo/node/MLPropertyInterceptor.java @@ -151,7 +151,10 @@ 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];