CRM-15603 - More consistent use of 'Donations' vs 'Contributions'

diff --git a/CRM/Contact/Form/Search/Custom/ContribSYBNT.php b/CRM/Contact/Form/Search/Custom/ContribSYBNT.php
index fc698bb68844917c5ca8bce4cca5239e2a43b522..f52948f565ddec10d01d489107aca2aa8f4563f9 100644 (file)
--- a/CRM/Contact/Form/Search/Custom/ContribSYBNT.php
+++ b/CRM/Contact/Form/Search/Custom/ContribSYBNT.php
@@ -47,8 +47,8 @@ class CRM_Contact_Form_Search_Custom_ContribSYBNT implements CRM_Contact_Form_Se
     $this->_columns = array(
       ts('Contact ID') => 'contact_id',
       ts('Name') => 'display_name',
-      ts('Donation Count') => 'donation_count',
-      ts('Donation Amount') => 'donation_amount',
+      ts('Contribution Count') => 'donation_count',
+      ts('Contribution Amount') => 'donation_amount',
     );
 
     $this->_amounts = array('min_amount_1' => ts('Min Amount One'),

diff --git a/CRM/Contact/Form/Search/Custom/ContributionAggregate.php b/CRM/Contact/Form/Search/Custom/ContributionAggregate.php
index 9c953cf033ae40da436011620bd6d90a8a4cd20a..14ca2a2bc0f45f817be81da54dabf8b9c6b3d2ca 100644 (file)
--- a/CRM/Contact/Form/Search/Custom/ContributionAggregate.php
+++ b/CRM/Contact/Form/Search/Custom/ContributionAggregate.php
@@ -49,8 +49,8 @@ class CRM_Contact_Form_Search_Custom_ContributionAggregate implements CRM_Contac
     $this->_columns = array(
       ts('Contact ID') => 'contact_id',
       ts('Name') => 'sort_name',
-      ts('Donation Count') => 'donation_count',
-      ts('Donation Amount') => 'donation_amount',
+      ts('Contribution Count') => 'donation_count',
+      ts('Contribution Amount') => 'donation_amount',
     );
 
     // define component access permission needed

diff --git a/CRM/Report/Form/Contribute/Detail.php b/CRM/Report/Form/Contribute/Detail.php
index 25dfcb588a6d82bd1361d83b89ece3b4fecc1474..05412ac832c0502451b7997583e4684ff290777a 100644 (file)
--- a/CRM/Report/Form/Contribute/Detail.php
+++ b/CRM/Report/Form/Contribute/Detail.php
@@ -479,12 +479,12 @@ class CRM_Report_Form_Contribute_Detail extends CRM_Report_Form {
       $count += $dao->count;
     }
     $statistics['counts']['amount'] = array(
-      'title' => ts('Total Amount (Donations)'),
+      'title' => ts('Total Amount (Contributions)'),
       'value' => implode(',  ', $totalAmount),
       'type' => CRM_Utils_Type::T_STRING,
     );
     $statistics['counts']['count'] = array(
-      'title' => ts('Total Donations'),
+      'title' => ts('Total Contributions'),
       'value' => $count,
     );
     $statistics['counts']['avg'] = array(

diff --git a/CRM/Report/Form/Contribute/History.php b/CRM/Report/Form/Contribute/History.php
index 8f87fae6352c7a48987fc199cd0de1638096f4e0..a18fbbb2128d775e06df1783fe33d52bc40e5f52 100644 (file)
--- a/CRM/Report/Form/Contribute/History.php
+++ b/CRM/Report/Form/Contribute/History.php
@@ -210,7 +210,7 @@ class CRM_Report_Form_Contribute_History extends CRM_Report_Form {
           'receive_date' =>
           array('operatorType' => CRM_Report_Form::OP_DATE),
           'contribution_status_id' =>
-          array('title' => ts('Donation Status'),
+          array('title' => ts('Contribution Status'),
             'operatorType' => CRM_Report_Form::OP_MULTISELECT,
             'options' => CRM_Contribute_PseudoConstant::contributionStatus(),
             'default' => array(1),
@@ -221,7 +221,7 @@ class CRM_Report_Form_Contribute_History extends CRM_Report_Form {
             'options' => CRM_Contribute_PseudoConstant::financialType(),
           ),
           'total_amount' =>
-          array('title' => ts('Donation Amount'),
+          array('title' => ts('Contribution Amount'),
           ),
           'total_sum' =>
           array('title' => ts('Aggregate Amount'),

diff --git a/CRM/Report/Form/Contribute/PCP.php b/CRM/Report/Form/Contribute/PCP.php
index a62261a5741338918dd4cb0526e66649c1d80531..9c8369d2df0681dcbe0d56de757a32d969618d6e 100644 (file)
--- a/CRM/Report/Form/Contribute/PCP.php
+++ b/CRM/Report/Form/Contribute/PCP.php
@@ -178,10 +178,10 @@ class CRM_Report_Form_Contribute_PCP extends CRM_Report_Form {
             'required' => TRUE,
           ),
           'receive_date' =>
-          array('title' => ts('Most Recent Donation'),
+          array('title' => ts('Most Recent Contribution'),
             'default' => TRUE,
             'statistics' =>
-            array('max' => ts('Most Recent Donation'),
+            array('max' => ts('Most Recent Contribution'),
             ),
           ),
         ),

diff --git a/CRM/Report/Form/Contribute/Recur.php b/CRM/Report/Form/Contribute/Recur.php
index d09e0f96819e0ea0d6b44031e67f01dc6b9e65fd..10eac19de618ebd3cbc276b4e435b9a9b544183f 100644 (file)
--- a/CRM/Report/Form/Contribute/Recur.php
+++ b/CRM/Report/Form/Contribute/Recur.php
@@ -107,7 +107,7 @@ class CRM_Report_Form_Contribute_Recur extends CRM_Report_Form {
             'default' => TRUE,
           ),
           'contribution_status_id' => array(
-            'title' => ts('Donation Status'),
+            'title' => ts('Contribution Status'),
           ),
           'frequency_interval' => array(
             'title' => ts('Frequency interval'),
@@ -148,7 +148,7 @@ class CRM_Report_Form_Contribute_Recur extends CRM_Report_Form {
         ),
         'filters' => array(
           'contribution_status_id' => array(
-            'title' => ts('Donation Status'),
+            'title' => ts('Contribution Status'),
             'operatorType' => CRM_Report_Form::OP_MULTISELECT,
             'options' => CRM_Contribute_PseudoConstant::contributionStatus(),
             'default' => array(5),

diff --git a/CRM/Report/Form/Contribute/SoftCredit.php b/CRM/Report/Form/Contribute/SoftCredit.php
index 26867057bac44a6293b5c343cab47c4c4c9d3482..a71e11511236d5f5d812e307b76ef274687c867e 100644 (file)
--- a/CRM/Report/Form/Contribute/SoftCredit.php
+++ b/CRM/Report/Form/Contribute/SoftCredit.php
@@ -184,7 +184,7 @@ class CRM_Report_Form_Contribute_SoftCredit extends CRM_Report_Form {
             'default' => TRUE,
             'statistics' =>
             array('sum' => ts('Aggregate Amount'),
-              'count' => ts('Donations'),
+              'count' => ts('Contributions'),
               'avg' => ts('Average'),
             ),
           ),
@@ -202,13 +202,13 @@ class CRM_Report_Form_Contribute_SoftCredit extends CRM_Report_Form {
             'type' => CRM_Utils_Type::T_STRING,
           ),
           'contribution_status_id' =>
-          array('title' => ts('Donation Status'),
+          array('title' => ts('Contribution Status'),
             'operatorType' => CRM_Report_Form::OP_MULTISELECT,
             'options' => CRM_Contribute_PseudoConstant::contributionStatus(),
             'default' => array(1),
           ),
           'total_amount' =>
-          array('title' => ts('Donation Amount'),
+          array('title' => ts('Contribution Amount'),
           ),
         ),
       ),
@@ -448,7 +448,7 @@ GROUP BY   {$this->_aliases['civicrm_contribution']}.currency
       'type' => CRM_Utils_Type::T_STRING,
     );
     $statistics['counts']['count'] = array(
-      'title' => ts('Total Donations'),
+      'title' => ts('Total Contributions'),
       'value' => $count,
     );
     $statistics['counts']['avg'] = array(

diff --git a/CRM/Report/Form/Contribute/Summary.php b/CRM/Report/Form/Contribute/Summary.php
index 65ba268459f2c5b16687808f7cae82c45dc18f53..78a3108fae4d4ed2a6344cee25ed47b7d108786a 100644 (file)
--- a/CRM/Report/Form/Contribute/Summary.php
+++ b/CRM/Report/Form/Contribute/Summary.php
@@ -157,7 +157,7 @@ class CRM_Report_Form_Contribute_Summary extends CRM_Report_Form {
           'receive_date' =>
           array('operatorType' => CRM_Report_Form::OP_DATE),
           'contribution_status_id' =>
-          array('title' => ts('Donation Status'),
+          array('title' => ts('Contribution Status'),
             'operatorType' => CRM_Report_Form::OP_MULTISELECT,
             'options' => CRM_Contribute_PseudoConstant::contributionStatus(),
             'default' => array(1),
@@ -572,7 +572,7 @@ ROUND(AVG({$this->_aliases['civicrm_contribution_soft']}.amount), 2) as civicrm_
         'type' => CRM_Utils_Type::T_STRING,
       );
       $statistics['counts']['count'] = array(
-        'title' => ts('Total Donations'),
+        'title' => ts('Total Contributions'),
         'value' => $count,
       );
       $statistics['counts']['avg'] = array(

diff --git a/CRM/Report/Form/Contribute/TopDonor.php b/CRM/Report/Form/Contribute/TopDonor.php
index 5a41d22f9bc97570839e5be3758a374c2429dd32..f423b8e31045ccc9c8905ea56f5a9cb0cc611126 100644 (file)
--- a/CRM/Report/Form/Contribute/TopDonor.php
+++ b/CRM/Report/Form/Contribute/TopDonor.php
@@ -132,7 +132,7 @@ class CRM_Report_Form_Contribute_TopDonor extends CRM_Report_Form {
             'options' => CRM_Contribute_PseudoConstant::financialType() ,
           ),
           'contribution_status_id' =>
-          array('title' => ts('Donation Status'),
+          array('title' => ts('Contribution Status'),
             'operatorType' => CRM_Report_Form::OP_MULTISELECT,
             'options' => CRM_Contribute_PseudoConstant::contributionStatus(),
             'default' => array(1),

diff --git a/CRM/Report/Form/Member/Summary.php b/CRM/Report/Form/Member/Summary.php
index e684037a0f2e40ecded81adf953eb0f55def0d2b..cc01e69decfa809e48f852fc9f3490c7232620a4 100644 (file)
--- a/CRM/Report/Form/Member/Summary.php
+++ b/CRM/Report/Form/Member/Summary.php
@@ -431,7 +431,7 @@ GROUP BY    {$this->_aliases['civicrm_contribution']}.currency
       'type' => CRM_Utils_Type::T_STRING,
     );
     $statistics['counts']['count'] = array(
-      'title' => ts('Total Donations'),
+      'title' => ts('Total Contributions'),
       'value' => $count,
     );
     $statistics['counts']['memberCount'] = array(