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 2009/10/23 17:03:40 UTC

svn commit: r829085 - in /ofbiz/trunk/applications/product: config/ProductUiLabels.xml webapp/catalog/category/CategoryForms.xml webapp/catalog/category/EditCategoryContent.ftl

Author: jleroux
Date: Fri Oct 23 15:03:40 2009
New Revision: 829085

URL: http://svn.apache.org/viewvc?rev=829085&view=rev
Log:
Small cleanup in labels for categ content

Modified:
    ofbiz/trunk/applications/product/config/ProductUiLabels.xml
    ofbiz/trunk/applications/product/webapp/catalog/category/CategoryForms.xml
    ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryContent.ftl

Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.xml?rev=829085&r1=829084&r2=829085&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Fri Oct 23 15:03:40 2009
@@ -2820,7 +2820,7 @@
         <value xml:lang="de">Primäre Produktkategorie ID</value>
         <value xml:lang="en">Primary Product Category Id</value>
         <value xml:lang="es">Código Categoría de producto primaria</value>
-        <value xml:lang="fr">Réf. de première catégorie d'article</value>
+        <value xml:lang="fr">Réf. de première catégorie</value>
         <value xml:lang="it">Codice Categoria Primaria Prodotto</value>
         <value xml:lang="ro">Cod Categorie Primara Produs</value>
         <value xml:lang="ru">Код основной категории продуктов</value>
@@ -4790,7 +4790,7 @@
         <value xml:lang="de">Kategorie Produktkataloge bearbeiten</value>
         <value xml:lang="en">Edit Category Product Catalogs</value>
         <value xml:lang="es">Editar Catálogos de Productos de una Categoría</value>
-        <value xml:lang="fr">Modification des liens catégories d'article - catalogue</value>
+        <value xml:lang="fr">Modification des liens catégories - catalogue</value>
         <value xml:lang="it">Aggiorna Categoria Prodotto Cataloghi</value>
         <value xml:lang="ru">Изменить категорию продукта каталогов</value>
         <value xml:lang="th">เพิ่มหมวดหมู่สินค้า</value>
@@ -4800,7 +4800,7 @@
         <value xml:lang="de">Kategorie Produkte bearbeiten</value>
         <value xml:lang="en">Edit Category Products</value>
         <value xml:lang="es">Editar Productos de una Categoría</value>
-        <value xml:lang="fr">Modification des catégories d'article</value>
+        <value xml:lang="fr">Modification des catégories</value>
         <value xml:lang="it">Aggiorna Categoria Prodotti</value>
         <value xml:lang="ro">Actualizeaza Categoria Produs</value>
         <value xml:lang="ru">Изменить категорию продуктов</value>
@@ -8355,6 +8355,10 @@
         <value xml:lang="th">หัวข้อ</value>
         <value xml:lang="zh">内容</value>
     </property>
+    <property key="ProductCategoryDescription">
+        <value xml:lang="en">Category Description</value>
+        <value xml:lang="fr">Description de la catégorie</value>
+    </property>
     <property key="ProductCategoryId">
         <value xml:lang="de">Kategorie ID</value>
         <value xml:lang="en">Category ID</value>
@@ -15905,7 +15909,7 @@
         <value xml:lang="de">Produktkategorie Typ</value>
         <value xml:lang="en">Product Category Type</value>
         <value xml:lang="es">Tipo de Categoría de productos</value>
-        <value xml:lang="fr">Type de catégorie d'article</value>
+        <value xml:lang="fr">Type de catégorie</value>
         <value xml:lang="it">Tipo Categoria Prodotto</value>
         <value xml:lang="ro">Tip Categorie Produs</value>
         <value xml:lang="ru">Тип категории</value>
@@ -15927,7 +15931,7 @@
         <value xml:lang="de">Produkt Inhalttyp ID</value>
         <value xml:lang="en">Product Content Type Id</value>
         <value xml:lang="es">Código de tipo de configuración de producto</value>
-        <value xml:lang="fr">Type de contenu d'article</value>
+        <value xml:lang="fr">Type de contenu</value>
         <value xml:lang="it">Tipo Contenuto Prodotto</value>
         <value xml:lang="ro">Tip Continut Produs</value>
         <value xml:lang="ru">Тип контента</value>
@@ -15949,7 +15953,7 @@
         <value xml:lang="de">Produktbeschreibung</value>
         <value xml:lang="en">Product Description</value>
         <value xml:lang="es">Descripción del producto</value>
-        <value xml:lang="fr">Description article</value>
+        <value xml:lang="fr">Description de l'article</value>
         <value xml:lang="it">Descrizione Prodotto</value>
         <value xml:lang="ro">Descriere Produs</value>
         <value xml:lang="ru">Описание продукта</value>

Modified: ofbiz/trunk/applications/product/webapp/catalog/category/CategoryForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/CategoryForms.xml?rev=829085&r1=829084&r2=829085&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/category/CategoryForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/category/CategoryForms.xml Fri Oct 23 15:03:40 2009
@@ -43,7 +43,7 @@
         header-row-style="header-row" default-table-style="basic-table">
         <auto-fields-entity entity-name="ProductCategoryContent"/>
         <field name="productCategoryId" map-name="productCategory"><hidden/></field>
-        <field name="contentId">
+        <field name="contentId" title="${uiLabelMap.ProductContentId}">
             <lookup target-form-name="LookupContent"/>
         </field>
         <field name="prodCatContentTypeId">

Modified: ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryContent.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryContent.ftl?rev=829085&r1=829084&r2=829085&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryContent.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryContent.ftl Fri Oct 23 15:03:40 2009
@@ -41,7 +41,7 @@
                     <td width="74%"><input type="text" value="${(productCategory.categoryName)?if_exists}" name="categoryName" size="60" maxlength="60"/></td>
                 </tr>
                 <tr>
-                    <td width="26%" align="right" class="label">${uiLabelMap.ProductProductDescription}</td>
+                    <td width="26%" align="right" class="label">${uiLabelMap.ProductCategoryDescription}</td>
                     <td>&nbsp;</td>
                     <td width="74%" colspan="4" valign="top">
                         <textarea name="description" cols="60" rows="2">${(productCategory.description)?if_exists}</textarea>