From 5cd7deadec48b55bb21c09bdef0082cdc5656f26 Mon Sep 17 00:00:00 2001
From: Tatyana Valkevych <tatyana.valkevych@alfresco.com>
Date: Wed, 13 May 2015 16:23:04 +0000
Subject: [PATCH] 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
---
 .../org/alfresco/repo/i18n/MessageServiceImpl.java |  4 ++--
 .../alfresco/repo/i18n/MessageServiceImplTest.java | 14 +++++++++++++-
 2 files changed, 15 insertions(+), 3 deletions(-)

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