Author: erwan
Date: Sat Jan 7 19:39:07 2012
New Revision: 1228706
URL: http://svn.apache.org/viewvc?rev=1228706&view=rev
Log:
Missing uiLabel for ImageManagementWatermarkingLocation and typo correction
Manament --> Management
Modified:
ofbiz/trunk/applications/product/config/ProductUiLabels.xml
ofbiz/trunk/applications/product/widget/catalog/CatalogMenus.xml
ofbiz/trunk/applications/product/widget/catalog/ImageManagementForms.xml
ofbiz/trunk/applications/product/widget/catalog/ImageManagementScreens.xml
Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.xml?rev=1228706&r1=1228705&r2=1228706&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Sat Jan 7
19:39:07 2012
@@ -5819,12 +5819,12 @@
<value xml:lang="en">Image Management Application</value>
<value
xml:lang="th">à¹à¸à¸£à¹à¸à¸£à¸¡à¸à¸±à¸à¸à¸²à¸£à¸£à¸¹à¸à¸ าà¸</value>
</property>
- <property key="ImageManamentApprove">
+ <property key="ImageManagementApprove">
<value xml:lang="de">Bestätigen</value>
<value xml:lang="en">Approve</value>
<value xml:lang="th">à¸à¸à¸¸à¸¡à¸±à¸à¸´</value>
</property>
- <property key="ImageManamentApprovedDate">
+ <property key="ImageManagementApprovedDate">
<value xml:lang="en">Approved Date</value>
<value xml:lang="th">วัà¸à¸à¸µà¹à¸à¸à¸¸à¸¡à¸±à¸à¸´</value>
</property>
@@ -5985,6 +5985,10 @@
<value xml:lang="en">Watermark</value>
<value xml:lang="th">ลายà¸à¹à¸³</value>
</property>
+ <property key="ImageManagementWatermarkingLocation">
+ <value xml:lang="en">Click directly on the image to adjust the
location of the watermark</value>
+ <value xml:lang="fr">Cliquer directement sur l'image pour positionner
le filigrane</value>
+ </property>
<property key="ImageManagementWelcomeMessage">
<value xml:lang="en">Welcome to the Image Management</value>
<value
xml:lang="th">ยิà¸à¸à¸µà¸à¹à¸à¸à¸£à¸±à¸à¸ªà¸¹à¹à¸£à¸à¸à¸à¸²à¸£à¸à¸±à¸à¸à¸²à¸£à¸£à¸¹à¸à¸ าà¸</value>
Modified: ofbiz/trunk/applications/product/widget/catalog/CatalogMenus.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CatalogMenus.xml?rev=1228706&r1=1228705&r2=1228706&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/CatalogMenus.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/CatalogMenus.xml Sat Jan 7
19:39:07 2012
@@ -613,7 +613,7 @@ under the License.
<parameter param-name="productId"/>
</link>
</menu-item>
- <menu-item name="ImageApprove"
title="${uiLabelMap.ImageManamentApprove}">
+ <menu-item name="ImageApprove"
title="${uiLabelMap.ImageManagementApprove}">
<condition>
<or>
<if-has-permission permission="IMAGE_MANAGEMENT_APPROVE"/>
Modified:
ofbiz/trunk/applications/product/widget/catalog/ImageManagementForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ImageManagementForms.xml?rev=1228706&r1=1228705&r2=1228706&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/ImageManagementForms.xml
(original)
+++ ofbiz/trunk/applications/product/widget/catalog/ImageManagementForms.xml
Sat Jan 7 19:39:07 2012
@@ -451,7 +451,7 @@ under the License.
<field name="imageName"><hidden
value="${contentDataResource.drDataResourceName}"/></field>
<field name="imageWatermark" use-when="imageURL != null"
title="${uiLabelMap.CommonImage}" widget-area-style="img-src"><image
value="${imageURL}"/></field>
<field name="imageWatermark" use-when="imageURL == null"
title="${uiLabelMap.CommonImage}" widget-area-style="img-src-de"><image
value="/images/defaultImage.jpg"/></field>
- <field name="" widget-style="h3"><display description="Click directly
on the image to adjust the location of the watermark"/></field>
+ <field name="" widget-style="h3"><display
description="${uiLabelMap.ImageManagementWatermarkingLocation}"/></field>
<field name="imageOpacity"
title="${uiLabelMap.ImageManagementOpacity}" widget-area-style="opacity">
<drop-down no-current-selected-key="0.5">
<option key="0.1" description="10%"/>
@@ -719,7 +719,7 @@ under the License.
<field name="statusId" title="${uiLabelMap.CommonStatus}">
<display-entity entity-name="StatusItem" key-field-name="statusId"
description="${description}"/>
</field>
- <field name="purchaseFromDate"
title="${uiLabelMap.ImageManamentApprovedDate}"><display/></field>
+ <field name="purchaseFromDate"
title="${uiLabelMap.ImageManagementApprovedDate}"><display/></field>
<field name="viewButton" title="${uiLabelMap.CommonView}"
widget-style="buttontext">
<hyperlink
target="${origContentDataResourceViews[0].drObjectInfo}" target-window="_blank"
description="${uiLabelMap.CommonView}" also-hidden="false"
target-type="content"/>
</field>
Modified:
ofbiz/trunk/applications/product/widget/catalog/ImageManagementScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ImageManagementScreens.xml?rev=1228706&r1=1228705&r2=1228706&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/ImageManagementScreens.xml
(original)
+++ ofbiz/trunk/applications/product/widget/catalog/ImageManagementScreens.xml
Sat Jan 7 19:39:07 2012
@@ -222,7 +222,7 @@ under the License.
<platform-specific>
<html><html-template
location="component://product/webapp/catalog/imagemanagement/showPeopleApprove.ftl"/></html>
</platform-specific>
- <screenlet
title="${uiLabelMap.ImageManamentApprove}">
+ <screenlet
title="${uiLabelMap.ImageManagementApprove}">
<include-form name="ImageApprove"
location="component://product/widget/catalog/ImageManagementForms.xml"/>
</screenlet>
</widgets>