diff --git a/config/alfresco/messages/rendition-config.properties b/config/alfresco/messages/rendition-config.properties
index 963c416b67..6be3347953 100644
--- a/config/alfresco/messages/rendition-config.properties
+++ b/config/alfresco/messages/rendition-config.properties
@@ -1,4 +1,45 @@
-# Rendering Actions
+# Rendering Engines i18n properties
-reformat.title=Reformat content
+# The following are common to all rendering engines
+baseRenderingAction.runAs.display-label=Run as
+baseRenderingAction.update-renditions-on-any-property-change.display-label=Update renditions on any property change
+baseRenderingAction.rendition-nodetype.display-label=Rendition node type
+baseRenderingAction.placeHolderResourcePath.display-label=Placeholder resource path
+baseRenderingAction.sourceContentProperty.display-label=Source content property
+baseRenderingAction.targetContentProperty.display-label=Target content property
+baseRenderingAction.destination-path-template.display-label=Destination path template
+baseRenderingAction.orphan-existing-rendition.display-label=Orphan existing rendition
+
+# The following are common to all template-based rendering engines
+baseTemplateRenderingAction.model.display-label=Model
+baseTemplateRenderingAction.template_string.display-label=Template string
+baseTemplateRenderingAction.template_node.display-label=Template node
+baseTemplateRenderingAction.template_path.display-label=Template path
+
+# reformat
+reformat.title=Perform a reformat rendition
reformat.description=Renders a piece of content in another format (MIME type).
+reformat.flashVersion.display-label=Flash version
+reformat.mime-type.display-label=MIME type
+
+# imageRenderingEngine
+imageRenderingEngine.title=Perform an image processing rendition
+imageRenderingEngine.xsize.display-label=Width
+imageRenderingEngine.ysize.display-label=Height
+imageRenderingEngine.isAbsolute.display-label=Is absolute
+imageRenderingEngine.maintainAspectRatio.display-label=Maintain aspect ratio
+imageRenderingEngine.resizeToThumbnail.display-label=Resize to thumbnail
+imageRenderingEngine.crop_gravity.display-label=Gravity
+imageRenderingEngine.crop_height.display-label=Crop height
+imageRenderingEngine.crop_width.display-label=Crop width
+imageRenderingEngine.crop_x.display-label=Crop x
+imageRenderingEngine.crop_y.display-label=Crop y
+imageRenderingEngine.percent_crop.display-label=Percent crop
+imageRenderingEngine.commandOptions.display-label=Command options
+
+# freemarkerRenderingEngine
+freemarkerRenderingEngine.title=Perform a Freemarker-based rendition
+freemarkerRenderingEngine.image_resolver.display-label=Image resolver
+
+# xsltRenderingEngine
+xsltRenderingEngine.title=Perform an XSLT-based rendition
diff --git a/config/alfresco/rendition-services-context.xml b/config/alfresco/rendition-services-context.xml
index 9b47f1c036..52f663ffc5 100644
--- a/config/alfresco/rendition-services-context.xml
+++ b/config/alfresco/rendition-services-context.xml
@@ -73,7 +73,6 @@
class="org.springframework.extensions.surf.util.ResourceBundleBootstrapComponent">
-
alfresco.messages.rendition-config
diff --git a/source/java/org/alfresco/repo/action/ParameterizedItemAbstractBase.java b/source/java/org/alfresco/repo/action/ParameterizedItemAbstractBase.java
index 1384166d00..81ea8b4921 100644
--- a/source/java/org/alfresco/repo/action/ParameterizedItemAbstractBase.java
+++ b/source/java/org/alfresco/repo/action/ParameterizedItemAbstractBase.java
@@ -47,7 +47,7 @@ public abstract class ParameterizedItemAbstractBase extends CommonResourceAbstra
*/
private static final String TITLE = "title";
private static final String DESCRIPTION = "description";
- private static final String DISPLAY_LABEL = "display-label";
+ protected static final String DISPLAY_LABEL = "display-label";
/**
* Action service
diff --git a/source/java/org/alfresco/repo/rendition/executer/AbstractRenderingEngine.java b/source/java/org/alfresco/repo/rendition/executer/AbstractRenderingEngine.java
index add487447d..a5e05c8323 100644
--- a/source/java/org/alfresco/repo/rendition/executer/AbstractRenderingEngine.java
+++ b/source/java/org/alfresco/repo/rendition/executer/AbstractRenderingEngine.java
@@ -50,6 +50,7 @@ import org.alfresco.service.namespace.QName;
import org.alfresco.util.GUID;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.surf.util.I18NUtil;
import com.sun.star.lang.NullPointerException;
@@ -378,6 +379,30 @@ public abstract class AbstractRenderingEngine extends ActionExecuterAbstractBase
paramList.addAll(getParameterDefinitions());
}
+ /**
+ * This method gets the parameter definition display label from the properties file.
+ * It looks first for a property whose key has a fixed rendition service-specific
+ * prefix and if that gets null, it then delegates to the standard bean name-based
+ * approach.
+ *
+ * @param paramName the name of the parameter
+ * @return the display label of the parameter
+ */
+ @Override
+ protected String getParamDisplayLabel(String paramName)
+ {
+ // First we try to get the message using a common prefix for all rendering engines.
+ final String commonPropertiesPrefix = "baseRenderingAction";
+ String message = I18NUtil.getMessage(commonPropertiesPrefix + "." + paramName + "." + DISPLAY_LABEL);
+
+ // And if that doesn't work we delegate to the standard bean name-based approach.
+ if (message == null)
+ {
+ message = super.getParamDisplayLabel(paramName);
+ }
+ return message;
+ }
+
/**
* Supplies the list of parameters required by this rendering engine.
*
diff --git a/source/java/org/alfresco/repo/rendition/executer/BaseTemplateRenderingEngine.java b/source/java/org/alfresco/repo/rendition/executer/BaseTemplateRenderingEngine.java
index 7a04b84501..37ff53e443 100644
--- a/source/java/org/alfresco/repo/rendition/executer/BaseTemplateRenderingEngine.java
+++ b/source/java/org/alfresco/repo/rendition/executer/BaseTemplateRenderingEngine.java
@@ -38,6 +38,7 @@ import org.alfresco.service.cmr.search.ResultSet;
import org.alfresco.service.cmr.search.SearchService;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.surf.util.I18NUtil;
/**
* This abstract class forms a basis for all rendering engines that are built
@@ -198,8 +199,33 @@ public abstract class BaseTemplateRenderingEngine extends AbstractRenderingEngin
*/
protected abstract String getTemplateType();
+ /**
+ * This method gets the parameter definition display label from the properties file.
+ * It looks first for a property whose key has a fixed rendition service-specific
+ * prefix and if that gets null, it then delegates to the standard bean name-based
+ * approach.
+ *
+ * @param paramName the name of the parameter
+ * @return the display label of the parameter
+ */
+ @Override
+ protected String getParamDisplayLabel(String paramName)
+ {
+ // First we try to get the message using a common prefix for all template-based rendering engines.
+ final String commonPropertiesPrefix = "baseTemplateRenderingAction";
+ String message = I18NUtil.getMessage(commonPropertiesPrefix + "." + paramName + "." + DISPLAY_LABEL);
+
+ // And if that doesn't work we delegate to the superclass.
+ if (message == null)
+ {
+ message = super.getParamDisplayLabel(paramName);
+ }
+ return message;
+ }
+
/*
- * @seeorg.alfresco.repo.rendition.executer.AbstractRenderingEngine# getParameterDefinitions()
+ * (non-Javadoc)
+ * @see org.alfresco.repo.rendition.executer.AbstractRenderingEngine#getParameterDefinitions()
*/
@Override
protected Collection getParameterDefinitions()