You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by bu...@apache.org on 2009/11/19 01:10:52 UTC
svn commit: r882011 - in /ofbiz/trunk:
applications/order/config/OrderUiLabels.xml
applications/order/webapp/ordermgr/order/findOrders.ftl
framework/common/config/CommonUiLabels.xml
Author: buscob
Date: Thu Nov 19 00:10:52 2009
New Revision: 882011
URL: http://svn.apache.org/viewvc?rev=882011&view=rev
Log:
Moved some application labels out of the framework (more to come)
Modified:
ofbiz/trunk/applications/order/config/OrderUiLabels.xml
ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl
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=882011&r1=882010&r2=882011&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/config/OrderUiLabels.xml (original)
+++ ofbiz/trunk/applications/order/config/OrderUiLabels.xml Thu Nov 19 00:10:52 2009
@@ -1463,6 +1463,38 @@
<value xml:lang="th">à¹à¸¡à¹à¸£à¸°à¸à¸¸</value>
<value xml:lang="zh">å¿å</value>
</property>
+ <property key="OrderAnyOrderStatus">
+ <value xml:lang="ar">ÙÙ Ùضع ÙÙØ·ÙبÙات</value>
+ <value xml:lang="de">Beliebiger Auftragsstatus</value>
+ <value xml:lang="en">Any Order Status</value>
+ <value xml:lang="es">Cualquier estado de orden</value>
+ <value xml:lang="fr">Tous statuts</value>
+ <value xml:lang="hi_IN">à¤à¥à¤à¤à¥ à¤à¤¦à¥à¤¶ सà¥à¤¥à¤¿à¤¤à¤¿</value>
+ <value xml:lang="it">Qualsiasi stato ordine</value>
+ <value xml:lang="nl">Elke bestellingstatus</value>
+ <value xml:lang="pt">Qualquer Estado de Encomenda</value>
+ <value xml:lang="ro">Orice Stadiu Comanda</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="OrderAnyOrderType">
+ <value xml:lang="ar">Ø£Ù ÙÙع ÙÙØ·ÙبÙات</value>
+ <value xml:lang="de">Beliebiger Auftragstyp</value>
+ <value xml:lang="en">Any Order Type</value>
+ <value xml:lang="es">Cualquier tipo de orden</value>
+ <value xml:lang="fr">Tous types</value>
+ <value xml:lang="hi_IN">à¤à¥à¤à¤à¥ à¤à¤¦à¥à¤¶ à¤à¥ पà¥à¤°à¤à¤¾à¤°</value>
+ <value xml:lang="it">Qualsiasi tipo ordine</value>
+ <value xml:lang="nl">Elk bestellingstype</value>
+ <value xml:lang="pt">Qualquer Tipo de Encomenda</value>
+ <value xml:lang="ro">Orice Tip de Comanda</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="OrderApproveOrder">
<value xml:lang="de">Auftrag bestätigen</value>
<value xml:lang="en">Approve Order</value>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl?rev=882011&r1=882010&r2=882011&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl Thu Nov 19 00:10:52 2009
@@ -221,7 +221,7 @@
<option value="${currentType.orderTypeId}">${currentType.get("description", locale)}</option>
<option value="${currentType.orderTypeId}">---</option>
</#if>
- <option value="">${uiLabelMap.CommonAnyOrderType}</option>
+ <option value="">${uiLabelMap.OrderAnyOrderType}</option>
<#list orderTypes as orderType>
<option value="${orderType.orderTypeId}">${orderType.get("description", locale)}</option>
</#list>
@@ -295,7 +295,7 @@
<option value="${currentStatus.statusId}">${currentStatus.get("description", locale)}</option>
<option value="${currentStatus.statusId}">---</option>
</#if>
- <option value="">${uiLabelMap.CommonAnyOrderStatus}</option>
+ <option value="">${uiLabelMap.OrderAnyOrderStatus}</option>
<#list orderStatuses as orderStatus>
<option value="${orderStatus.statusId}">${orderStatus.get("description", locale)}</option>
</#list>
Modified: ofbiz/trunk/framework/common/config/CommonUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonUiLabels.xml?rev=882011&r1=882010&r2=882011&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/trunk/framework/common/config/CommonUiLabels.xml Thu Nov 19 00:10:52 2009
@@ -498,38 +498,6 @@
<value xml:lang="zh">ä»»ä½</value>
<value xml:lang="zh_CN">ä»»ä½</value>
</property>
- <property key="CommonAnyOrderStatus">
- <value xml:lang="ar">ÙÙ Ùضع ÙÙØ·ÙبÙات</value>
- <value xml:lang="de">Beliebiger Auftragsstatus</value>
- <value xml:lang="en">Any Order Status</value>
- <value xml:lang="es">Cualquier estado de orden</value>
- <value xml:lang="fr">Tous statuts</value>
- <value xml:lang="hi_IN">à¤à¥à¤à¤à¥ à¤à¤¦à¥à¤¶ सà¥à¤¥à¤¿à¤¤à¤¿</value>
- <value xml:lang="it">Qualsiasi stato ordine</value>
- <value xml:lang="nl">Elke bestellingstatus</value>
- <value xml:lang="pt">Qualquer Estado de Encomenda</value>
- <value xml:lang="ro">Orice Stadiu Comanda</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="CommonAnyOrderType">
- <value xml:lang="ar">Ø£Ù ÙÙع ÙÙØ·ÙبÙات</value>
- <value xml:lang="de">Beliebiger Auftragstyp</value>
- <value xml:lang="en">Any Order Type</value>
- <value xml:lang="es">Cualquier tipo de orden</value>
- <value xml:lang="fr">Tous types</value>
- <value xml:lang="hi_IN">à¤à¥à¤à¤à¥ à¤à¤¦à¥à¤¶ à¤à¥ पà¥à¤°à¤à¤¾à¤°</value>
- <value xml:lang="it">Qualsiasi tipo ordine</value>
- <value xml:lang="nl">Elk bestellingstype</value>
- <value xml:lang="pt">Qualquer Tipo de Encomenda</value>
- <value xml:lang="ro">Orice Tip de Comanda</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="CommonAnyReturnStatus">
<value xml:lang="ar">Ø£Ù Ùضع ÙÙرجÙع</value>
<value xml:lang="de">Beliebiger Retourenstatus</value>