diff --git a/source/java/org/alfresco/repo/i18n/MessageServiceImpl.java b/source/java/org/alfresco/repo/i18n/MessageServiceImpl.java index eb523526b3..f5efffa251 100644 --- a/source/java/org/alfresco/repo/i18n/MessageServiceImpl.java +++ b/source/java/org/alfresco/repo/i18n/MessageServiceImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2014 Alfresco Software Limited. + * Copyright (C) 2005-2015 Alfresco Software Limited. * * This file is part of Alfresco * @@ -254,7 +254,7 @@ public class MessageServiceImpl implements MessageService if (message == null) { // get default static message (if it exists) - message = I18NUtil.getMessage(tenantService.getBaseName(messageKey)); + message = I18NUtil.getMessage(tenantService.getBaseName(messageKey), locale); } } diff --git a/source/test-java/org/alfresco/repo/i18n/MessageServiceImplTest.java b/source/test-java/org/alfresco/repo/i18n/MessageServiceImplTest.java index aa0b85ff3f..da29ead564 100644 --- a/source/test-java/org/alfresco/repo/i18n/MessageServiceImplTest.java +++ b/source/test-java/org/alfresco/repo/i18n/MessageServiceImplTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2013 Alfresco Software Limited. + * Copyright (C) 2005-2015 Alfresco Software Limited. * * This file is part of Alfresco * @@ -551,4 +551,16 @@ public class MessageServiceImplTest extends TestCase implements MessageDeployer mst.interrupt(); } } + + public void testMNT13575() + { + Locale de = new Locale("de"); + assertTrue(messageService.getLocale().equals(new Locale("en"))); + assertFalse(messageService.getLocale().equals(de)); + String key = "cm_contentmodel.property.cm_description.title"; + String value_en = "Description"; + String value_de = "Beschreibung"; + assertEquals(value_en, messageService.getMessage(key)); + assertEquals(value_de, messageService.getMessage(key, de)); + } }