OFBiz › OFBiz - Commits

svn commit: r812478 - in /ofbiz/trunk: applications/order/config/ applications/order/webapp/ordermgr/order/ applications/party/widget/partymgr/ applications/product/config/ applications/product/webapp/catalog/product/ applications/product/webapp/catalo...

‹ Previous Topic Next Topic ›
 
classic Classic list List threaded Threaded
♦
♦
 1 message Options
jleroux@apache.org
Reply | Threaded
Open this post in threaded view
♦
♦
|

svn commit: r812478 - in /ofbiz/trunk: applications/order/config/ applications/order/webapp/ordermgr/order/ applications/party/widget/partymgr/ applications/product/config/ applications/product/webapp/catalog/product/ applications/product/webapp/catalo...

jleroux@apache.org
Author: jleroux
Date: Tue Sep  8 12:17:50 2009
New Revision: 812478

URL: http://svn.apache.org/viewvc?rev=812478&view=rev
Log:
From a patch done by Erwan at https://issues.apache.org/jira/browse/OFBIZ-2906 - OFBIZ-2906 : "Replacement of ProductCreatedBy with CommonCreatedBy"
I had to remove a conflict in ProductUiLabels.xml and also removed OrderCreatedBy but kept the German translation from OrderCreatedBy and ProductCreatedBy instead of CommonCreatedBy because it seemed more widely used. Please German speaking people check...
I don't backport as suggested Erwan as it's really not a bug!

Modified:
    ofbiz/trunk/applications/order/config/OrderUiLabels.xml
    ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl
    ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml
    ofbiz/trunk/applications/product/config/ProductUiLabels.xml
    ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml
    ofbiz/trunk/applications/product/webapp/catalog/promo/PromoForms.xml
    ofbiz/trunk/framework/common/config/CommonUiLabels.xml
    ofbiz/trunk/specialpurpose/assetmaint/widget/forms/ProductForms.xml

Modified: ofbiz/trunk/applications/order/config/OrderUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderUiLabels.xml?rev=812478&r1=812477&r2=812478&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/config/OrderUiLabels.xml (original)
+++ ofbiz/trunk/applications/order/config/OrderUiLabels.xml Tue Sep  8 12:17:50 2009
@@ -2353,19 +2353,6 @@
         <value xml:lang="th">สร้างที่อยู่การส่งสินค้าใหม่</value>
         <value xml:lang="zh">新建送货地址</value>
     </property>
-    <property key="OrderCreatedBy">
-        <value xml:lang="de">Erstellt von</value>
-        <value xml:lang="en">Created by</value>
-        <value xml:lang="es">Creado por</value>
-        <value xml:lang="fr">Créé par</value>
-        <value xml:lang="it">Creato da</value>
-        <value xml:lang="nl">Aangemaakt door</value>
-        <value xml:lang="ro">Creat de la</value>
-        <value xml:lang="ru">Создан</value>
-        <value xml:lang="th">สร้างโดย</value>
-        <value xml:lang="zh">创建者</value>
-        <value xml:lang="zh_CN">创建人</value>
-    </property>
     <property key="OrderCubicMeasurement">
         <value xml:lang="de">Volumenmessung</value>
         <value xml:lang="en">Cubic Measurement</value>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl?rev=812478&r1=812477&r2=812478&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl Tue Sep  8 12:17:50 2009
@@ -177,7 +177,7 @@
             </tr>
             <tr><td colspan="3"><hr/></td></tr>
             <tr>
-              <td align="right" valign="top" width="15%" class="label">&nbsp;${uiLabelMap.OrderCreatedBy}</td>
+              <td align="right" valign="top" width="15%" class="label">&nbsp;${uiLabelMap.CommonCreatedBy}</td>
               <td width="5%">&nbsp;</td>
               <td valign="top" width="80%">
                   <#if orderHeader.createdBy?has_content>

Modified: ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml?rev=812478&r1=812477&r2=812478&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml Tue Sep  8 12:17:50 2009
@@ -929,7 +929,7 @@
         <field name="orderTypeId" title="${uiLabelMap.OrderOrderType}">
             <display-entity entity-name="OrderType" key-field-name="orderTypeId" description="${description}"/>
         </field>
-        <field name="createdBy" title="${uiLabelMap.OrderCreatedBy}">
+        <field name="createdBy" title="${uiLabelMap.CommonCreatedBy}">
             <display description="${orderHeader.createdBy}"/>
         </field>
         <field name="deleteButton" title="${uiLabelMap.CommonDelete}" widget-style="smallSubmit"><submit/></field>

Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.xml?rev=812478&r1=812477&r2=812478&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Tue Sep  8 12:17:50 2009
@@ -9430,17 +9430,6 @@
         <value xml:lang="th">สร้างสินค้าโดยทั้งหมด</value>
         <value xml:lang="zh">创建虚拟产品</value>
     </property>
-    <property key="ProductCreatedBy">
-        <value xml:lang="de">Erstellt von</value>
-        <value xml:lang="en">Created By</value>
-        <value xml:lang="es">Creador por</value>
-        <value xml:lang="fr">Créé par</value>
-        <value xml:lang="it">Creato Da</value>
-        <value xml:lang="ro">Creat De la </value>
-        <value xml:lang="ru">Создан</value>
-        <value xml:lang="th">สร้างโดย</value>
-        <value xml:lang="zh">创建者</value>
-    </property>
     <property key="ProductCreatedByUserLogin">
         <value xml:lang="de">Erstellt von Benutzeranmeldung</value>
         <value xml:lang="en">Created By User Login</value>

Modified: ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml?rev=812478&r1=812477&r2=812478&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml Tue Sep  8 12:17:50 2009
@@ -212,7 +212,7 @@
         <field use-when="product!=null" position="1" name="lastUpdatedByText" title="${uiLabelMap.ProductLastModifiedBy}:">
             <display description="[${product.lastModifiedByUserLogin}] ${uiLabelMap.CommonOn} ${product.lastModifiedDate}" also-hidden="false"/>
         </field>
-        <field use-when="product!=null" position="2" name="createdByText" title="${uiLabelMap.ProductCreatedBy}:">
+        <field use-when="product!=null" position="2" name="createdByText" title="${uiLabelMap.CommonCreatedBy}:">
             <display description="[${product.createdByUserLogin}] ${uiLabelMap.CommonOn} ${product.createdDate}" also-hidden="false"/>
         </field>
         <sort-order>

Modified: ofbiz/trunk/applications/product/webapp/catalog/promo/PromoForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/promo/PromoForms.xml?rev=812478&r1=812477&r2=812478&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/promo/PromoForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/promo/PromoForms.xml Tue Sep  8 12:17:50 2009
@@ -97,7 +97,7 @@
         <field use-when="productPromoCode!=null" name="lastUpdatedByText" title="${uiLabelMap.ProductLastModifiedBy}:">
             <display description="[${productPromoCode.lastModifiedByUserLogin}] ${uiLabelMap.CommonOn} ${productPromoCode.lastModifiedDate}" also-hidden="false"/>
         </field>
-        <field use-when="productPromoCode!=null" name="createdByText" title="${uiLabelMap.ProductCreatedBy}:">
+        <field use-when="productPromoCode!=null" name="createdByText" title="${uiLabelMap.CommonCreatedBy}:">
             <display description="[${productPromoCode.createdByUserLogin}] ${uiLabelMap.CommonOn} ${productPromoCode.createdDate}" also-hidden="false"/>
         </field>
     </form>

Modified: ofbiz/trunk/framework/common/config/CommonUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonUiLabels.xml?rev=812478&r1=812477&r2=812478&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/trunk/framework/common/config/CommonUiLabels.xml Tue Sep  8 12:17:50 2009
@@ -1664,7 +1664,7 @@
         <value xml:lang="zh_CN">已创建</value>
     </property>
     <property key="CommonCreatedBy">
-        <value xml:lang="de">Angelegt von</value>
+        <value xml:lang="de">Erstellt von</value>
         <value xml:lang="en">Created By</value>
         <value xml:lang="es">Creado por</value>
         <value xml:lang="fr">Créé par</value>

Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/forms/ProductForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/forms/ProductForms.xml?rev=812478&r1=812477&r2=812478&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/forms/ProductForms.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/forms/ProductForms.xml Tue Sep  8 12:17:50 2009
@@ -52,7 +52,7 @@
         <field use-when="product!=null" name="lastUpdatedByText" title="${uiLabelMap.ProductLastModifiedBy}:">
             <display description="[${product.lastModifiedByUserLogin}] ${uiLabelMap.CommonOn} ${product.lastModifiedDate}" also-hidden="false"/>
         </field>
-        <field use-when="product!=null" name="createdByText" title="${uiLabelMap.ProductCreatedBy}:">
+        <field use-when="product!=null" name="createdByText" title="${uiLabelMap.CommonCreatedBy}:">
             <display description="[${product.createdByUserLogin}] ${uiLabelMap.CommonOn} ${product.createdDate}" also-hidden="false"/>
         </field>
     </form>


Free forum by Nabble Edit this page