You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2020/07/16 12:36:46 UTC
[ofbiz-framework] branch trunk updated: Improved: Hard coded label
in ProductUomDropDownOnly (OFBIZ-11891)
This is an automated email from the ASF dual-hosted git repository.
jleroux pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new 7d6e5dd Improved: Hard coded label in ProductUomDropDownOnly (OFBIZ-11891)
7d6e5dd is described below
commit 7d6e5ddbb5fe854b2a201ff74b0d57f7d064b025
Author: Jacques Le Roux <ja...@les7arts.com>
AuthorDate: Thu Jul 16 14:34:22 2020 +0200
Improved: Hard coded label in ProductUomDropDownOnly (OFBIZ-11891)
The select label is not receiving translations.
There are more related issues, but this is independent.
Thanks: Alex Bodnaru
---
applications/order/template/entry/catalog/ProductUomDropDownOnly.ftl | 2 +-
applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/applications/order/template/entry/catalog/ProductUomDropDownOnly.ftl b/applications/order/template/entry/catalog/ProductUomDropDownOnly.ftl
index ba48c61..e0fa658 100644
--- a/applications/order/template/entry/catalog/ProductUomDropDownOnly.ftl
+++ b/applications/order/template/entry/catalog/ProductUomDropDownOnly.ftl
@@ -18,7 +18,7 @@ under the License.
-->
<#if product?? && mainProducts??>
<select name="parentProductId" onchange="javascript:displayProductVirtualVariantId(this.value);">
- <option value="">Select Unit Of Measure</option>
+ <option value="">${uiLabelMap.CommonSelect} ${uiLabelMap.ProductUnitOfMeasure}</option>
<#list mainProducts as mainProduct>
<option value="${mainProduct.productId}">${mainProduct.uomDesc} : ${mainProduct.piecesIncluded}</option>
</#list>
diff --git a/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml b/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml
index f75d73c..fd59224 100644
--- a/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml
+++ b/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml
@@ -289,6 +289,8 @@ under the License.
<screen name="ProductUomDropDownOnly">
<section>
<actions>
+ <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
+ <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
<script location="component://order/groovyScripts/entry/catalog/ProductUomDropDownOnly.groovy"/>
</actions>
<widgets>