svn commit: r1618415 - in /ofbiz/trunk: applications/accounting/src/or
Locked
svn commit: r1618415 - in /ofbiz/trunk: applications/accounting/src/or
 
|
Author: ashish
Date: Sat Aug 16 20:53:55 2014 New Revision: 1618415 URL: http://svn.apache.org/r1618415 Log: Applied patch from jira issue - OFBIZ-3566 - EcommerceUiLabels references in applications/* Thanks Adam Heath for reporting the issue and team ofbiz.us for providing the fix. Added: ofbiz/trunk/applications/securityext/config/SecurityExtUiLabels.xml (with props) Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/GiftCertificateServices.java ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java ofbiz/trunk/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java ofbiz/trunk/applications/securityext/email/default/passwordemail.ftl ofbiz/trunk/applications/securityext/widget/EmailSecurityScreens.xml ofbiz/trunk/specialpurpose/ecommerce/config/EcommerceUiLabels.xml ofbiz/trunk/specialpurpose/ecommerce/widget/EmailGiftCardScreens.xml ofbiz/trunk/specialpurpose/ecommerce/widget/EmailReturnScreens.xml Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/GiftCertificateServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/GiftCertificateServices.java?rev=1618415&r1=1618414&r2=1618415&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/GiftCertificateServices.java (original) +++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/GiftCertificateServices.java Sat Aug 16 20:53:55 2014 @@ -891,10 +891,6 @@ public class GiftCertificateServices { if (productStoreEmail == null) { Debug.logError("No gift card purchase email setting found for this store; cannot send gift card information", module); } else { - ResourceBundleMapWrapper uiLabelMap = UtilProperties.getResourceBundleMap("EcommerceUiLabels", locale); - uiLabelMap.addBottomResourceBundle("OrderUiLabels"); - uiLabelMap.addBottomResourceBundle("CommonUiLabels"); - answerMap.put("uiLabelMap", uiLabelMap); answerMap.put("locale", locale); // set the bcc address(s) @@ -906,7 +902,6 @@ public class GiftCertificateServices { bcc = orderEmails; } } - Map<String, Object> emailCtx = FastMap.newInstance(); String bodyScreenLocation = productStoreEmail.getString("bodyScreenLocation"); if (UtilValidate.isEmpty(bodyScreenLocation)) { @@ -921,7 +916,7 @@ public class GiftCertificateServices { emailCtx.put("sendBcc", bcc); emailCtx.put("subject", productStoreEmail.getString("subject")); emailCtx.put("userLogin", userLogin); - + // send off the email async so we will retry on failed attempts // SC 20060405: Changed to runSync because runAsync kept getting an error: // Problem serializing service attributes (Cannot serialize object of class java.util.PropertyResourceBundle) @@ -1136,10 +1131,6 @@ public class GiftCertificateServices { if (productStoreEmail == null) { Debug.logError("No gift card purchase email setting found for this store; cannot send gift card information", module); } else { - ResourceBundleMapWrapper uiLabelMap = UtilProperties.getResourceBundleMap("EcommerceUiLabels", locale); - uiLabelMap.addBottomResourceBundle("OrderUiLabels"); - uiLabelMap.addBottomResourceBundle("CommonUiLabels"); - answerMap.put("uiLabelMap", uiLabelMap); answerMap.put("locale", locale); Map<String, Object> emailCtx = FastMap.newInstance(); Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java?rev=1618415&r1=1618414&r2=1618415&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java (original) +++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java Sat Aug 16 20:53:55 2014 @@ -1173,7 +1173,6 @@ public class ValueLinkServices { // get the send to email address - key defined in properties file String sendToKey = UtilProperties.getPropertyValue(paymentConfig, "payment.giftcert.purchase.survey.sendToEmail"); String sendToEmail = (String) answerMap.get(sendToKey); - // get the copyMe flag and set the order email address String orderEmails = orh.getOrderEmailString(); String copyMeField = UtilProperties.getPropertyValue(paymentConfig, "payment.giftcert.purchase.survey.copyMe"); @@ -1262,10 +1261,6 @@ public class ValueLinkServices { if (productStoreEmail == null) { Debug.logError("No gift card purchase email setting found for this store; cannot send gift card information", module); } else { - ResourceBundleMapWrapper uiLabelMap = UtilProperties.getResourceBundleMap("EcommerceUiLabels", locale); - uiLabelMap.addBottomResourceBundle("OrderUiLabels"); - uiLabelMap.addBottomResourceBundle("CommonUiLabels"); - answerMap.put("uiLabelMap", uiLabelMap); answerMap.put("locale", locale); // set the bcc address(s) @@ -1515,10 +1510,6 @@ public class ValueLinkServices { Debug.logError("No gift card purchase email setting found for this store; cannot send gift card information", module); } else { Map<String, Object> emailCtx = FastMap.newInstance(); - ResourceBundleMapWrapper uiLabelMap = UtilProperties.getResourceBundleMap("EcommerceUiLabels", locale); - uiLabelMap.addBottomResourceBundle("OrderUiLabels"); - uiLabelMap.addBottomResourceBundle("CommonUiLabels"); - answerMap.put("uiLabelMap", uiLabelMap); answerMap.put("locale", locale); String bodyScreenLocation = productStoreEmail.getString("bodyScreenLocation"); Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java?rev=1618415&r1=1618414&r2=1618415&view=diff ============================================================================== --- ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java (original) +++ ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java Sat Aug 16 20:53:55 2014 @@ -263,11 +263,7 @@ public class OrderReturnServices { String xslfoAttachScreenLocation = productStoreEmail.getString("xslfoAttachScreenLocation"); sendMap.put("xslfoAttachScreenLocation", xslfoAttachScreenLocation); - ResourceBundleMapWrapper uiLabelMap = UtilProperties.getResourceBundleMap("EcommerceUiLabels", locale); - uiLabelMap.addBottomResourceBundle("OrderUiLabels"); - uiLabelMap.addBottomResourceBundle("CommonUiLabels"); - - Map<String, Object> bodyParameters = UtilMisc.<String, Object>toMap("returnHeader", returnHeader, "returnItems", returnItems, "returnAdjustments", returnAdjustments, "uiLabelMap", uiLabelMap, "locale", locale, "userLogin", userLogin); + Map<String, Object> bodyParameters = UtilMisc.<String, Object>toMap("returnHeader", returnHeader, "returnItems", returnItems, "returnAdjustments", returnAdjustments, "locale", locale, "userLogin", userLogin); sendMap.put("bodyParameters", bodyParameters); sendMap.put("subject", productStoreEmail.getString("subject")); Modified: ofbiz/trunk/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java?rev=1618415&r1=1618414&r2=1618415&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java Sat Aug 16 20:53:55 2014 @@ -1183,11 +1183,8 @@ public class ShipmentServices { if (locale == null) { locale = Locale.getDefault(); } - ResourceBundleMapWrapper uiLabelMap = UtilProperties.getResourceBundleMap("EcommerceUiLabels", locale); - uiLabelMap.addBottomResourceBundle("OrderUiLabels"); - uiLabelMap.addBottomResourceBundle("CommonUiLabels"); - Map<String, Object> bodyParameters = UtilMisc.<String, Object>toMap("partyId", partyId, "shipmentId", shipmentId, "orderId", shipment.getString("primaryOrderId"), "userLogin", userLogin, "uiLabelMap", uiLabelMap, "locale", locale); + Map<String, Object> bodyParameters = UtilMisc.<String, Object>toMap("partyId", partyId, "shipmentId", shipmentId, "orderId", shipment.getString("primaryOrderId"), "userLogin", userLogin, "locale", locale); sendMap.put("bodyParameters", bodyParameters); sendMap.put("userLogin",userLogin); @@ -1196,7 +1193,7 @@ public class ShipmentServices { sendMap.put("sendFrom", productStoreEmail.get("fromAddress")); sendMap.put("sendCc", productStoreEmail.get("ccAddress")); sendMap.put("sendBcc", productStoreEmail.get("bccAddress")); - + if ((sendTo != null) && UtilValidate.isEmail(sendTo)) { sendMap.put("sendTo", sendTo); } else { Added: ofbiz/trunk/applications/securityext/config/SecurityExtUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/securityext/config/SecurityExtUiLabels.xml?rev=1618415&view=auto ============================================================================== --- ofbiz/trunk/applications/securityext/config/SecurityExtUiLabels.xml (added) +++ ofbiz/trunk/applications/securityext/config/SecurityExtUiLabels.xml Sat Aug 16 20:53:55 2014 @@ -0,0 +1,104 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> +<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <property key="SecurityExtANew"> + <value xml:lang="da">en ny</value> + <value xml:lang="de">Ein neues</value> + <value xml:lang="en">a new</value> + <value xml:lang="fr">un nouvel</value> + <value xml:lang="it">una nuova</value> + <value xml:lang="ja">ãç¥ãã</value> + <value xml:lang="nl">een nieuw(e)</value> + <value xml:lang="pt_BR">uma nova</value> + <value xml:lang="th">à¹à¸«à¸¡à¹</value> + <value xml:lang="vi">má»i</value> + <value xml:lang="zh">ä¸ä¸ªæ°ç</value> + <value xml:lang="zh_TW">ä¸åæ°ç</value> + </property> + <property key="SecurityExtNewPasswordMssgEncryptionOff"> + <value xml:lang="da">Deres adgangskode er:</value> + <value xml:lang="de">Ihr Passwort ist: </value> + <value xml:lang="en">Your password is :- </value> + <value xml:lang="fr">Votre mot de passe est : </value> + <value xml:lang="it">La tua password è :- </value> + <value xml:lang="ja">ããªãã®ãã¹ã¯ã¼ã㯠:-</value> + <value xml:lang="nl">Uw wachtwoord is :</value> + <value xml:lang="pt_BR">Sua senha é:</value> + <value xml:lang="zh">ä½ çå¯ç æ¯ï¼- </value> + <value xml:lang="vi">Máºt khẩu của bạn :-</value> + <value xml:lang="zh_TW">ä½ çå¯ç¢¼æ¯ :- </value> + </property> + <property key="SecurityExtNewPasswordMssgEncryptionOn"> + <value xml:lang="da">Deres nye adgangskode er :- </value> + <value xml:lang="de">Ihr neues Passwort ist : </value> + <value xml:lang="en">Your new password is :- </value> + <value xml:lang="fr">Votre nouveau mot de passe est : </value> + <value xml:lang="it">La nuova password è :- </value> + <value xml:lang="ja">ããªãã®æ°ãããã¹ã¯ã¼ã㯠:-</value> + <value xml:lang="nl">Uw nieuwe wachtwoord is : </value> + <value xml:lang="pt_BR">Sua nova senha é:</value> + <value xml:lang="zh">ä½ çæ°å¯ç æ¯ï¼- </value> + <value xml:lang="zh_TW">ä½ çæ°å¯ç¢¼æ¯ :- </value> + <value xml:lang="vi">Máºt khẩu má»i của bạn :-</value> + </property> + <property key="SecurityExtPasswordSentToYou"> + <value xml:lang="da">kodeord er sendt til Dem</value> + <value xml:lang="de">Passwort das Ihnen zugesendet wurde</value> + <value xml:lang="en">password sent to you</value> + <value xml:lang="fr">mot de passe qui vous a été envoyé</value> + <value xml:lang="it">password inviata a te</value> + <value xml:lang="ja">ãã¹ã¯ã¼ããéä¿¡ãã¾ãã</value> + <value xml:lang="nl">Wachtwoord dat naar u verzonden is</value> + <value xml:lang="pt_BR">Senha enviada para você</value> + <value xml:lang="th">สà¹à¸à¸£à¸«à¸±à¸ªà¸à¹à¸²à¸à¸à¸¶à¸à¸à¸¸à¸</value> + <value xml:lang="vi">máºt khẩu Äược gá»i tá»i bạn</value> + <value xml:lang="zh">å¯ç åéç»ä½ äº</value> + <value xml:lang="zh_TW">å¯ç¢¼å·²ç¼éçµ¦ä½ </value> + </property> + <property key="SecurityExtThisEmailIsInResponseToYourRequestToHave"> + <value xml:lang="da">Denne E-mail er et svar pÃ¥ Deres forespørgsel for at fÃ¥</value> + <value xml:lang="de">Dieses E-Mail ist eine Antwort auf Ihre Anfrage zu </value> + <value xml:lang="en">This email is in response to your request to have</value> + <value xml:lang="fr">Ce courriel en réponse à votre demande d'obtenir</value> + <value xml:lang="it">Questa email ti è stata inviata in seguito alla tua richiesta.</value> + <value xml:lang="ja">ãã®ã¡ã¼ã«ã¯ããªãããªã¯ã¨ã¹ãããããã®ã§ã</value> + <value xml:lang="nl">Deze email is verzonden naar aanleiding van uw verzoek.</value> + <value xml:lang="pt_BR">Este e-mail lhe foi enviado devido ao seu pedido</value> + <value xml:lang="th">à¸à¸³à¸£à¹à¸à¸à¸à¸à¸à¸à¸¸à¸à¸¡à¸µà¸à¸²à¸£à¸à¸à¸à¹à¸à¸à¸µà¹à¸¡à¸¥à¸à¸µà¹</value> + <value xml:lang="vi">ThÆ° Äiá»n tá» nà y Äá» phản há»i viá»c bạn yêu cầu muá»n có</value> + <value xml:lang="zh">è¿ä¸ªçµåé®ä»¶æ¯åçä½ è¦æ±ç</value> + <value xml:lang="zh_TW">æ¤é»åéµä»¶æ¯åè¦ä½ çè¦æ±ç</value> + </property> + <property key="SecurityExtYour"> + <value xml:lang="da">Deres</value> + <value xml:lang="de">Ihr</value> + <value xml:lang="en">your</value> + <value xml:lang="fr">Votre</value> + <value xml:lang="it">tuo</value> + <value xml:lang="ja">ããªãã®</value> + <value xml:lang="nl">uw</value> + <value xml:lang="pt_BR">seu</value> + <value xml:lang="th">à¸à¸à¸à¸à¸¸à¸</value> + <value xml:lang="vi">của bạn</value> + <value xml:lang="zh">ä½ ç</value> + <value xml:lang="zh_TW">ä½ ç</value> + </property> +</resource> Propchange: ofbiz/trunk/applications/securityext/config/SecurityExtUiLabels.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/securityext/config/SecurityExtUiLabels.xml ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/applications/securityext/config/SecurityExtUiLabels.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Modified: ofbiz/trunk/applications/securityext/email/default/passwordemail.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/securityext/email/default/passwordemail.ftl?rev=1618415&r1=1618414&r2=1618415&view=diff ============================================================================== --- ofbiz/trunk/applications/securityext/email/default/passwordemail.ftl (original) +++ ofbiz/trunk/applications/securityext/email/default/passwordemail.ftl Sat Aug 16 20:53:55 2014 @@ -21,13 +21,13 @@ under the License. <head> </head> <body> - <div>${uiLabelMap.EcommerceThisEmailIsInResponseToYourRequestToHave} <#if useEncryption>${uiLabelMap.EcommerceANew}<#else>${uiLabelMap.EcommerceYour}</#if> ${uiLabelMap.EcommercePasswordSentToYou}.</div> + <div>${uiLabelMap.SecurityExtThisEmailIsInResponseToYourRequestToHave} <#if useEncryption>${uiLabelMap.SecurityExtANew}<#else>${uiLabelMap.SecurityExtYour}</#if> ${uiLabelMap.SecurityExtPasswordSentToYou}.</div> <br /> <div> <#if useEncryption> - ${uiLabelMap.EcommerceNewPasswordMssgEncryptionOn} + ${uiLabelMap.SecurityExtNewPasswordMssgEncryptionOn} <#else> - ${uiLabelMap.EcommerceNewPasswordMssgEncryptionOff} + ${uiLabelMap.SecurityExtNewPasswordMssgEncryptionOff} </#if> "${password}" </div> Modified: ofbiz/trunk/applications/securityext/widget/EmailSecurityScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/securityext/widget/EmailSecurityScreens.xml?rev=1618415&r1=1618414&r2=1618415&view=diff ============================================================================== --- ofbiz/trunk/applications/securityext/widget/EmailSecurityScreens.xml (original) +++ ofbiz/trunk/applications/securityext/widget/EmailSecurityScreens.xml Sat Aug 16 20:53:55 2014 @@ -24,7 +24,7 @@ under the License. <screen name="PasswordEmail"> <section> <actions> - <property-map resource="EcommerceUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="SecurityExtUiLabels" map-name="uiLabelMap" global="true"/> </actions> <widgets> <platform-specific><html><html-template location="component://securityext/email/default/passwordemail.ftl"/></html></platform-specific> Modified: ofbiz/trunk/specialpurpose/ecommerce/config/EcommerceUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/config/EcommerceUiLabels.xml?rev=1618415&r1=1618414&r2=1618415&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/config/EcommerceUiLabels.xml (original) +++ ofbiz/trunk/specialpurpose/ecommerce/config/EcommerceUiLabels.xml Sat Aug 16 20:53:55 2014 @@ -29,20 +29,6 @@ <value xml:lang="zh">å ³äºæ们</value> <value xml:lang="zh_TW">éæ¼æå</value> </property> - <property key="EcommerceANew"> - <value xml:lang="da">en ny</value> - <value xml:lang="de">Ein neues</value> - <value xml:lang="en">a new</value> - <value xml:lang="fr">un nouvel</value> - <value xml:lang="it">una nuova</value> - <value xml:lang="ja">ãç¥ãã</value> - <value xml:lang="nl">een nieuw(e)</value> - <value xml:lang="pt_BR">uma nova</value> - <value xml:lang="th">à¹à¸«à¸¡à¹</value> - <value xml:lang="vi">má»i</value> - <value xml:lang="zh">ä¸ä¸ªæ°ç</value> - <value xml:lang="zh_TW">ä¸åæ°ç</value> - </property> <property key="EcommerceAccountInformation"> <value xml:lang="da">Konto information</value> <value xml:lang="en">Account Information</value> @@ -2302,32 +2288,6 @@ <value xml:lang="zh">æ°æ³¨åå表</value> <value xml:lang="zh_TW">æ°è¨»åå表</value> </property> - <property key="EcommerceNewPasswordMssgEncryptionOff"> - <value xml:lang="da">Deres adgangskode er:</value> - <value xml:lang="de">Ihr Passwort ist: </value> - <value xml:lang="en">Your password is :- </value> - <value xml:lang="fr">Votre mot de passe est : </value> - <value xml:lang="it">La tua password è :- </value> - <value xml:lang="ja">ããªãã®ãã¹ã¯ã¼ã㯠:-</value> - <value xml:lang="nl">Uw wachtwoord is :</value> - <value xml:lang="pt_BR">Sua senha é:</value> - <value xml:lang="zh">ä½ çå¯ç æ¯ï¼- </value> - <value xml:lang="vi">Máºt khẩu của bạn :-</value> - <value xml:lang="zh_TW">ä½ çå¯ç¢¼æ¯ :- </value> - </property> - <property key="EcommerceNewPasswordMssgEncryptionOn"> - <value xml:lang="da">Deres nye adgangskode er :- </value> - <value xml:lang="de">Ihr neues Passwort ist : </value> - <value xml:lang="en">Your new password is :- </value> - <value xml:lang="fr">Votre nouveau mot de passe est : </value> - <value xml:lang="it">La nuova password è :- </value> - <value xml:lang="ja">ããªãã®æ°ãããã¹ã¯ã¼ã㯠:-</value> - <value xml:lang="nl">Uw nieuwe wachtwoord is : </value> - <value xml:lang="pt_BR">Sua nova senha é:</value> - <value xml:lang="zh">ä½ çæ°å¯ç æ¯ï¼- </value> - <value xml:lang="zh_TW">ä½ çæ°å¯ç¢¼æ¯ :- </value> - <value xml:lang="vi">Máºt khẩu má»i của bạn :-</value> - </property> <property key="EcommerceNoDigitalProductsFound"> <value xml:lang="da">Der er ikke fundet nogen digitale produkter</value> <value xml:lang="de">Keine digitalen Produkte gefunden</value> @@ -2697,20 +2657,6 @@ <value xml:lang="zh">å¯ç æ¯</value> <value xml:lang="zh_TW">å¯ç¢¼æ¯</value> </property> - <property key="EcommercePasswordSentToYou"> - <value xml:lang="da">kodeord er sendt til Dem</value> - <value xml:lang="de">Passwort das Ihnen zugesendet wurde</value> - <value xml:lang="en">password sent to you</value> - <value xml:lang="fr">mot de passe qui vous a été envoyé</value> - <value xml:lang="it">password inviata a te</value> - <value xml:lang="ja">ãã¹ã¯ã¼ããéä¿¡ãã¾ãã</value> - <value xml:lang="nl">Wachtwoord dat naar u verzonden is</value> - <value xml:lang="pt_BR">Senha enviada para você</value> - <value xml:lang="th">สà¹à¸à¸£à¸«à¸±à¸ªà¸à¹à¸²à¸à¸à¸¶à¸à¸à¸¸à¸</value> - <value xml:lang="vi">máºt khẩu Äược gá»i tá»i bạn</value> - <value xml:lang="zh">å¯ç åéç»ä½ äº</value> - <value xml:lang="zh_TW">å¯ç¢¼å·²ç¼éçµ¦ä½ </value> - </property> <property key="EcommercePleaseWait"> <value xml:lang="da">Vent venligst</value> <value xml:lang="de">Bitte warten</value> @@ -3842,20 +3788,6 @@ <value xml:lang="zh">è°¢è°¢ä½ </value> <value xml:lang="zh_TW">è¬è¬ä½ </value> </property> - <property key="EcommerceThisEmailIsInResponseToYourRequestToHave"> - <value xml:lang="da">Denne E-mail er et svar pÃ¥ Deres forespørgsel for at fÃ¥</value> - <value xml:lang="de">Dieses E-Mail ist eine Antwort auf Ihre Anfrage zu </value> - <value xml:lang="en">This email is in response to your request to have</value> - <value xml:lang="fr">Ce courriel en réponse à votre demande d'obtenir</value> - <value xml:lang="it">Questa email ti è stata inviata in seguito alla tua richiesta.</value> - <value xml:lang="ja">ãã®ã¡ã¼ã«ã¯ããªãããªã¯ã¨ã¹ãããããã®ã§ã</value> - <value xml:lang="nl">Deze email is verzonden naar aanleiding van uw verzoek.</value> - <value xml:lang="pt_BR">Este e-mail lhe foi enviado devido ao seu pedido</value> - <value xml:lang="th">à¸à¸³à¸£à¹à¸à¸à¸à¸à¸à¸à¸¸à¸à¸¡à¸µà¸à¸²à¸£à¸à¸à¸à¹à¸à¸à¸µà¹à¸¡à¸¥à¸à¸µà¹</value> - <value xml:lang="vi">ThÆ° Äiá»n tá» nà y Äá» phản há»i viá»c bạn yêu cầu muá»n có</value> - <value xml:lang="zh">è¿ä¸ªçµåé®ä»¶æ¯åçä½ è¦æ±ç</value> - <value xml:lang="zh_TW">æ¤é»åéµä»¶æ¯åè¦ä½ çè¦æ±ç</value> - </property> <property key="EcommerceToOrderCreateCustRequestFromCart"> <value xml:lang="da">For at bestille, opret kundeanmodning fra indkøbskurv</value> <value xml:lang="de">um einen Auftrag zu erstellen machen Sie eine Anfrage über den Warenkorb</value> Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/EmailGiftCardScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/EmailGiftCardScreens.xml?rev=1618415&r1=1618414&r2=1618415&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/widget/EmailGiftCardScreens.xml (original) +++ ofbiz/trunk/specialpurpose/ecommerce/widget/EmailGiftCardScreens.xml Sat Aug 16 20:53:55 2014 @@ -25,6 +25,8 @@ under the License. <section> <actions> <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control/"/> + <property-map resource="EcommerceUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> </actions> <widgets> <platform-specific><html><html-template location="component://ecommerce/templates/email/giftcardpurchase.ftl"/></html></platform-specific> @@ -35,6 +37,7 @@ under the License. <section> <actions> <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control/"/> + <property-map resource="EcommerceUiLabels" map-name="uiLabelMap" global="true"/> </actions> <widgets> <platform-specific><html><html-template location="component://ecommerce/templates/email/giftcardreload.ftl"/></html></platform-specific> Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/EmailReturnScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/EmailReturnScreens.xml?rev=1618415&r1=1618414&r2=1618415&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/widget/EmailReturnScreens.xml (original) +++ ofbiz/trunk/specialpurpose/ecommerce/widget/EmailReturnScreens.xml Sat Aug 16 20:53:55 2014 @@ -26,6 +26,7 @@ under the License. <actions> <!-- <set field="title" value="Order Confirmation Notice"/> --> <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control/"/> + <property-map resource="EcommerceUiLabels" map-name="uiLabelMap" global="true"/> <!-- <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/OrderStatus.groovy"/> --> </actions> <widgets> @@ -37,6 +38,7 @@ under the License. <section> <actions> <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control/"/> + <property-map resource="EcommerceUiLabels" map-name="uiLabelMap" global="true"/> </actions> <widgets> <platform-specific><html><html-template location="component://ecommerce/templates/email/returncancel.ftl"/></html></platform-specific> @@ -47,6 +49,7 @@ under the License. <section> <actions> <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control/"/> + <property-map resource="EcommerceUiLabels" map-name="uiLabelMap" global="true"/> </actions> <widgets> <platform-specific><html><html-template location="component://ecommerce/templates/email/returncomplete.ftl"/></html></platform-specific> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |