svn commit: r788594 - in /ofbiz/trunk/applications/order: config/OrderUiLabels.xml webapp/ordermgr/return/returnList.ftl

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r788594 - in /ofbiz/trunk/applications/order: config/OrderUiLabels.xml webapp/ordermgr/return/returnList.ftl

mor-2
Author: mor
Date: Fri Jun 26 05:55:12 2009
New Revision: 788594

URL: http://svn.apache.org/viewvc?rev=788594&view=rev
Log:
Changed the label from "Create return" to "Create Return", the first letter of second word is now capital. Also removed the duplicate label. The reason for doing this is
to keep consistency among all the labels displayed under Action screenlet on Order Detail Page.
Applied patch from Divesh Dutta, part of OFBIZ-2650 (https://issues.apache.org/jira/browse/OFBIZ-2650).

Note: The translation for locale fr, it and nl was different in both the labels, out of which one label is now removed. I am not sure which one is correct so
contributors from these locales please do take sometime to see which one is correct. Thanks!


Modified:
    ofbiz/trunk/applications/order/config/OrderUiLabels.xml
    ofbiz/trunk/applications/order/webapp/ordermgr/return/returnList.ftl

Modified: ofbiz/trunk/applications/order/config/OrderUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderUiLabels.xml?rev=788594&r1=788593&r2=788594&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/config/OrderUiLabels.xml (original)
+++ ofbiz/trunk/applications/order/config/OrderUiLabels.xml Fri Jun 26 05:55:12 2009
@@ -2264,11 +2264,12 @@
     </property>
     <property key="OrderCreateReturn">
         <value xml:lang="de">Retoure erstellen</value>
-        <value xml:lang="en">Create return</value>
+        <value xml:lang="en">Create Return</value>
         <value xml:lang="es">Crear devolución</value>
         <value xml:lang="fr">Créer un retour</value>
         <value xml:lang="it">Creare reso</value>
         <value xml:lang="nl">Maak een retour</value>
+        <value xml:lang="ro">Creare Returnare</value>
         <value xml:lang="ru">Создать возврат</value>
         <value xml:lang="th">สร้างผลตอบแทน</value>
         <value xml:lang="zh">创建退货</value>
@@ -7581,18 +7582,6 @@
         <value xml:lang="fr">Impossible de trouver un retour avec cette réf.</value>
         <value xml:lang="it">Non è possibile trovare il reso</value>
     </property>
-    <property key="OrderReturnCreate">
-        <value xml:lang="de">Retoure erstellen</value>
-        <value xml:lang="en">Create Return</value>
-        <value xml:lang="es">Crear devolución</value>
-        <value xml:lang="fr">Créer le retour</value>
-        <value xml:lang="it">Creare Reso</value>
-        <value xml:lang="nl">Create Return</value>
-        <value xml:lang="ro">Creare Returnare</value>
-        <value xml:lang="ru">Создать возврат</value>
-        <value xml:lang="th">กลับคืนการสร้าง</value>
-        <value xml:lang="zh">创建退货</value>
-    </property>
     <property key="OrderReturnDestinationFacility">
         <value xml:lang="de">Ziellager</value>
         <value xml:lang="en">Destination Facility</value>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/return/returnList.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/return/returnList.ftl?rev=788594&r1=788593&r2=788594&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/return/returnList.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/return/returnList.ftl Fri Jun 26 05:55:12 2009
@@ -18,7 +18,7 @@
 -->
 
 <h1>${uiLabelMap.OrderReturnsCurrent}</h1>
-<div><a href="<@ofbizUrl>returnMain</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderReturnCreate}</a></div>
+<div><a href="<@ofbizUrl>returnMain</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderCreateReturn}</a></div>
 
 <br/>
 <table cellspacing="0" class="basic-table">