From 341c643b40b1da08713eebe06c8d1e82b8667583 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Fri, 15 Mar 2019 11:49:42 +1300
Subject: [PATCH] Fix error message handling while we are at it

Turns out that instead of translating we are passing the error message to a truly silly function
---
 CRM/Contact/Import/Parser/Contact.php         |  4 ++++
 CRM/Contribute/Import/Parser/Contribution.php | 12 ++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/CRM/Contact/Import/Parser/Contact.php b/CRM/Contact/Import/Parser/Contact.php
index e742e11407..1c5fd1069c 100644
--- a/CRM/Contact/Import/Parser/Contact.php
+++ b/CRM/Contact/Import/Parser/Contact.php
@@ -1691,6 +1691,10 @@ class CRM_Contact_Import_Parser_Contact extends CRM_Contact_Import_Parser {
   /**
    * Build error-message containing error-fields
    *
+   * Once upon a time there was a dev who hadn't heard of implode. That dev wrote this function.
+   *
+   * @todo just say no!
+   *
    * @param string $errorName
    *   A string containing error-field name.
    * @param string $errorMessage
diff --git a/CRM/Contribute/Import/Parser/Contribution.php b/CRM/Contribute/Import/Parser/Contribution.php
index a528527f00..8d0ac22971 100644
--- a/CRM/Contribute/Import/Parser/Contribution.php
+++ b/CRM/Contribute/Import/Parser/Contribution.php
@@ -177,7 +177,7 @@ class CRM_Contribute_Import_Parser_Contribution extends CRM_Contribute_Import_Pa
     $errorMessage = NULL;
 
     //for date-Formats
-    $errorMessage = $this->formatDateFields($params);
+    $errorMessage = implode('; ', $this->formatDateFields($params));
     //date-Format part ends
 
     $params['contact_type'] = 'Contribution';
@@ -539,7 +539,7 @@ class CRM_Contribute_Import_Parser_Contribution extends CRM_Contribute_Import_Pa
    *   Error messages, if any.
    */
   public function formatDateFields(&$params) {
-    $errorMessage = NULL;
+    $errorMessage = [];
     $dateType = CRM_Core_Session::singleton()->get('dateTypes');
     foreach ($params as $key => $val) {
       if ($val) {
@@ -549,7 +549,7 @@ class CRM_Contribute_Import_Parser_Contribution extends CRM_Contribute_Import_Pa
               $params[$key] = $dateValue;
             }
             else {
-              CRM_Contact_Import_Parser_Contact::addToErrorMsg('Receive Date', $errorMessage);
+              $errorMessage[] = ts('Receive Date');
             }
             break;
 
@@ -558,7 +558,7 @@ class CRM_Contribute_Import_Parser_Contribution extends CRM_Contribute_Import_Pa
               $params[$key] = $dateValue;
             }
             else {
-              CRM_Contact_Import_Parser_Contact::addToErrorMsg('Cancel Date', $errorMessage);
+              $errorMessage[] = ts('Cancel Date');
             }
             break;
 
@@ -567,7 +567,7 @@ class CRM_Contribute_Import_Parser_Contribution extends CRM_Contribute_Import_Pa
               $params[$key] = $dateValue;
             }
             else {
-              CRM_Contact_Import_Parser_Contact::addToErrorMsg('Receipt date', $errorMessage);
+              $errorMessage[] = ts('Receipt date');
             }
             break;
 
@@ -576,7 +576,7 @@ class CRM_Contribute_Import_Parser_Contribution extends CRM_Contribute_Import_Pa
               $params[$key] = $dateValue;
             }
             else {
-              CRM_Contact_Import_Parser_Contact::addToErrorMsg('Thankyou Date', $errorMessage);
+              $errorMessage[] = ts('Thankyou Date');
             }
             break;
         }
-- 
2.25.1