From: Coleman Watts <coleman@civicrm.org>
Date: Wed, 6 Aug 2014 12:49:23 +0000 (+0100)
Subject: CRM-15028 - Fix participant import field labels
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=3cb8f9b20059f58478c1317e01abac24cc4cbabc;p=civicrm-core.git

CRM-15028 - Fix participant import field labels
---

diff --git a/CRM/Event/BAO/Participant.php b/CRM/Event/BAO/Participant.php
index 1348cb0bc5..bc959413a0 100644
--- a/CRM/Event/BAO/Participant.php
+++ b/CRM/Event/BAO/Participant.php
@@ -645,28 +645,34 @@ GROUP BY  participant.event_id
 
       $note = array(
         'participant_note' => array(
-          'title' => 'Participant Note',
+          'title' => ts('Participant Note'),
           'name' => 'participant_note',
           'headerPattern' => '/(participant.)?note$/i',
         ));
 
+      // Split status and status id into 2 fields
+      // Fixme: it would be better to leave as 1 field and intelligently handle both during import
       $participantStatus = array(
         'participant_status' => array(
-          'title' => 'Participant Status',
+          'title' => ts('Participant Status'),
           'name' => 'participant_status',
           'data_type' => CRM_Utils_Type::T_STRING,
         ));
+      $tmpFields['participant_status_id']['title'] = ts('Participant Status Id');
 
+      // Split role and role id into 2 fields
+      // Fixme: it would be better to leave as 1 field and intelligently handle both during import
       $participantRole = array(
         'participant_role' => array(
-          'title' => 'Participant Role',
+          'title' => ts('Participant Role'),
           'name' => 'participant_role',
           'data_type' => CRM_Utils_Type::T_STRING,
         ));
+      $tmpFields['participant_role_id']['title'] = ts('Participant Role Id');
 
       $eventType = array(
         'event_type' => array(
-          'title' => 'Event Type',
+          'title' => ts('Event Type'),
           'name' => 'event_type',
           'data_type' => CRM_Utils_Type::T_STRING,
         ));