OFBiz › OFBiz - Commits

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

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

buscob

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

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"> </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"> </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"> </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"> </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"> </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"> </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>