svn commit: r882731 - in /ofbiz/trunk: applications/order/config/ applications/order/webapp/ordermgr/entry/ applications/product/config/ applications/product/widget/catalog/ framework/common/config/

Fri, 20 Nov 2009 13:51:04 -0800 

Author: buscob
Date: Fri Nov 20 21:50:31 2009
New Revision: 882731

URL: http://svn.apache.org/viewvc?rev=882731&view=rev
Log:
Moved some application labels out of the framework

Modified:
    ofbiz/trunk/applications/order/config/OrderUiLabels.xml
    ofbiz/trunk/applications/order/webapp/ordermgr/entry/custsettings.ftl
    ofbiz/trunk/applications/order/webapp/ordermgr/entry/editShipAddress.ftl
    ofbiz/trunk/applications/product/config/ProductUiLabels.xml
    ofbiz/trunk/applications/product/widget/catalog/ProductStoreForms.xml
    ofbiz/trunk/framework/common/config/CommonUiLabels.xml

Modified: ofbiz/trunk/applications/order/config/OrderUiLabels.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderUiLabels.xml?rev=882731&r1=882730&r2=882731&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/config/OrderUiLabels.xml (original)
+++ ofbiz/trunk/applications/order/config/OrderUiLabels.xml Fri Nov 20 21:50:31 
2009
@@ -1384,6 +1384,22 @@
         <value 
xml:lang="th">ตัวแทนจำหน่ายรายการสั่งซื้อสินค้าสินค้า</value>
         <value xml:lang="zh">订单代理人</value>
     </property>
+    <property key="OrderAllowSolicitation">
+        <value xml:lang="ar">السماح بالإستدعاءات</value>
+        <value xml:lang="de">(Erlaubt Werbung?)</value>
+        <value xml:lang="en">(allow solicitation?)</value>
+        <value xml:lang="es">(¿Permitir solicitud?)</value>
+        <value xml:lang="fr">Accepte les sollicitations</value>
+        <value xml:lang="hi_IN">(क्या याचना कर 
सकते हैं ?)</value>
+        <value xml:lang="it">(permetti sollecito?)</value>
+        <value xml:lang="nl">(stuur verkoopinfo?)</value>
+        <value xml:lang="pt">(permitir solicitação?)</value>
+        <value xml:lang="ro">(permiti solecitare?)</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="OrderAllowSplit">
         <value xml:lang="cs">Povolení rozdělit</value>
         <value xml:lang="de">Aufteilung gestatten</value>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/custsettings.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/custsettings.ftl?rev=882731&r1=882730&r2=882731&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/custsettings.ftl 
(original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/custsettings.ftl Fri 
Nov 20 21:50:31 2009
@@ -65,7 +65,7 @@
                 <td colspan="3">&nbsp;</td>
               </tr>
               <tr>
-                <td width="26%" 
align="right"><div>${uiLabelMap.PartyHomePhone}<BR>${uiLabelMap.CommonAllowSolicitation}</div></td>
+                <td width="26%" 
align="right"><div>${uiLabelMap.PartyHomePhone}<BR>${uiLabelMap.OrderAllowSolicitation}</div></td>
                 <td width="5">&nbsp;</td>
                 <td width="74%">
                   <input type="text" name="homeCountryCode" 
value="${requestParameters.homeCountryCode?if_exists}" size="4" maxlength="10"/>
@@ -83,7 +83,7 @@
                 </td>
               </tr>
               <tr>
-                <td width="26%" 
align="right"><div>${uiLabelMap.PartyBusinessPhone}<BR>${uiLabelMap.CommonAllowSolicitation}</div></td>
+                <td width="26%" 
align="right"><div>${uiLabelMap.PartyBusinessPhone}<BR>${uiLabelMap.OrderAllowSolicitation}</div></td>
                 <td width="5">&nbsp;</td>
                 <td width="74%">
                   <input type="text" name="workCountryCode" 
value="${requestParameters.CUSTOMER_WORK_COUNTRY?if_exists}" size="4" 
maxlength="10"/>
@@ -104,7 +104,7 @@
                 <td colspan="3">&nbsp;</td>
               </tr>
               <tr>
-                <td width="26%" 
align="right"><div>${uiLabelMap.PartyEmailAddress}<BR>${uiLabelMap.CommonAllowSolicitation}</div></td>
+                <td width="26%" 
align="right"><div>${uiLabelMap.PartyEmailAddress}<BR>${uiLabelMap.OrderAllowSolicitation}</div></td>
                 <td width="5">&nbsp;</td>
                 <td width="74%">
                   <input type="text" name="emailAddress" value="" size="60" 
maxlength="255">

Modified: 
ofbiz/trunk/applications/order/webapp/ordermgr/entry/editShipAddress.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/editShipAddress.ftl?rev=882731&r1=882730&r2=882731&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/editShipAddress.ftl 
(original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/editShipAddress.ftl 
Fri Nov 20 21:50:31 2009
@@ -108,7 +108,7 @@
                     *</td>
                   </tr>
                   <tr>
-                    <td width="26%" align="right" 
valign="top"><div>${uiLabelMap.CommonAllowSolicitation}</div></td>
+                    <td width="26%" align="right" 
valign="top"><div>${uiLabelMap.OrderAllowSolicitation}</div></td>
                     <td width="5">&nbsp;</td>
                     <td width="74%">
                       <select name="allowSolicitation">

Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.xml?rev=882731&r1=882730&r2=882731&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Fri Nov 20 
21:50:31 2009
@@ -15135,6 +15135,13 @@
         <value 
xml:lang="th">หน่วยขนาดมากกว่า</value>
         <value xml:lang="zh">超大单位</value>
     </property>
+    <property key="ProductOrdersStatus">
+        <value xml:lang="en">Orders Status</value>
+        <value xml:lang="fr">Statuts des commandes</value>
+        <value xml:lang="hi_IN">आदेशो की 
स्थिति</value>
+        <value xml:lang="it">Stati ordini</value>
+        <value xml:lang="zh">订单状态</value>
+    </property>
     <property key="ProductPackItem">
         <value xml:lang="de">Position verpacken</value>
         <value xml:lang="en">Pack Item</value>

Modified: ofbiz/trunk/applications/product/widget/catalog/ProductStoreForms.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ProductStoreForms.xml?rev=882731&r1=882730&r2=882731&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/ProductStoreForms.xml 
(original)
+++ ofbiz/trunk/applications/product/widget/catalog/ProductStoreForms.xml Fri 
Nov 20 21:50:31 2009
@@ -364,7 +364,7 @@
                 <sort-field name="defaultLocaleString"/>
                 <sort-field name="defaultCurrencyUomId"/>
             </field-group>
-            <field-group title="${uiLabelMap.CommonOrdersStatus}" 
collapsible="true" initially-collapsed="true">
+            <field-group title="${uiLabelMap.ProductOrdersStatus}" 
collapsible="true" initially-collapsed="true">
                 <sort-field name="headerApprovedStatus"/>
                 <sort-field name="itemApprovedStatus"/>
                 <sort-field name="digitalItemApprovedStatus"/>

Modified: ofbiz/trunk/framework/common/config/CommonUiLabels.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonUiLabels.xml?rev=882731&r1=882730&r2=882731&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/trunk/framework/common/config/CommonUiLabels.xml Fri Nov 20 21:50:31 
2009
@@ -420,22 +420,6 @@
         <value xml:lang="zh">全部周</value>
         <value xml:lang="zh_CN">所有星期</value>
     </property>
-    <property key="CommonAllowSolicitation">
-        <value xml:lang="ar">السماح بالإستدعاءات</value>
-        <value xml:lang="de">(Erlaubt Werbung?)</value>
-        <value xml:lang="en">(allow solicitation?)</value>
-        <value xml:lang="es">(¿Permitir solicitud?)</value>
-        <value xml:lang="fr">Accepte les sollicitations</value>
-        <value xml:lang="hi_IN">(क्या याचना कर 
सकते हैं ?)</value>
-        <value xml:lang="it">(permetti sollecito?)</value>
-        <value xml:lang="nl">(stuur verkoopinfo?)</value>
-        <value xml:lang="pt">(permitir solicitação?)</value>
-        <value xml:lang="ro">(permiti solecitare?)</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="CommonAlwaysInclude">
         <value xml:lang="de">Immer berücksichtigen</value>
         <value xml:lang="en">Always Include</value>
@@ -5008,13 +4992,6 @@
         <value xml:lang="zh">订单</value>
         <value xml:lang="zh_CN">订单</value>
     </property>
-    <property key="CommonOrdersStatus">
-        <value xml:lang="en">Orders Status</value>
-        <value xml:lang="fr">Statuts des commandes</value>
-        <value xml:lang="hi_IN">आदेशो की 
स्थिति</value>
-        <value xml:lang="it">Stati ordini</value>
-        <value xml:lang="zh">订单状态</value>
-    </property>
     <property key="CommonOther">
         <value xml:lang="ar">أخرى</value>
         <value xml:lang="de">Andere</value>

Reply via email to