You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2008/05/22 11:02:29 UTC
svn commit: r659052 [1/3] - in /ofbiz/trunk: applications/ecommerce/config/
applications/ecommerce/webapp/ecommerce/order/
applications/ecommerce/webapp/ecommerce/quote/
applications/ecommerce/webapp/ecommerce/request/ applications/order/config/
applic...
Author: jleroux
Date: Thu May 22 02:02:28 2008
New Revision: 659052
URL: http://svn.apache.org/viewvc?rev=659052&view=rev
Log:
Use (new) ${uiLabelMap.CommonNbr} instead of # and ${uiLabelMap.OrderNbr}. Suppressed EcommerceNbr was not used
More and better French labels in Order (work in progress...)
Some sparse labels fix in Product
Modified:
ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderheader.ftl
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderhistory.ftl
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/quickAnonOrderHeader.ftl
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/requestreturn.ftl
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/quote/QuoteList.ftl
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/request/RequestList.ftl
ofbiz/trunk/applications/order/config/OrderUiLabels.xml
ofbiz/trunk/applications/order/webapp/ordermgr/entry/SetItemShipGroups.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/optionsettings.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/shipsettings.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
ofbiz/trunk/applications/product/config/ProductUiLabels.xml
ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl
ofbiz/trunk/framework/common/config/CommonUiLabels.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml
Modified: ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml?rev=659052&r1=659051&r2=659052&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml (original)
+++ ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml Thu May 22 02:02:28 2008
@@ -2175,18 +2175,6 @@
<value xml:lang="th">à¹à¸à¸·à¸à¸</value>
<value xml:lang="zh">æ</value>
</property>
- <property key="EcommerceNbr">
- <value xml:lang="en">Nbr</value>
- <value xml:lang="es">#</value>
- <value xml:lang="fr">Nb</value>
- <value xml:lang="it">#</value>
- <value xml:lang="ja">#</value>
- <value xml:lang="nl">#</value>
- <value xml:lang="ro">#</value>
- <value xml:lang="ru">â</value>
- <value xml:lang="th">à¸à¸³à¸à¸§à¸</value>
- <value xml:lang="zh">#</value>
- </property>
<property key="EcommerceNbrOfDays">
<value xml:lang="en">Nbr Of Days</value>
<value xml:lang="es">Número de dÃas</value>
Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderheader.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderheader.ftl?rev=659052&r1=659051&r2=659052&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderheader.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderheader.ftl Thu May 22 02:02:28 2008
@@ -39,7 +39,7 @@
<div class="boxhead">
${uiLabelMap.OrderOrder}
<#if orderHeader?has_content>
- ${uiLabelMap.OrderNbr}<a href="<@o...@ofbizUrl>" class="lightbuttontext">${orderHeader.orderId}</a>
+ ${uiLabelMap.CommonNbr}<a href="<@o...@ofbizUrl>" class="lightbuttontext">${orderHeader.orderId}</a>
</#if>
${uiLabelMap.CommonInformation}
<#if (orderHeader.orderId)?exists>
Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderhistory.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderhistory.ftl?rev=659052&r1=659051&r2=659052&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderhistory.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderhistory.ftl Thu May 22 02:02:28 2008
@@ -34,7 +34,7 @@
</td>
<td width="10"> </td>
<td width="15%">
- <div class="tabletext"><b><span style="white-space: nowrap;">${uiLabelMap.OrderOrder} ${uiLabelMap.OrderNbr}</span></b></div>
+ <div class="tabletext"><b><span style="white-space: nowrap;">${uiLabelMap.OrderOrder} ${uiLabelMap.CommonNbr}</span></b></div>
</td>
<td width="10"> </td>
<td width="15%">
@@ -103,7 +103,7 @@
</td>
<td width="10"> </td>
<td width="15%">
- <div class="tabletext"><b><span style="white-space: nowrap;">${uiLabelMap.OrderOrder} ${uiLabelMap.OrderNbr}</span></b></div>
+ <div class="tabletext"><b><span style="white-space: nowrap;">${uiLabelMap.OrderOrder} ${uiLabelMap.CommonNbr}</span></b></div>
</td>
<td width="10"> </td>
<td width="15%">
@@ -116,7 +116,7 @@
<td width="10"> </td>
<td width="15%"><b></b></td>
</tr>
- <#if porderHeaderList?has_content>
+ <#if porderHeaderList?has_content>
<#list porderHeaderList as porderHeader>
<#assign pstatus = porderHeader.getRelatedOneCache("StatusItem")>
<tr><td colspan="9"><hr class="sepbar"/></td></tr>
@@ -142,7 +142,7 @@
</td>
</tr>
</#list>
- </#if>
+ </#if>
<#if !porderHeaderList?has_content>
<tr><td colspan="9"><h3>${uiLabelMap.OrderNoOrderFound}</h3></td></tr>
</#if>
@@ -157,7 +157,7 @@
<table width="100%" cellpadding="1" cellspacing="0" border="0">
<tr>
<td width="10%">
- <div class="tabletext"><b><span style="white-space: nowrap;">${uiLabelMap.OrderOrder} ${uiLabelMap.OrderNbr}</span></b></div>
+ <div class="tabletext"><b><span style="white-space: nowrap;">${uiLabelMap.OrderOrder} ${uiLabelMap.CommonNbr}</span></b></div>
</td>
<td width="10"> </td>
<td width="20%">
Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/quickAnonOrderHeader.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/quickAnonOrderHeader.ftl?rev=659052&r1=659051&r2=659052&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/quickAnonOrderHeader.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/quickAnonOrderHeader.ftl Thu May 22 02:02:28 2008
@@ -33,7 +33,7 @@
<a href="<@o...@ofbizUrl>" class="submenutextright">${uiLabelMap.OrderRequestReturn}</a>
</#if>
</div>
- <div class="boxhead"> ${uiLabelMap.OrderOrder} <#if orderHeader?has_content>${uiLabelMap.OrderNbr}<a href="<@o...@ofbizUrl>" class="lightbuttontext">${orderHeader.orderId}</a> </#if>${uiLabelMap.CommonInformation}</div>
+ <div class="boxhead"> ${uiLabelMap.OrderOrder} <#if orderHeader?has_content>${uiLabelMap.CommonNbr}<a href="<@o...@ofbizUrl>" class="lightbuttontext">${orderHeader.orderId}</a> </#if>${uiLabelMap.CommonInformation}</div>
</div>
<div class="screenlet-body">
<table width="100%" border="0" cellpadding="1">
Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/requestreturn.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/requestreturn.ftl?rev=659052&r1=659051&r2=659052&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/requestreturn.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/requestreturn.ftl Thu May 22 02:02:28 2008
@@ -39,7 +39,7 @@
</#if>
<table border="0" width="100%" cellpadding="2" cellspacing="0">
<tr>
- <td colspan="5"><h3>${uiLabelMap.OrderReturnItemsFromOrder} ${uiLabelMap.OrderNbr}<a href="<@o...@ofbizUrl>" class="buttontext">${orderId}</h3></td>
+ <td colspan="5"><h3>${uiLabelMap.OrderReturnItemsFromOrder} ${uiLabelMap.CommonNbr}<a href="<@o...@ofbizUrl>" class="buttontext">${orderId}</h3></td>
<td align="right">
<span class="tableheadtext">${uiLabelMap.CommonSelectAll}</span>
<input type="checkbox" name="selectAll" value="Y" onclick="javascript:toggleAll(this, 'selectAllForm');"/>
@@ -149,7 +149,7 @@
</td>
</tr>
<#else>
- <tr><td colspan="6"><div class="tabletext">${uiLabelMap.OrderNoReturnableItems} ${uiLabelMap.OrderNbr}${orderId}</div></td></tr>
+ <tr><td colspan="6"><div class="tabletext">${uiLabelMap.OrderNoReturnableItems} ${uiLabelMap.CommonNbr}${orderId}</div></td></tr>
</#if>
</table>
</form>
Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/quote/QuoteList.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/quote/QuoteList.ftl?rev=659052&r1=659051&r2=659052&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/quote/QuoteList.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/quote/QuoteList.ftl Thu May 22 02:02:28 2008
@@ -25,7 +25,7 @@
<table width="100%" cellpadding="1" cellspacing="0" border="0">
<tr>
<td width="10%">
- <div class="tabletext"><b><span style="white-space: nowrap;">${uiLabelMap.OrderQuote} ${uiLabelMap.OrderNbr}</span></b></div>
+ <div class="tabletext"><b><span style="white-space: nowrap;">${uiLabelMap.OrderQuote} ${uiLabelMap.CommonNbr}</span></b></div>
</td>
<td width="10"> </td>
<td width="20%">
Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/request/RequestList.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/request/RequestList.ftl?rev=659052&r1=659051&r2=659052&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/request/RequestList.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/request/RequestList.ftl Thu May 22 02:02:28 2008
@@ -25,7 +25,7 @@
<table width="100%" cellpadding="1" cellspacing="0" border="0">
<tr>
<td width="10%">
- <div class="tabletext"><b><span style="white-space: nowrap;">${uiLabelMap.OrderRequest} ${uiLabelMap.OrderNbr}</span></b></div>
+ <div class="tabletext"><b><span style="white-space: nowrap;">${uiLabelMap.OrderRequest} ${uiLabelMap.CommonNbr}</span></b></div>
</td>
<td width="10"> </td>
<td width="10%">