From: Dave Greenberg <dave@civicrm.org>
Date: Thu, 10 Sep 2015 23:06:23 +0000 (-0700)
Subject: Merge pull request #6412 from colemanw/CRM-11369
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=b59f68f08d7d428cb3622cfdf94b526c4d515928;p=civicrm-core.git

Merge pull request #6412 from colemanw/CRM-11369

CRM-11369 - Changed to Pending (pay later) and Pending (incomplete transaction)
---

b59f68f08d7d428cb3622cfdf94b526c4d515928
diff --cc CRM/Upgrade/Incremental/sql/4.7.alpha1.mysql.tpl
index 6e83b5981e,51714e9b45..37a2a475e8
--- a/CRM/Upgrade/Incremental/sql/4.7.alpha1.mysql.tpl
+++ b/CRM/Upgrade/Incremental/sql/4.7.alpha1.mysql.tpl
@@@ -20,8 -20,11 +20,12 @@@ UPDATE civicrm_option_value SET {locali
  UPDATE civicrm_option_value SET {localize field="label"}label = 'Activity Summary Report'{/localize}
    WHERE value = 'activitySummary' AND option_group_id = @option_group_id_report;
  
+ --CRM-11369
+ UPDATE civicrm_participant_status_type SET label = {localize field='label'}label = 'Pending (pay later)'{/localize} WHERE name = 'Pending from pay later';
+ UPDATE civicrm_participant_status_type SET label = {localize field='label'}label = 'Pending (incomplete transaction)'{/localize} WHERE name = 'Pending from incomplete transaction';
+ 
  --CRM-16853 PCP Owner Notification
 +--CRM-16853 Contribution Invoice Receipt Translation
  
  {include file='../CRM/Upgrade/4.7.alpha1.msg_template/civicrm_msg_template.tpl'}