You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by mr...@apache.org on 2008/11/06 23:20:02 UTC
svn commit: r711991 - in /ofbiz/trunk/applications: ecommerce/config/
ecommerce/webapp/ecommerce/order/ ecommerce/widget/
order/webapp/ordermgr/order/
Author: mrisaliti
Date: Thu Nov 6 14:19:49 2008
New Revision: 711991
URL: http://svn.apache.org/viewvc?rev=711991&view=rev
Log:
Renamed some labels from OrderXXX to EcommerceXXX in EcommerceUiLabels.xml (Clean up labels between order and ecommerce application OFBIZ-1780)
Modified:
ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/anonymoustrail.ftl
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/ordercomplete.ftl
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/splitship.ftl
ofbiz/trunk/applications/ecommerce/widget/OrderScreens.xml
ofbiz/trunk/applications/order/webapp/ordermgr/order/sendconfirmationemail.ftl
Modified: ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml?rev=711991&r1=711990&r2=711991&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml (original)
+++ ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml Thu Nov 6 14:19:49 2008
@@ -1208,6 +1208,31 @@
<value xml:lang="th">à¸à¹à¸à¸¡à¸¹à¸¥à¸à¸à¸à¸§à¸²à¸¡</value>
<value xml:lang="zh">æç« ä¿¡æ¯</value>
</property>
+ <property key="EcommerceAssignItems">
+ <value xml:lang="en">Assign Items</value>
+ <value xml:lang="es">Asignar Ãtems</value>
+ <value xml:lang="fr">Affecter les articles</value>
+ <value xml:lang="it">Assegna articoli</value>
+ <value xml:lang="ja">Assign Items</value>
+ <value xml:lang="nl">Wijs items toe</value>
+ <value xml:lang="ro">Atribuie Linii</value>
+ <value xml:lang="ru">ÐазнаÑиÑÑ Ð¿Ð¾Ð·Ð¸ÑиÑ</value>
+ <value xml:lang="th">à¸à¸³à¸«à¸à¸à¸£à¸²à¸¢à¸à¸²à¸£</value>
+ <value xml:lang="zh">åé
æç»</value>
+ </property>
+ <property key="EcommerceBeSureToIncludeYourOrderNb">
+ <value xml:lang="en">Be sure to include your order #</value>
+ <value xml:lang="es">Asegurese de incluir la Orden #</value>
+ <value xml:lang="fr">Soyez sûr(e) d'inclure votre n° de commande</value>
+ <value xml:lang="hi_IN">à¤à¤°à¥à¤¡à¤° समà¥à¤®à¤¿à¤®à¤¿à¤¤ à¤à¤°à¤¨à¤¾ न à¤à¥à¤²à¥à¤</value>
+ <value xml:lang="it">Assicurati di specificare il tuo ordine n°</value>
+ <value xml:lang="ja">Be sure to include your order #</value>
+ <value xml:lang="nl">bestellingsnummer niet vergeten?</value>
+ <value xml:lang="ro">Asigurate ca ai inclus comanda ta #</value>
+ <value xml:lang="ru">УбедиÑеÑÑ ÑÑо Ñказали â заказа</value>
+ <value xml:lang="th">à¹à¸à¹à¹à¸à¹à¸à¸à¸²à¸£à¸£à¸§à¸¡à¸£à¸²à¸¢à¸à¸²à¸£à¸ªà¸´à¸à¸à¹à¸²à¸à¸à¸à¸à¸¸à¸ #</value>
+ <value xml:lang="zh">确信å
æ¬äºä½ ç订å #</value>
+ </property>
<property key="EcommerceBronze">
<value xml:lang="en">Bronze</value>
<value xml:lang="es">Bronce</value>
@@ -1255,6 +1280,49 @@
<value xml:lang="th">à¸à¸¥à¸£à¸§à¸¡à¸à¸£à¸°à¸à¸£à¹à¸²</value>
<value xml:lang="zh">è´ç©è½¦æ»è®¡</value>
</property>
+ <property key="EcommerceChangePaymentInfo">
+ <value xml:lang="cs">naposledy vybraná položka</value>
+ <value xml:lang="de">Zahlungsinformation ändern</value>
+ <value xml:lang="en">Change Payment Info</value>
+ <value xml:lang="es">Cambiar información de pago</value>
+ <value xml:lang="fr">Changer les informations de paiement</value>
+ <value xml:lang="hi_IN">à¤à¥à¤à¤¤à¤¾à¤¨ à¤à¤¾à¤¨à¤à¤¾à¤°à¥ बदलà¥à¤</value>
+ <value xml:lang="it">Cambio informazioni pagamento</value>
+ <value xml:lang="ja">Change Payment Info</value>
+ <value xml:lang="nl">Aanpassen betalingsinformatie</value>
+ <value xml:lang="ro">Schimbare Informatii Plata </value>
+ <value xml:lang="ru">ÐзмениÑÑ Ð¿Ð»Ð°ÑежнÑÑ Ð¸Ð½ÑоÑмаÑиÑ</value>
+ <value xml:lang="th">à¹à¸à¸¥à¸µà¹à¸¢à¸à¹à¸à¸¥à¸à¸à¹à¸à¸¡à¸¹à¸¥à¸à¸²à¸£à¸à¸³à¸£à¸°à¹à¸à¸´à¸</value>
+ <value xml:lang="zh">ä¿®æ¹æ¯ä»ä¿¡æ¯</value>
+ </property>
+ <property key="EcommerceChangeShippingAddress">
+ <value xml:lang="cs">naposledy vybraná položka</value>
+ <value xml:lang="de">Versandadresse ändern</value>
+ <value xml:lang="en">Change Shipping Address</value>
+ <value xml:lang="en_GB">Change Delivery Address</value>
+ <value xml:lang="es">Cambiar Dirección de EnvÃo</value>
+ <value xml:lang="fr">Changer l'adresse de livraison</value>
+ <value xml:lang="hi_IN">माल à¤à¥à¤à¤¨à¥ à¤à¤¾ पता बदलà¥à¤</value>
+ <value xml:lang="it">Cambio indirizzo spedizione</value>
+ <value xml:lang="ja">Change Shipping Address</value>
+ <value xml:lang="nl">Aanpassen verzendadres</value>
+ <value xml:lang="ro">Schimbare Adresa Expediere </value>
+ <value xml:lang="ru">ÐзмениÑÑ Ð°Ð´ÑÐµÑ Ð´Ð¾ÑÑавки</value>
+ <value xml:lang="th">à¹à¸à¸¥à¸µà¹à¸¢à¸à¹à¸à¸¥à¸à¸à¸µà¹à¸à¸¢à¸¹à¹à¹à¸à¸à¸²à¸£à¸ªà¹à¸à¸à¸à¸</value>
+ <value xml:lang="zh">ä¿®æ¹è´§è¿å°å</value>
+ </property>
+ <property key="EcommerceChangeShippingOptions">
+ <value xml:lang="en">Change Shipping Options</value>
+ <value xml:lang="es">Cambie las opciones de envÃo</value>
+ <value xml:lang="fr">Changez les options d'expédition</value>
+ <value xml:lang="it">Cambio opzioni spedizione</value>
+ <value xml:lang="ja">Change Shipping Options</value>
+ <value xml:lang="nl">Aanpassen verzendopties</value>
+ <value xml:lang="ro">Schimbare Optiuni Expediere </value>
+ <value xml:lang="ru">ÐзмениÑÑ Ð¿Ð°ÑамеÑÑÑ Ð´Ð¾ÑÑавки</value>
+ <value xml:lang="th">à¹à¸à¸¥à¸µà¹à¸¢à¸à¹à¸à¸¥à¸à¸à¸²à¸à¹à¸¥à¸·à¸à¸à¹à¸à¸à¸²à¸£à¸ªà¹à¸à¸à¸à¸</value>
+ <value xml:lang="zh">ä¿®æ¹è´§è¿é项</value>
+ </property>
<property key="EcommerceCheckBalance">
<value xml:lang="en">Check Balance</value>
<value xml:lang="fr">Vérifier le solde</value>
@@ -2469,6 +2537,21 @@
<value xml:lang="en">One Page Checkout</value>
<value xml:lang="fr">Paiment sur une seule page</value>
<value xml:lang="fr">Acquisto su pagina singola</value>
+ </property>
+ <property key="EcommerceOrderConfirmation">
+ <value xml:lang="cs">Potvrzenà objednávky</value>
+ <value xml:lang="de">Bestellbestätigung</value>
+ <value xml:lang="en">Order Confirmation</value>
+ <value xml:lang="es">Confirmación de Compra</value>
+ <value xml:lang="fr">Confirmation de commande</value>
+ <value xml:lang="it">Conferma ordine</value>
+ <value xml:lang="ja">Order Confirmation</value>
+ <value xml:lang="nl">bestelling Confirmatie</value>
+ <value xml:lang="pt_PT">Confirmação de Encomenda</value>
+ <value xml:lang="ro">Confirma Comanda</value>
+ <value xml:lang="ru">ÐодÑвеÑждение заказа</value>
+ <value xml:lang="th">à¸à¸²à¸£à¸¢à¸·à¸à¸¢à¸±à¸à¸à¸²à¸£à¸ªà¸±à¹à¸à¸ªà¸´à¸à¸à¹à¸²</value>
+ <value xml:lang="zh">订å确认</value>
</property>
<property key="EcommerceOrderInLast">
<value xml:lang="en">order(s) in the last</value>
@@ -3571,34 +3654,6 @@
<value xml:lang="th">à¸à¸²à¸¡à¸à¸²à¸à¹à¸¥à¸·à¸à¸</value>
<value xml:lang="zh">å
许åæ</value>
</property>
- <property key="OrderAssignItems">
- <value xml:lang="en">Assign Items</value>
- <value xml:lang="es">Asignar Ãtems</value>
- <value xml:lang="fr">Affecter les articles</value>
- <value xml:lang="it">Assegna articoli</value>
- <value xml:lang="ja">Assign Items</value>
- <value xml:lang="nl">Wijs items toe</value>
- <value xml:lang="ro">Atribuie Linii</value>
- <value xml:lang="ru">ÐазнаÑиÑÑ Ð¿Ð¾Ð·Ð¸ÑиÑ</value>
- <value xml:lang="th">à¸à¸³à¸«à¸à¸à¸£à¸²à¸¢à¸à¸²à¸£</value>
- <value xml:lang="zh">åé
æç»</value>
- </property>
- <property key="OrderBackHome">
- <value xml:lang="cs">zpÄt na úvodnà stránku</value>
- <value xml:lang="de">Zurück zur Startseite</value>
- <value xml:lang="en">Back Home</value>
- <value xml:lang="es">Volver al Inicio</value>
- <value xml:lang="fr">Retour au départ</value>
- <value xml:lang="hi_IN">वापस à¤à¤°</value>
- <value xml:lang="it">Torna all'inizio</value>
- <value xml:lang="ja">Back Home</value>
- <value xml:lang="nl">Terug startpagina</value>
- <value xml:lang="pt_PT">Voltar à Entrada</value>
- <value xml:lang="ro">Intoarcete la Pagina Initiala</value>
- <value xml:lang="ru">ÐбÑаÑно на главнÑÑ</value>
- <value xml:lang="th">à¸à¸¥à¸±à¸à¸ªà¸¹à¹à¸«à¸à¹à¸²à¸«à¸¥à¸±à¸</value>
- <value xml:lang="zh">è¿åé¦é¡µ</value>
- </property>
<property key="OrderBacktoShoppingCart">
<value xml:lang="cs">zpÄt do koÅ¡Ãku</value>
<value xml:lang="de">Zurück zum Warenkorb</value>
@@ -3616,19 +3671,6 @@
<value xml:lang="th">à¸à¸¥à¸±à¸à¸ªà¸¹à¹à¸«à¸à¹à¸²à¸à¸²à¸£à¸à¸·à¹à¸à¸ªà¸´à¸à¸à¹à¸²à¸à¸²à¸à¸à¸±à¸à¸£</value>
<value xml:lang="zh">è¿åè´ç©è½¦</value>
</property>
- <property key="OrderBeSureToIncludeYourOrderNb">
- <value xml:lang="en">Be sure to include your order #</value>
- <value xml:lang="es">Asegurese de incluir la Orden #</value>
- <value xml:lang="fr">Soyez sûr(e) d'inclure votre n° de commande</value>
- <value xml:lang="hi_IN">à¤à¤°à¥à¤¡à¤° समà¥à¤®à¤¿à¤®à¤¿à¤¤ à¤à¤°à¤¨à¤¾ न à¤à¥à¤²à¥à¤</value>
- <value xml:lang="it">Assicurati di specificare il tuo ordine n°</value>
- <value xml:lang="ja">Be sure to include your order #</value>
- <value xml:lang="nl">bestellingsnummer niet vergeten?</value>
- <value xml:lang="ro">Asigurate ca ai inclus comanda ta #</value>
- <value xml:lang="ru">УбедиÑеÑÑ ÑÑо Ñказали â заказа</value>
- <value xml:lang="th">à¹à¸à¹à¹à¸à¹à¸à¸à¸²à¸£à¸£à¸§à¸¡à¸£à¸²à¸¢à¸à¸²à¸£à¸ªà¸´à¸à¸à¹à¸²à¸à¸à¸à¸à¸¸à¸ #</value>
- <value xml:lang="zh">确信å
æ¬äºä½ ç订å #</value>
- </property>
<property key="OrderBesureIncludeOrder">
<value xml:lang="cs">UjistÄte se že jste vložili objednávku</value>
<value xml:lang="de">Seien Sie sicher, Ihre Bestellung einzufügen</value>
@@ -3678,49 +3720,6 @@
<value xml:lang="th">à¹à¸à¸´à¸à¸à¹à¸§à¸</value>
<value xml:lang="zh">è´§å°ä»æ¬¾</value>
</property>
- <property key="OrderChangePaymentInfo">
- <value xml:lang="cs">naposledy vybraná položka</value>
- <value xml:lang="de">Zahlungsinformation ändern</value>
- <value xml:lang="en">Change Payment Info</value>
- <value xml:lang="es">Cambiar información de pago</value>
- <value xml:lang="fr">Changer les informations de paiement</value>
- <value xml:lang="hi_IN">à¤à¥à¤à¤¤à¤¾à¤¨ à¤à¤¾à¤¨à¤à¤¾à¤°à¥ बदलà¥à¤</value>
- <value xml:lang="it">Cambio informazioni pagamento</value>
- <value xml:lang="ja">Change Payment Info</value>
- <value xml:lang="nl">Aanpassen betalingsinformatie</value>
- <value xml:lang="ro">Schimbare Informatii Plata </value>
- <value xml:lang="ru">ÐзмениÑÑ Ð¿Ð»Ð°ÑежнÑÑ Ð¸Ð½ÑоÑмаÑиÑ</value>
- <value xml:lang="th">à¹à¸à¸¥à¸µà¹à¸¢à¸à¹à¸à¸¥à¸à¸à¹à¸à¸¡à¸¹à¸¥à¸à¸²à¸£à¸à¸³à¸£à¸°à¹à¸à¸´à¸</value>
- <value xml:lang="zh">ä¿®æ¹æ¯ä»ä¿¡æ¯</value>
- </property>
- <property key="OrderChangeShippingAddress">
- <value xml:lang="cs">naposledy vybraná položka</value>
- <value xml:lang="de">Versandadresse ändern</value>
- <value xml:lang="en">Change Shipping Address</value>
- <value xml:lang="en_GB">Change Delivery Address</value>
- <value xml:lang="es">Cambiar Dirección de EnvÃo</value>
- <value xml:lang="fr">Changer l'adresse de livraison</value>
- <value xml:lang="hi_IN">माल à¤à¥à¤à¤¨à¥ à¤à¤¾ पता बदलà¥à¤</value>
- <value xml:lang="it">Cambio indirizzo spedizione</value>
- <value xml:lang="ja">Change Shipping Address</value>
- <value xml:lang="nl">Aanpassen verzendadres</value>
- <value xml:lang="ro">Schimbare Adresa Expediere </value>
- <value xml:lang="ru">ÐзмениÑÑ Ð°Ð´ÑÐµÑ Ð´Ð¾ÑÑавки</value>
- <value xml:lang="th">à¹à¸à¸¥à¸µà¹à¸¢à¸à¹à¸à¸¥à¸à¸à¸µà¹à¸à¸¢à¸¹à¹à¹à¸à¸à¸²à¸£à¸ªà¹à¸à¸à¸à¸</value>
- <value xml:lang="zh">ä¿®æ¹è´§è¿å°å</value>
- </property>
- <property key="OrderChangeShippingOptions">
- <value xml:lang="en">Change Shipping Options</value>
- <value xml:lang="es">Cambie las opciones de envÃo</value>
- <value xml:lang="fr">Changez les options d'expédition</value>
- <value xml:lang="it">Cambio opzioni spedizione</value>
- <value xml:lang="ja">Change Shipping Options</value>
- <value xml:lang="nl">Aanpassen verzendopties</value>
- <value xml:lang="ro">Schimbare Optiuni Expediere </value>
- <value xml:lang="ru">ÐзмениÑÑ Ð¿Ð°ÑамеÑÑÑ Ð´Ð¾ÑÑавки</value>
- <value xml:lang="th">à¹à¸à¸¥à¸µà¹à¸¢à¸à¹à¸à¸¥à¸à¸à¸²à¸à¹à¸¥à¸·à¸à¸à¹à¸à¸à¸²à¸£à¸ªà¹à¸à¸à¸à¸</value>
- <value xml:lang="zh">ä¿®æ¹è´§è¿é项</value>
- </property>
<property key="OrderChooseAnotherGift">
<value xml:lang="en">Choose Another Gift</value>
<value xml:lang="es">Elija otro relago</value>
@@ -3750,37 +3749,6 @@
<value xml:lang="th">à¸à¸¸à¸à¸ªà¸²à¸¡à¸²à¸£à¸à¹à¸ªà¹à¸à¸µà¹à¸à¸¢à¸¹à¹à¸à¸µà¹à¸¡à¸¥à¹à¹à¸à¹à¸à¸µà¹à¸à¸µà¹ à¹à¸à¸·à¹à¸à¹à¸à¹à¸ªà¸³à¸«à¸£à¸±à¸à¸à¸²à¸£à¸ªà¸±à¹à¸à¸ªà¸´à¸à¸à¹à¸²à¹à¸à¸à¸±à¸à¸à¸¸à¸à¸±à¸</value>
<value xml:lang="zh">ä½ å¯ä»¥å¨è¿éæ·»å å
¶å®éå·åéççµåé®ä»¶å°åï¼è¿äºçµåé®ä»¶å°åä»
ç¨äºå½å订å</value>
</property>
- <property key="OrderConfirmation">
- <value xml:lang="cs">Potvrzenà objednávky</value>
- <value xml:lang="de">Bestellbestätigung</value>
- <value xml:lang="en">Order Confirmation</value>
- <value xml:lang="es">Confirmación de Compra</value>
- <value xml:lang="fr">Confirmation de commande</value>
- <value xml:lang="it">Conferma ordine</value>
- <value xml:lang="ja">Order Confirmation</value>
- <value xml:lang="nl">bestelling Confirmatie</value>
- <value xml:lang="pt_PT">Confirmação de Encomenda</value>
- <value xml:lang="ro">Confirma Comanda</value>
- <value xml:lang="ru">ÐодÑвеÑждение заказа</value>
- <value xml:lang="th">à¸à¸²à¸£à¸¢à¸·à¸à¸¢à¸±à¸à¸à¸²à¸£à¸ªà¸±à¹à¸à¸ªà¸´à¸à¸à¹à¸²</value>
- <value xml:lang="zh">订å确认</value>
- </property>
- <property key="OrderContinueShopping">
- <value xml:lang="cs">PokraÄovat v nákupu</value>
- <value xml:lang="de">Einkauf fortsetzen</value>
- <value xml:lang="en">Continue Shopping</value>
- <value xml:lang="es">Continuar Comprando</value>
- <value xml:lang="fr">Continuer les achats</value>
- <value xml:lang="hi_IN">à¤à¤¼à¤°à¥à¤¦à¤¾à¤°à¥ à¤à¤¾à¤²à¥ रà¤à¥à¤</value>
- <value xml:lang="it">Continua acquisto</value>
- <value xml:lang="ja">Continue Shopping</value>
- <value xml:lang="nl">Doorgaan met winkelen</value>
- <value xml:lang="pt_PT">Continuar a Comprar</value>
- <value xml:lang="ro">Continua sa Cumperi</value>
- <value xml:lang="ru">ÐÑодолжиÑÑ Ð¿Ð¾ÐºÑпки</value>
- <value xml:lang="th">à¸à¸³à¸à¸²à¸£à¹à¸¥à¸·à¸à¸à¸à¸·à¹à¸à¸ªà¸´à¸à¸à¹à¸²à¸à¹à¸à¹à¸</value>
- <value xml:lang="zh">继ç»è´ç©</value>
- </property>
<property key="OrderContinueToFinalOrderReview">
<value xml:lang="cs">Dále k závÄreÄnému pÅehledu objednávky</value>
<value xml:lang="de">Weiter zur abschlieÃenden Bestellüberprüfung</value>
Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/anonymoustrail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/anonymoustrail.ftl?rev=711991&r1=711990&r2=711991&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/anonymoustrail.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/anonymoustrail.ftl Thu Nov 6 14:19:49 2008
@@ -17,4 +17,4 @@
under the License.
-->
-<#if shipAddr?exists><a href="<@o...@ofbizUrl>" class="${trailClass.shipAddr}">${uiLabelMap.OrderChangeShippingAddress}</a><#if shipOptions?exists><a href="<@o...@ofbizUrl>" class="${trailClass.shipOptions}">${uiLabelMap.OrderChangeShippingOptions}</a><#if billing?exists><a href="<@o...@ofbizUrl>" class="${trailClass.paymentType}">${uiLabelMap.OrderChangePaymentInfo}</a></#if></#if></#if>
+<#if shipAddr?exists><a href="<@o...@ofbizUrl>" class="${trailClass.shipAddr}">${uiLabelMap.EcommerceChangeShippingAddress}</a><#if shipOptions?exists><a href="<@o...@ofbizUrl>" class="${trailClass.shipOptions}">${uiLabelMap.EcommerceChangeShippingOptions}</a><#if billing?exists><a href="<@o...@ofbizUrl>" class="${trailClass.paymentType}">${uiLabelMap.EcommerceChangePaymentInfo}</a></#if></#if></#if>
Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/ordercomplete.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/ordercomplete.ftl?rev=711991&r1=711990&r2=711991&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/ordercomplete.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/ordercomplete.ftl Thu Nov 6 14:19:49 2008
@@ -16,7 +16,7 @@
specific language governing permissions and limitations
under the License.
-->
-<h1>${uiLabelMap.OrderConfirmation}</h1>
+<h1>${uiLabelMap.EcommerceOrderConfirmation}</h1>
<#if !isDemoStore?exists || isDemoStore><p>${uiLabelMap.OrderDemoFrontNote}.</p></#if>
<#if orderHeader?has_content>
@@ -26,10 +26,10 @@
<table border="0" cellpadding="1" width="100%">
<tr>
<td colspan="4">
- <a href="<@o...@ofbizUrl>" class="buttontextbig">${uiLabelMap.OrderContinueShopping}</a>
+ <a href="<@o...@ofbizUrl>" class="buttontextbig">${uiLabelMap.EcommerceContinueShopping}</a>
</td>
<td align="right">
- <a href="<@o...@ofbizUrl>" class="buttontextbig">${uiLabelMap.OrderContinueShopping}</a>
+ <a href="<@o...@ofbizUrl>" class="buttontextbig">${uiLabelMap.EcommerceContinueShopping}</a>
</td>
</tr>
</table>
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=711991&r1=711990&r2=711991&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderheader.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderheader.ftl Thu Nov 6 14:19:49 2008
@@ -135,7 +135,7 @@
<div class="tabletext" align="center">${paymentAddress.city}<#if paymentAddress.stateProvinceGeoId?has_content>, ${paymentAddress.stateProvinceGeoId}</#if> ${paymentAddress.postalCode?if_exists}
<div class="tabletext" align="center">${paymentAddress.countryGeoId}</div>
<div class="tabletext" align="center"><hr/></div>
- <div class="tabletext" align="center"><b>${uiLabelMap.OrderBeSureToIncludeYourOrderNb}</b></div>
+ <div class="tabletext" align="center"><b>${uiLabelMap.EcommerceBeSureToIncludeYourOrderNb}</b></div>
</#if>
</td>
<#else>
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=711991&r1=711990&r2=711991&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderhistory.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderhistory.ftl Thu Nov 6 14:19:49 2008
@@ -19,11 +19,6 @@
<div class="screenlet">
<div class="screenlet-header">
- <#--
- <div class="boxlink">
- <a href="<@o...@ofbizUrl>" class="lightbuttontext">[${uiLabelMap.OrderBackHome}]</a>
- </div>
- -->
<div class="boxhead">${uiLabelMap.OrderSalesHistory}</div>
</div>
<div class="screenlet-body">
Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/splitship.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/splitship.ftl?rev=711991&r1=711990&r2=711991&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/splitship.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/splitship.ftl Thu Nov 6 14:19:49 2008
@@ -151,7 +151,7 @@
<div class="screenlet">
<div class="screenlet-header">
- <div class="boxhead"> ${uiLabelMap.OrderAssignItems}</div>
+ <div class="boxhead"> ${uiLabelMap.EcommerceAssignItems}</div>
</div>
<div class="screenlet-body">
<table width="100%" cellspacing="0" cellpadding="1" border="0">
Modified: ofbiz/trunk/applications/ecommerce/widget/OrderScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/widget/OrderScreens.xml?rev=711991&r1=711990&r2=711991&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/widget/OrderScreens.xml (original)
+++ ofbiz/trunk/applications/ecommerce/widget/OrderScreens.xml Thu Nov 6 14:19:49 2008
@@ -25,6 +25,7 @@
<screen name="anonymoustrail">
<section>
<actions>
+ <property-map resource="EcommerceUiLabels" map-name="uiLabelMap" global="true"/>
<script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/AnonymousTrail.groovy"/>
</actions>
<widgets>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/sendconfirmationemail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/sendconfirmationemail.ftl?rev=711991&r1=711990&r2=711991&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/sendconfirmationemail.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/sendconfirmationemail.ftl Thu Nov 6 14:19:49 2008
@@ -39,7 +39,7 @@
<tr>
<td width="2%" align="right" class="label">${uiLabelMap.OrderSendConfirmationEmailSubject} </td>
<td width="54%">
- <input type="text" size="40" name="subject" value="${productStoreEmailSetting.subject?default(uiLabelMap.OrderConfirmation + " " + uiLabelMap.OrderNbr + orderId)?replace("\\$\\{orderId\\}",orderId,"r")}" />
+ <input type="text" size="40" name="subject" value="${productStoreEmailSetting.subject?default(uiLabelMap.OrderOrderConfirmation + " " + uiLabelMap.OrderNbr + orderId)?replace("\\$\\{orderId\\}",orderId,"r")}" />
</td>
</tr>
</tr>