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

104023: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      103943: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         103908: Merged DEV to V4.2-BUG-FIX (4.2.5)
            103901 : MNT-13575 : Incorrect behaviour in org.alfresco.rep.i18n.MessageServiceImpl.java
               - Fixed getMessage(messageKey,locale) method according to the locale being passed
               - Added test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@104118 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tatyana Valkevych
2015-05-13 16:23:04 +00:00
parent 192e5353c0
commit 5cd7deadec
2 changed files with 15 additions and 3 deletions

View File

@@ -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);
}
}

View File

@@ -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));
}
}