svn commit: r1228709 - in /ofbiz/trunk/applications/product: config/ProductEntityLabels.xml entitydef/entitymodel.xml

[erwan]

Author: erwan
Date: Sat Jan  7 19:52:26 2012
New Revision: 1228709

URL: http://svn.apache.org/viewvc?rev=1228709&view=rev
Log:
Using entity labels on ProductFeature, first batch on text colors

Modified:
    ofbiz/trunk/applications/product/config/ProductEntityLabels.xml
    ofbiz/trunk/applications/product/entitydef/entitymodel.xml

Modified: ofbiz/trunk/applications/product/config/ProductEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductEntityLabels.xml?rev=1228709&r1=1228708&r2=1228709&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductEntityLabels.xml (original)
+++ ofbiz/trunk/applications/product/config/ProductEntityLabels.xml Sat Jan  7 19:52:26 2012
@@ -1459,6 +1459,34 @@
         <value xml:lang="zh">危险品</value>
         <value xml:lang="zh_TW">危險品</value>
     </property>
+    <property key="ProductFeature.description.TEXT_BLACK">
+        <value xml:lang="en">Black</value>
+        <value xml:lang="fr">Noir</value>
+    </property>
+    <property key="ProductFeature.description.TEXT_BLUE">
+        <value xml:lang="en">Blue</value>
+        <value xml:lang="fr">Bleu</value>
+    </property>
+    <property key="ProductFeature.description.TEXT_GRAY">
+        <value xml:lang="en">Gray</value>
+        <value xml:lang="fr">Gris</value>
+    </property>
+    <property key="ProductFeature.description.TEXT_GREEN">
+        <value xml:lang="en">Green</value>
+        <value xml:lang="fr">Vert</value>
+    </property>
+    <property key="ProductFeature.description.TEXT_RED">
+        <value xml:lang="en">Red</value>
+        <value xml:lang="fr">Rouge</value>
+    </property>
+    <property key="ProductFeature.description.TEXT_YELLOW">
+        <value xml:lang="en">Yellow</value>
+        <value xml:lang="fr">Jaune</value>
+    </property>
+    <property key="ProductFeature.description.TEXT_WHITE">
+        <value xml:lang="en">White</value>
+        <value xml:lang="fr">Blanc</value>
+    </property>
     <property key="ProductFeatureApplType.description.DISTINGUISHING_FEAT">
         <value xml:lang="de">Unterscheidendes Merkmal</value>
         <value xml:lang="en">Distinguishing</value>

Modified: ofbiz/trunk/applications/product/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/entitydef/entitymodel.xml?rev=1228709&r1=1228708&r2=1228709&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/product/entitydef/entitymodel.xml Sat Jan  7 19:52:26 2012
@@ -1485,6 +1485,7 @@ under the License.
 
     <entity entity-name="ProductFeature"
             package-name="org.ofbiz.product.feature"
+            default-resource-name="ProductEntityLabels"
             title="Product Feature Entity">
       <field name="productFeatureId" type="id-ne"></field>
       <field name="productFeatureTypeId" type="id-ne"></field>