svn commit: r729687 [2/4] - in /ofbiz/trunk/applications: ecommerce/config/ ecommerce/webapp/ecommerce/catalog/ ecommerce/widget/ order/config/ order/script/org/ofbiz/order/shoppinglist/ order/webapp/ordermgr/entry/catalog/ order/widget/ordermgr/ produ...

[mrisaliti]

Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml?rev=729687&r1=729686&r2=729687&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml Sat Dec 27 14:14:30 2008
@@ -120,7 +120,7 @@
         <entity-one entity-name="ShoppingList" value-name="shoppingList"/>
         <entity-one entity-name="Product" value-name="product"/>
         <if-empty field="product">
-            <add-error> <fail-property property="ProductErrorProductNotFound" resource="OrderUiLabels"/> </add-error>
+            <add-error> <fail-property property="ProductErrorProductNotFound" resource="ProductUiLabels"/> </add-error>
             <check-errors/>
         </if-empty>
         <make-value value-name="newEntity" entity-name="ShoppingListItem"/>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/advancedsearch.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/advancedsearch.ftl?rev=729687&r1=729686&r2=729687&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/advancedsearch.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/advancedsearch.ftl Sat Dec 27 14:14:30 2008
@@ -18,7 +18,7 @@
 -->
 <#assign searchOptionsHistoryList = Static["org.ofbiz.product.product.ProductSearchSession"].getSearchOptionsHistoryList(session)>
 <#assign currentCatalogId = Static["org.ofbiz.product.catalog.CatalogWorker"].getCurrentCatalogId(request)>
-<h1>${uiLabelMap.ProductAdvancedSearchinCategory}</h1>
+<h1>${uiLabelMap.ProductAdvancedSearchInCategory}</h1>
 <br/>
 <form name="advtokeywordsearchform" method="post" action="<@ofbizUrl>keywordsearch</@ofbizUrl>" style="margin: 0;">
   <input type="hidden" name="VIEW_SIZE" value="10">
@@ -32,7 +32,7 @@
           </td>
           <td valign="middle">
             <div>
-              <b>"${(searchCategory.description)?if_exists}"</b>${uiLabelMap.ProductIncludeSubcategories}
+              <b>"${(searchCategory.description)?if_exists}"</b>${uiLabelMap.ProductIncludeSubCategories}
               ${uiLabelMap.CommonYes}<input type="radio" name="SEARCH_SUB_CATEGORIES" value="Y" checked>
               ${uiLabelMap.CommonNo}<input type="radio" name="SEARCH_SUB_CATEGORIES" value="N">
             </div>
@@ -93,7 +93,7 @@
       <td valign="middle">
         <div>
           <select name="sortOrder">
-            <option value="SortKeywordRelevancy">${uiLabelMap.ProductKeywordRelevency}</option>
+            <option value="SortKeywordRelevancy">${uiLabelMap.ProductKeywordRelevancy}</option>
             <option value="SortProductField:productName">${uiLabelMap.ProductProductName}</option>
             <option value="SortProductField:internalName">${uiLabelMap.ProductInternalName}</option>
             <option value="SortProductField:totalQuantityOrdered">${uiLabelMap.ProductPopularityByOrders}</option>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/category.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/category.ftl?rev=729687&r1=729686&r2=729687&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/category.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/category.ftl Sat Dec 27 14:14:30 2008
@@ -21,7 +21,7 @@
 <#if productCategory?has_content>
   ${pages.get(detailTemplate)}
 <#else>  
-  <center><h2>${uiLabelMap.ProductCategoryNotFoundforCategoryID} ${requestParameters.category_id?if_exists}!</h2></center>
+  <center><h2>${uiLabelMap.ProductCategoryNotFoundForCategoryID} ${requestParameters.category_id?if_exists}!</h2></center>
 </#if>
 
 

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl?rev=729687&r1=729686&r2=729687&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl Sat Dec 27 14:14:30 2008
@@ -64,7 +64,7 @@
       </form>
     </#if>
     <#if searchInCategory?default("Y") == "Y">
-        <a href="<@ofbizUrl>advancedsearch?SEARCH_CATEGORY_ID=${productCategory.productCategoryId}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductSearchinCategory}</a>
+        <a href="<@ofbizUrl>advancedsearch?SEARCH_CATEGORY_ID=${productCategory.productCategoryId}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductSearchInCategory}</a>
     </#if>
     <#assign longDescription = categoryContentWrapper.get("LONG_DESCRIPTION")?if_exists/>
     <#assign categoryImageUrl = categoryContentWrapper.get("CATEGORY_IMAGE_URL")?if_exists/>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl?rev=729687&r1=729686&r2=729687&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl Sat Dec 27 14:14:30 2008
@@ -309,7 +309,7 @@
           <#else>
             <input type='hidden' name="product_id" value='${product.productId}'>
             <input type='hidden' name="add_product_id" value='NULL'>
-            <div class='tabletext'><b>${uiLabelMap.ProductItemOutofStock}.</b></div>
+            <div class='tabletext'><b>${uiLabelMap.ProductItemOutOfStock}.</b></div>
             <#assign inStock = false>
           </#if>
         <#else>
@@ -318,7 +318,7 @@
           <#if productNotAvailable?exists>
             <#assign isStoreInventoryRequired = Static["org.ofbiz.product.store.ProductStoreWorker"].isStoreInventoryRequired(request, product)>
             <#if isStoreInventoryRequired>
-              <div class='tabletext'><b>${uiLabelMap.ProductItemOutofStock}.</b></div>
+              <div class='tabletext'><b>${uiLabelMap.ProductItemOutOfStock}.</b></div>
               <#assign inStock = false>
             <#else>
               <div class='tabletext'><b>${product.inventoryMessage?if_exists}</b></div>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/inlineProductDetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/inlineProductDetail.ftl?rev=729687&r1=729686&r2=729687&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/inlineProductDetail.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/inlineProductDetail.ftl Sat Dec 27 14:14:30 2008
@@ -302,7 +302,7 @@
           <#else>
             <input type="hidden" name="product_id${inlineCounter}" value="${product.productId}"/>
             <input type="hidden" name="add_product_id${inlineCounter}" value="NULL"/>
-            <div><b>${uiLabelMap.ProductItemOutofStock}.</b></div>
+            <div><b>${uiLabelMap.ProductItemOutOfStock}.</b></div>
             <#assign inStock = false>
           </#if>
          </#if>
@@ -313,7 +313,7 @@
           <#assign isStoreInventoryRequired = Static["org.ofbiz.product.store.ProductStoreWorker"].isStoreInventoryRequired(request, product)>
           <#if isStoreInventoryNotAvailable>
             <#if isStoreInventoryRequired>
-              <div><b>${uiLabelMap.ProductItemOutofStock}.</b></div>
+              <div><b>${uiLabelMap.ProductItemOutOfStock}.</b></div>
               <#assign inStock = false>
             <#else>
               <div><b>${product.inventoryMessage?if_exists}</b></div>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl?rev=729687&r1=729686&r2=729687&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl Sat Dec 27 14:14:30 2008
@@ -460,7 +460,7 @@
           <#else>
             <input type="hidden" name="product_id" value="${product.productId}"/>
             <input type="hidden" name="add_product_id" value="NULL"/>
-            <div><b>${uiLabelMap.ProductItemOutofStock}.</b></div>
+            <div><b>${uiLabelMap.ProductItemOutOfStock}.</b></div>
             <#assign inStock = false>
           </#if>
          </#if>
@@ -471,7 +471,7 @@
           <#assign isStoreInventoryRequired = Static["org.ofbiz.product.store.ProductStoreWorker"].isStoreInventoryRequired(request, product)>
           <#if isStoreInventoryNotAvailable>
             <#if isStoreInventoryRequired>
-              <div><b>${uiLabelMap.ProductItemOutofStock}.</b></div>
+              <div><b>${uiLabelMap.ProductItemOutOfStock}.</b></div>
               <#assign inStock = false>
             <#else>
               <div><b>${product.inventoryMessage?if_exists}</b></div>

Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml?rev=729687&r1=729686&r2=729687&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml Sat Dec 27 14:14:30 2008
@@ -108,7 +108,7 @@
                         <include-screen name="${detailScreen}"/>
                     </widgets>
                     <fail-widgets>
-                        <label style="h2">${uiLabelMap.ProductCategoryNotFoundforCategoryID} ${productCategoryId}!</label>
+                        <label style="h2">${uiLabelMap.ProductCategoryNotFoundForCategoryID} ${productCategoryId}!</label>
                     </fail-widgets>
                 </section>
             </widgets>