svn commit: r690930 - in /ofbiz/trunk/applications/product: entitydef/entitymodel.xml webapp/catalog/feature/EditFeatureCategoryFeatures.ftl

[bibryam]

Author: bibryam
Date: Mon Sep  1 02:52:49 2008
New Revision: 690930

URL: http://svn.apache.org/viewvc?rev=690930&view=rev
Log:
Product feature i18n fix from Rashko Rejmer.

Modified:
    ofbiz/trunk/applications/product/entitydef/entitymodel.xml
    ofbiz/trunk/applications/product/webapp/catalog/feature/EditFeatureCategoryFeatures.ftl

Modified: ofbiz/trunk/applications/product/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/entitydef/entitymodel.xml?rev=690930&r1=690929&r2=690930&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/product/entitydef/entitymodel.xml Mon Sep  1 02:52:49 2008
@@ -1401,6 +1401,7 @@
     </entity>
     <entity entity-name="ProductFeatureCategory"
             package-name="org.ofbiz.product.feature"
+            default-resource-name="ProductEntityLabels"
             title="Product Feature Category Entity">
       <field name="productFeatureCategoryId" type="id-ne"></field>
       <field name="parentCategoryId" type="id"></field>

Modified: ofbiz/trunk/applications/product/webapp/catalog/feature/EditFeatureCategoryFeatures.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/feature/EditFeatureCategoryFeatures.ftl?rev=690930&r1=690929&r2=690930&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/feature/EditFeatureCategoryFeatures.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/feature/EditFeatureCategoryFeatures.ftl Mon Sep  1 02:52:49 2008
@@ -106,7 +106,7 @@
                   <option value='${productFeature.productFeatureCategoryId}'>---</option>
                 </#if>
                 <#list productFeatureCategories as productFeatureCategory>
-                  <option value='${productFeatureCategory.productFeatureCategoryId}'>${productFeatureCategory.description} [${productFeatureCategory.productFeatureCategoryId}]</option>
+                  <option value='${productFeatureCategory.productFeatureCategoryId}'>${productFeatureCategory.get("description",locale)?if_exists} [${productFeatureCategory.productFeatureCategoryId}]</option>
                 </#list>
               </select></td>
               <td><input type="text" size='10' name="uomId_o_${rowCount}" value="${productFeature.uomId?if_exists}"></td>