svn commit: r1759078 - in /ofbiz/trunk/applications/marketing: config/MarketingUiLabels.xml src/main/java/org/apache/ofbiz/sfa/vcard/VCard.java

[deepak]

Author: deepak
Date: Sat Sep  3 11:32:00 2016
New Revision: 1759078

URL: http://svn.apache.org/viewvc?rev=1759078&view=rev
Log:
(OFBIZ-8002) Applied patch from jira issue (conflict resolved manually)
=====================================
Add UI labels for success / error messages in marketing component
=====================================
Thanks Tanmay for your contribution.

Modified:
    ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml
    
ofbiz/trunk/applications/marketing/src/main/java/org/apache/ofbiz/sfa/vcard/VCard.java

Modified: ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml?rev=1759078&r1=1759077&r2=1759078&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml (original)
+++ ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml Sat Sep  3 
11:32:00 2016
@@ -837,6 +837,9 @@
         <value xml:lang="zh">安å…
¨é”™è¯¯ï¼šè¦è¿è¡Œ${resourceDescription}，你必须有 MARKETING_DELETE 或 
MARKETING_ADMIN 权限</value>
         <value xml:lang="zh-TW">安å…
¨éŒ¯èª¤:要執行${resourceDescription},你必須有 MARKETING_DELETE 或 
MARKETING_ADMIN 許可權</value>
     </property>
+    <property key="MarketingEmailFormatError">
+        <value xml:lang="en">${firstName} ${lastName} has 
${emailFormatErrMsg}</value>
+    </property>
     <property key="MarketingEmailStatusReport">
         <value xml:lang="de">E-Mail Statusbericht</value>
         <value xml:lang="en">Email Status Report</value>

Modified: 
ofbiz/trunk/applications/marketing/src/main/java/org/apache/ofbiz/sfa/vcard/VCard.java
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/src/main/java/org/apache/ofbiz/sfa/vcard/VCard.java?rev=1759078&r1=1759077&r2=1759078&view=diff
==============================================================================
--- 
ofbiz/trunk/applications/marketing/src/main/java/org/apache/ofbiz/sfa/vcard/VCard.java
 (original)
+++ 
ofbiz/trunk/applications/marketing/src/main/java/org/apache/ofbiz/sfa/vcard/VCard.java
 Sat Sep  3 11:32:00 2016
@@ -164,7 +164,8 @@ public class VCard {
                         //TODO change uncorrect labellisation
                         String emailFormatErrMsg = 
UtilProperties.getMessage(resourceError, "SfaImportVCardEmailFormatError", 
locale);
                         vCardReader.close();
-                        return 
ServiceUtil.returnError(structuredName.getGiven() + " " + 
structuredName.getFamily() + " has " + emailFormatErrMsg);
+                        return 
ServiceUtil.returnError(UtilProperties.getMessage(resourceError, 
"MarketingEmailFormatError", UtilMisc.toMap("firstName", 
structuredName.getGiven(), "lastName", structuredName.getFamily(), 
"emailFOrmatErrMsg", emailFormatErrMsg), locale));
+
                     }
                 }