LPS-82549 Fix resource bundle for Copy form Instance

rafaprax · Jun 16, 2018 · 05bda49 · 05bda49
1 parent ba7b7e8
commit 05bda49
Showing 1 changed file with 14 additions and 1 deletion.
diff --git a/...namic/data/mapping/form/web/internal/portlet/action/CopyFormInstanceMVCActionCommand.java b/...namic/data/mapping/form/web/internal/portlet/action/CopyFormInstanceMVCActionCommand.java
@@ -27,8 +27,11 @@
 import com.liferay.portal.kernel.portlet.bridges.mvc.MVCActionCommand;
 import com.liferay.portal.kernel.service.ServiceContext;
 import com.liferay.portal.kernel.service.ServiceContextFactory;
+import com.liferay.portal.kernel.util.AggregateResourceBundle;
 import com.liferay.portal.kernel.util.LocaleUtil;
 import com.liferay.portal.kernel.util.ParamUtil;
+import com.liferay.portal.kernel.util.ResourceBundleLoader;
+import com.liferay.portal.kernel.util.ResourceBundleLoaderUtil;
 import com.liferay.portal.kernel.util.ResourceBundleUtil;
 
 import java.util.Locale;
@@ -117,7 +120,17 @@ protected Map<Locale, String> getNameMap(
 	protected ResourceBundle getResourceBundle(Locale locale) {
 		Class<?> clazz = getClass();
 
-		return ResourceBundleUtil.getBundle("content.Language", locale, clazz);
+		ResourceBundleLoader portalResourceBundleLoader =
+			ResourceBundleLoaderUtil.getPortalResourceBundleLoader();
+
+		ResourceBundle portalResourceBundle =
+			portalResourceBundleLoader.loadResourceBundle(locale);
+
+		ResourceBundle resourceBundle = ResourceBundleUtil.getBundle(
+			"content.Language", locale, clazz);
+
+		return new AggregateResourceBundle(
+			resourceBundle, portalResourceBundle);
 	}
 
 	protected void setDefaultPublishedDDMFormFieldValue(