[OFBiz] SVN: r7910 - in trunk/applications/order: config entitydef webapp/ordermgr/entry/cart webapp/ordermgr/entry/catalog widget/ordermgr
jacopo@svn.ofbiz.org
jacopo at svn.ofbiz.org
Fri Jun 30 17:04:04 CDT 2006
Author: jacopo
Date: 2006-06-30 17:03:40 -0500 (Fri, 30 Jun 2006)
New Revision: 7910
Modified:
trunk/applications/order/config/OrderUiLabels_it.properties
trunk/applications/order/entitydef/entitymodel.xml
trunk/applications/order/webapp/ordermgr/entry/cart/showPromotionDetails.ftl
trunk/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl
trunk/applications/order/webapp/ordermgr/entry/catalog/advancedsearch.ftl
trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl
trunk/applications/order/webapp/ordermgr/entry/catalog/quickaddsummary.ftl
trunk/applications/order/widget/ordermgr/OrderViewScreens.xml
trunk/applications/order/widget/ordermgr/ReportForms.xml
Log:
i18n patch for the order component from Marco Risaliti (Apache OFBIZ-25).
Modified: trunk/applications/order/config/OrderUiLabels_it.properties
===================================================================
--- trunk/applications/order/config/OrderUiLabels_it.properties 2006-06-30 21:35:13 UTC (rev 7909)
+++ trunk/applications/order/config/OrderUiLabels_it.properties 2006-06-30 22:03:40 UTC (rev 7910)
@@ -195,8 +195,10 @@
OrderOrderId = Numero Ordine
OrderOrderInclude=Includi
OrderOrderItems = Righe Ordine
+OrderOrderItemType = Tipo Riga
OrderOrderList = Lista Ordine
OrderOrderManagerApplication = Applicazione Gestione Ordini
+OrderOrderName = Nome Ordine
OrderOrderNeedingAttention = Ordini che Hanno bisogno di Attenzione
OrderOrderNumber = Numero Ordine
OrderOrderOptionSettings = Configurazione Opzioni Ordine
Modified: trunk/applications/order/entitydef/entitymodel.xml
===================================================================
--- trunk/applications/order/entitydef/entitymodel.xml 2006-06-30 21:35:13 UTC (rev 7909)
+++ trunk/applications/order/entitydef/entitymodel.xml 2006-06-30 22:03:40 UTC (rev 7910)
@@ -1941,6 +1941,7 @@
</entity>
<entity entity-name="WorkReqFulfType"
package-name="org.ofbiz.order.requirement"
+ default-resource-name="OrderEntityLabels"
title="Work Requirement Fulfillment Type Entity">
<field name="workReqFulfTypeId" type="id-ne"></field>
<field name="description" type="description"></field>
Modified: trunk/applications/order/webapp/ordermgr/entry/cart/showPromotionDetails.ftl
===================================================================
--- trunk/applications/order/webapp/ordermgr/entry/cart/showPromotionDetails.ftl 2006-06-30 21:35:13 UTC (rev 7909)
+++ trunk/applications/order/webapp/ordermgr/entry/cart/showPromotionDetails.ftl 2006-06-30 22:03:40 UTC (rev 7910)
@@ -47,27 +47,27 @@
<#assign productCategory = productPromoCategory.getRelatedOneCache("ProductCategory")>
<div class="tabletext">
- <a href="<@ofbizUrl>category/~category_id=${productPromoCategory.productCategoryId}</@ofbizUrl>" class="buttontext">${(productCategory.description)?default(productPromoCategory.productCategoryId)}</a>
- <#if productPromoCategory.includeSubCategories?if_exists = "Y">(or any sub-category)</#if>
+ <#if productPromoCategory.includeSubCategories?if_exists = "Y">(${uiLabelMap.EcommerceIncludeSubCategories})</#if>
</div>
</#list>
</#if>
<#if productPromoCategoryExcludeList?has_content>
- <div class="tabletext">unless they are in these categories:</div>
+ <div class="tabletext">${uiLabelMap.EcommerceEcludeCategories}</div>
<#list productPromoCategoryExcludeList as productPromoCategory>
<#assign productCategory = productPromoCategory.getRelatedOneCache("ProductCategory")>
<div class="tabletext">
- <a href="<@ofbizUrl>category/~category_id=${productPromoCategory.productCategoryId}</@ofbizUrl>" class="buttontext">${(productCategory.description)?default(productPromoCategory.productCategoryId)}</a>
- <#if productPromoCategory.includeSubCategories?if_exists = "Y">(or any sub-category)</#if>
+ <#if productPromoCategory.includeSubCategories?if_exists = "Y">(${uiLabelMap.EcommerceIncludeSubCategories})</#if>
</div>
</#list>
</#if>
<#if productPromoCategoryAlwaysList?has_content>
- <div class="tabletext">but will stll be included if they are in these categories:</div>
+ <div class="tabletext">${uiLabelMap.EcommerceAlwaysList}</div>
<#list productPromoCategoryAlwaysList as productPromoCategory>
<#assign productCategory = productPromoCategory.getRelatedOneCache("ProductCategory")>
<div class="tabletext">
- <a href="<@ofbizUrl>category/~category_id=${productPromoCategory.productCategoryId}</@ofbizUrl>" class="buttontext">${(productCategory.description)?default(productPromoCategory.productCategoryId)}</a>
- <#if productPromoCategory.includeSubCategories?if_exists = "Y">(or any sub-category)</#if>
+ <#if productPromoCategory.includeSubCategories?if_exists = "Y">(${uiLabelMap.EcommerceIncludeSubCategories})</#if>
</div>
</#list>
</#if>
Modified: trunk/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl
===================================================================
--- trunk/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl 2006-06-30 21:35:13 UTC (rev 7909)
+++ trunk/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl 2006-06-30 22:03:40 UTC (rev 7910)
@@ -159,12 +159,12 @@
${uiLabelMap.OrderOrderItemType}:
<select name="itemType_${cartLineIndex}" class="selectBox">
<#if currentOrderItemType?has_content>
- <option value="${currentOrderItemType.orderItemTypeId}">${currentOrderItemType.description}</option>
+ <option value="${currentOrderItemType.orderItemTypeId}">${currentOrderItemType.get("description",locale)}</option>
<option value="${currentOrderItemType.orderItemTypeId}">---</option>
</#if>
<option value=""> </option>
<#list purchaseOrderItemTypeList as orderItemType>
- <option value="${orderItemType.orderItemTypeId}">${orderItemType.description}</option>
+ <option value="${orderItemType.orderItemTypeId}">${orderItemType.get("description",locale)}</option>
</#list>
</select>
</div>
@@ -266,7 +266,7 @@
<tr>
<td colspan="4" nowrap align="right">
<div class="tabletext">
- <i>Adjustment</i> - ${adjustmentType.description?if_exists}
+ <i>Adjustment</i> - ${adjustmentType.get("description",locale)?if_exists}
<#if cartAdjustment.productPromoId?has_content><a href="<@ofbizUrl>showPromotionDetails?productPromoId=${cartAdjustment.productPromoId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDetails}</a></#if>:
</div>
</td>
Modified: trunk/applications/order/webapp/ordermgr/entry/catalog/advancedsearch.ftl
===================================================================
--- trunk/applications/order/webapp/ordermgr/entry/catalog/advancedsearch.ftl 2006-06-30 21:35:13 UTC (rev 7909)
+++ trunk/applications/order/webapp/ordermgr/entry/catalog/advancedsearch.ftl 2006-06-30 22:03:40 UTC (rev 7910)
@@ -69,7 +69,7 @@
<td valign="middle">
<div class="tabletext">
<select class="selectBox" name="pft_${productFeatureTypeId}">
- <option value="">- ${uiLabelMap.CommonAny} -</option>
+ <option value="">- ${uiLabelMap.CommonSelectAny} -</option>
<#list productFeatures as productFeature>
<option value="${productFeature.productFeatureId}">${productFeature.get("description",locale)?default(productFeature.productFeatureId)}</option>
</#list>
@@ -85,7 +85,7 @@
<td valign="middle">
<div class="tabletext">
<select name="SEARCH_SUPPLIER_ID" class="selectBox">
- <option value="">- ${uiLabelMap.CommonAny} -</option>
+ <option value="">- ${uiLabelMap.CommonSelectAny} -</option>
<#list supplerPartyRoleAndPartyDetails as supplerPartyRoleAndPartyDetail>
<option value="${supplerPartyRoleAndPartyDetail.partyId}"<#if (sessionAttributes.orderPartyId?exists & sessionAttributes.orderPartyId = supplerPartyRoleAndPartyDetail.partyId)> selected</#if>>${supplerPartyRoleAndPartyDetail.groupName?if_exists} ${supplerPartyRoleAndPartyDetail.firstName?if_exists} ${supplerPartyRoleAndPartyDetail.lastName?if_exists} [${supplerPartyRoleAndPartyDetail.partyId}]</option>
</#list>
Modified: trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl
===================================================================
--- trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl 2006-06-30 21:35:13 UTC (rev 7909)
+++ trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl 2006-06-30 22:03:40 UTC (rev 7910)
@@ -265,7 +265,7 @@
<div class="tabletext">${uiLabelMap.ProductRegularPrice}: <span class="basePrice"><@ofbizCurrency amount=price.defaultPrice isoCode=price.currencyUsed/></span></div>
</#if>
<#if price.specialPromoPrice?exists>
- <div class="tabletext">Special Promo Price: <span class="basePrice"><@ofbizCurrency amount=price.specialPromoPrice isoCode=price.currencyUsed/></span></div>
+ <div class="tabletext">${uiLabelMap.ProductSpecialPromoPrice}: <span class="basePrice"><@ofbizCurrency amount=price.specialPromoPrice isoCode=price.currencyUsed/></span></div>
</#if>
<div class="tabletext">
<b>
@@ -277,9 +277,9 @@
</#if>
${uiLabelMap.EcommerceYourPrice}: <#if "Y" = product.isVirtual?if_exists> ${uiLabelMap.CommonFrom} </#if><span class="${priceStyle}"><@ofbizCurrency amount=price.price isoCode=price.currencyUsed/></span>
<#if product.productTypeId?if_exists == "ASSET_USAGE">
- <#if product.reserv2ndPPPerc?exists && product.reserv2ndPPPerc != 0><br/><span class="${priceStyle}">Price for the 2nd <#if !product.reservNthPPPerc?exists || product.reservNthPPPerc == 0>until the ${product.reservMaxPersons}</#if> person: <@ofbizCurrency amount=product.reserv2ndPPPerc*price.price/100 isoCode=price.currencyUsed/></span></#if>
- <#if product.reservNthPPPerc?exists &&product.reservNthPPPerc != 0><br/><span class="${priceStyle}">Price for the <#if !product.reserv2ndPPPerc?exists || product.reserv2ndPPPerc == 0>second <#else> 3rd </#if> until the ${product.reservMaxPersons}th person, each: <@ofbizCurrency amount=product.reservNthPPPerc*price.price/100 isoCode=price.currencyUsed/></span></#if>
- <#if (!product.reserv2ndPPPerc?exists || product.reserv2ndPPPerc == 0) && (!product.reservNthPPPerc?exists || product.reservNthPPPerc == 0)><br/>Maximum ${product.reservMaxPersons} persons.</#if>
+ <#if product.reserv2ndPPPerc?exists && product.reserv2ndPPPerc != 0><br/><span class="${priceStyle}">${uiLabelMap.ProductReserv2ndPPPerc}<#if !product.reservNthPPPerc?exists || product.reservNthPPPerc == 0>${uiLabelMap.CommonUntil} ${product.reservMaxPersons}</#if> <@ofbizCurrency amount=product.reserv2ndPPPerc*price.price/100 isoCode=price.currencyUsed/></span></#if>
+ <#if product.reservNthPPPerc?exists &&product.reservNthPPPerc != 0><br/><span class="${priceStyle}">${uiLabelMap.ProductReservNthPPPerc} <#if !product.reserv2ndPPPerc?exists || product.reserv2ndPPPerc == 0>${uiLabelMap.ProductReservSecond} <#else> ${uiLabelMap.ProductReservThird} </#if> ${uiLabelMap.CommonUntil} ${product.reservMaxPersons}, ${uiLabelMap.ProductEach}: <@ofbizCurrency amount=product.reservNthPPPerc*price.price/100 isoCode=price.currencyUsed/></span></#if>
+ <#if (!product.reserv2ndPPPerc?exists || product.reserv2ndPPPerc == 0) && (!product.reservNthPPPerc?exists || product.reservNthPPPerc == 0)><br/>${uiLabelMap.ProductMaximum} ${product.reservMaxPersons} ${uiLabelMap.ProductPersons}.</#if>
</#if>
</b>
</div>
@@ -408,7 +408,7 @@
<#assign hiddenStyle = "tabletexthidden">
</#if>
<div id="add_amount" class="${hiddenStyle}">
- <nobr><b>Amount:</b></nobr>
+ <nobr><b>${uiLabelMap.CommonAmount}:</b></nobr>
<input type="text" class="inputBox" size="5" name="add_amount" value=""/>
</div>
<#if product.productTypeId?if_exists == "ASSET_USAGE">
@@ -449,7 +449,7 @@
</select>
<#if product.productTypeId?if_exists == "ASSET_USAGE">
- <table><tr><td> </td><td class="tabletext" align="right">Start Date (yyyy-mm-dd)</td><td><input type="text" class="inputBox" size="10" name="reservStartStr" ></td><td class="tabletext">Number of days</td><td><input type="text" class="inputBox" size="4" name="reservLength"></td><td> </td><td class="tabletext" align="right">Number of persons</td><td><input type="text" class="inputBox" size="4" name="reservPersons" value="1"></td><td class="tabletext" align="right">Qty </td><td><input type="text" class="inputBox" size="5" name="quantity" value="1"></td></tr></table>
+ <table><tr><td> </td><td class="tabletext" align="right">${uiLabelMap.CommonStartDate} (yyyy-mm-dd)</td><td><input type="text" class="inputBox" size="10" name="reservStartStr" ></td><td class="tabletext">Number of days</td><td><input type="text" class="inputBox" size="4" name="reservLength"></td><td> </td><td class="tabletext" align="right">Number of persons</td><td><input type="text" class="inputBox" size="4" name="reservPersons" value="1"></td><td class="tabletext" align="right">Qty </td><td><input type="text" class="inputBox" size="5" name="quantity" value="1"></td></tr></table>
<#else>
<input type="text" class="inputBox" size="5" name="quantity" value="1"/>
<input type="hidden" name="reservStartStr" value= ""/>
@@ -494,7 +494,7 @@
<#assign indexer = indexer + 1>
</#list>
<#if (indexer > maxIndex)>
- <div class="tabletext"><b>More options available in drop down.</b></div>
+ <div class="tabletext"><b>${uiLabelMap.ProductMoreOptions}</b></div>
</#if>
</tr>
</table>
@@ -607,18 +607,18 @@
${setRequestAttribute("productValue", productValue)}
<div id="associated-products">
<#-- obsolete -->
- <@associated assocProducts=obsoleteProducts beforeName="" showName="Y" afterName=" is made obsolete by these products:" formNamePrefix="obs" targetRequestName=""/>
+ <@associated assocProducts=obsoleteProducts beforeName="" showName="Y" afterName=" ${uiLabelMap.ProductObsolete}" formNamePrefix="obs" targetRequestName=""/>
<#-- cross sell -->
- <@associated assocProducts=crossSellProducts beforeName="" showName="N" afterName="You might be interested in these as well:" formNamePrefix="cssl" targetRequestName="crosssell"/>
+ <@associated assocProducts=crossSellProducts beforeName="" showName="N" afterName="${uiLabelMap.ProducrCrossSell}" formNamePrefix="cssl" targetRequestName="crosssell"/>
<#-- up sell -->
- <@associated assocProducts=upSellProducts beforeName="Try these instead of " showName="Y" afterName=":" formNamePrefix="upsl" targetRequestName="upsell"/>
+ <@associated assocProducts=upSellProducts beforeName="${uiLabelMap.ProductUpSell} " showName="Y" afterName=":" formNamePrefix="upsl" targetRequestName="upsell"/>
<#-- obsolescence -->
- <@associated assocProducts=obsolenscenseProducts beforeName="" showName="Y" afterName=" makes these products obsolete:" formNamePrefix="obce" targetRequestName=""/>
+ <@associated assocProducts=obsolenscenseProducts beforeName="" showName="Y" afterName=" ${uiLabelMap.ProductObsolescense}" formNamePrefix="obce" targetRequestName=""/>
</div>
<#-- special cross/up-sell area using commonFeatureResultIds (from common feature product search) -->
<#if commonFeatureResultIds?has_content>
- <div class="head2">Similar Products That Might Interest You...</div>
+ <div class="head2">${uiLabelMap.ProductSimilarProducts}</div>
<div class="productsummary-container">
<#list commonFeatureResultIds as commonFeatureResultId>
Modified: trunk/applications/order/webapp/ordermgr/entry/catalog/quickaddsummary.ftl
===================================================================
--- trunk/applications/order/webapp/ordermgr/entry/catalog/quickaddsummary.ftl 2006-06-30 21:35:13 UTC (rev 7909)
+++ trunk/applications/order/webapp/ordermgr/entry/catalog/quickaddsummary.ftl 2006-06-30 22:03:40 UTC (rev 7910)
@@ -36,7 +36,7 @@
<td align="left" valign="middle" width="5%">
<div class="tabletext">
<#if price.listPrice?exists && price.price?exists && price.price?double < price.listPrice?double>
- ${uiLabelMap.CommonList}:<@ofbizCurrency amount=price.listPrice isoCode=price.currencyUsed/>
+ ${uiLabelMap.ProductListPrice}:<@ofbizCurrency amount=price.listPrice isoCode=price.currencyUsed/>
<#else>
</#if>
Modified: trunk/applications/order/widget/ordermgr/OrderViewScreens.xml
===================================================================
--- trunk/applications/order/widget/ordermgr/OrderViewScreens.xml 2006-06-30 21:35:13 UTC (rev 7909)
+++ trunk/applications/order/widget/ordermgr/OrderViewScreens.xml 2006-06-30 22:03:40 UTC (rev 7910)
@@ -145,9 +145,13 @@
</screen>
<screen name="OrderDeliveryScheduleInfo">
<section>
- <actions>
+ <actions>
<set field="titleProperty" value="OrderViewEditDeliveryScheduleInfo"/>
<set field="headerItem" value="OrderDeliveryScheduleInfo"/>
+ <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
+ <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
+ <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
+ <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
<script location="component://order/webapp/ordermgr/WEB-INF/actions/order/OrderDeliveryScheduleInfo.bsh"/>
</actions>
<widgets>
Modified: trunk/applications/order/widget/ordermgr/ReportForms.xml
===================================================================
--- trunk/applications/order/widget/ordermgr/ReportForms.xml 2006-06-30 21:35:13 UTC (rev 7909)
+++ trunk/applications/order/widget/ordermgr/ReportForms.xml 2006-06-30 22:03:40 UTC (rev 7910)
@@ -82,7 +82,7 @@
default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
<field name="productStoreId">
<drop-down allow-empty="false">
- <option key="" description="- ${uiLabelMap.CommonAny} -"/>
+ <option key="" description="- ${uiLabelMap.CommonSelectAny} -"/>
<entity-options entity-name="ProductStore" description="${storeName} [${productStoreId}]">
<entity-order-by field-name="storeName"/>
</entity-options>
@@ -93,7 +93,7 @@
</field>
<field name="orderStatusId">
<drop-down allow-empty="false">
- <option key="" description="- ${uiLabelMap.CommonAny} -"/>
+ <option key="" description="- ${uiLabelMap.CommonSelectAny} -"/>
<entity-options entity-name="StatusItem" description="${description}" key-field-name="statusId">
<entity-constraint name="statusTypeId" operator="equals" value="ORDER_STATUS"/>
</entity-options>
@@ -109,7 +109,7 @@
default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
<field name="fromPartyId" title="${uiLabelMap.AccountingFromParty}">
<drop-down allow-empty="false">
- <option key="" description="- ${uiLabelMap.CommonAny} -"/>
+ <option key="" description="- ${uiLabelMap.CommonSelectAny} -"/>
<entity-options entity-name="PartyRoleAndPartyDetail" description="${groupName} ${firstName} ${lastName} [${partyId}]" key-field-name="partyId">
<entity-constraint name="roleTypeId" operator="equals" value="SUPPLIER"/>
</entity-options>
@@ -124,7 +124,7 @@
</field>
<field name="orderStatusId">
<drop-down allow-empty="false">
- <option key="" description="- ${uiLabelMap.CommonAny} -"/>
+ <option key="" description="- ${uiLabelMap.CommonSelectAny} -"/>
<entity-options entity-name="StatusItem" description="${description}" key-field-name="statusId">
<entity-constraint name="statusTypeId" operator="equals" value="ORDER_STATUS"/>
</entity-options>
More information about the Svn
mailing list