[ofbiz-framework] branch release18.12 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 release18.12
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git


The following commit(s) were added to refs/heads/release18.12 by this push:
     new 0560889  Improved: Hard coded label in ProductUomDropDownOnly (OFBIZ-11891)
0560889 is described below

commit 056088978d8d65dd40606301f0a9953d186e1c26
Author: Jacques Le Roux <[hidden email]>
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 ecf45f3..73f2cfd 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>