From ccc29f8e783935c37020427479fdbd83c9bb9477 Mon Sep 17 00:00:00 2001 From: yashodha Date: Tue, 9 Aug 2016 16:39:10 +0530 Subject: [PATCH] CRM-18972: more translation fixes ---------------------------------------- * CRM-18972: List of strings that cannot be localized cause the absence of ts() function https://issues.civicrm.org/jira/browse/CRM-18972 --- CRM/Campaign/Form/Task/Interview.php | 4 +-- CRM/Contact/Form/Search/Custom/Sample.php | 2 +- CRM/Contribute/Form/AdditionalInfo.php | 2 +- CRM/Report/Form.php | 26 +++++++++---------- CRM/Report/Form/ActivitySummary.php | 6 ++--- CRM/Report/Form/Campaign/SurveyDetails.php | 2 +- CRM/Report/Form/Contact/Relationship.php | 9 +++---- CRM/Report/Form/Contribute/Sybunt.php | 18 +++++-------- CRM/Report/Form/Contribute/TopDonor.php | 2 +- CRM/Report/Form/Event/IncomeCountSummary.php | 8 +++--- .../Form/Event/ParticipantListCount.php | 10 +++---- CRM/Report/Form/Event/Summary.php | 2 +- CRM/Report/Form/Extended.php | 12 ++++----- CRM/Report/Form/Member/ContributionDetail.php | 2 +- CRM/Report/Form/Member/Detail.php | 6 ++--- CRM/Report/Form/Member/Summary.php | 8 +++--- CRM/Report/Form/Pledge/Detail.php | 10 +++---- CRM/Report/Form/Pledge/Pbnp.php | 6 ++--- CRM/Report/Form/Pledge/Summary.php | 10 +++---- 19 files changed, 70 insertions(+), 75 deletions(-) diff --git a/CRM/Campaign/Form/Task/Interview.php b/CRM/Campaign/Form/Task/Interview.php index c81abf33c9..b8103f9fe7 100644 --- a/CRM/Campaign/Form/Task/Interview.php +++ b/CRM/Campaign/Form/Task/Interview.php @@ -292,8 +292,8 @@ WHERE {$clause} for ($i = 1; $i < count($options); $i++) { $this->addElement('select', "order_bys[{$i}][column]", ts('Order by Column'), $options); $this->addElement('select', "order_bys[{$i}][order]", ts('Order by Order'), array( - 'ASC' => 'Ascending', - 'DESC' => 'Descending', + 'ASC' => ts('Ascending'), + 'DESC' => ts('Descending'), )); } diff --git a/CRM/Contact/Form/Search/Custom/Sample.php b/CRM/Contact/Form/Search/Custom/Sample.php index a6f8f0e562..9ef5b0c073 100644 --- a/CRM/Contact/Form/Search/Custom/Sample.php +++ b/CRM/Contact/Form/Search/Custom/Sample.php @@ -77,7 +77,7 @@ class CRM_Contact_Form_Search_Custom_Sample extends CRM_Contact_Form_Search_Cust /** * You can define a custom title for the search form */ - $this->setTitle('My Search Title'); + $this->setTitle(ts('My Search Title')); /** * if you are using the standard template, this array tells the template what elements diff --git a/CRM/Contribute/Form/AdditionalInfo.php b/CRM/Contribute/Form/AdditionalInfo.php index 33b6c8a7a1..0609f843b5 100644 --- a/CRM/Contribute/Form/AdditionalInfo.php +++ b/CRM/Contribute/Form/AdditionalInfo.php @@ -52,7 +52,7 @@ class CRM_Contribute_Form_AdditionalInfo { $dao->is_active = 1; $dao->find(); $min_amount = array(); - $sel1[0] = '-select product-'; + $sel1[0] = ts('-select product-'); while ($dao->fetch()) { $sel1[$dao->id] = $dao->name . " ( " . $dao->sku . " )"; $min_amount[$dao->id] = $dao->min_contribution; diff --git a/CRM/Report/Form.php b/CRM/Report/Form.php index a4c5898262..bfad41fa31 100644 --- a/CRM/Report/Form.php +++ b/CRM/Report/Form.php @@ -448,7 +448,7 @@ class CRM_Report_Form extends CRM_Core_Form { if (array_key_exists('civicrm_contact', $this->_columns)) { $this->_columns['civicrm_contact']['fields']['exposed_id'] = array( 'name' => 'id', - 'title' => 'Contact ID', + 'title' => ts('Contact ID'), 'no_repeat' => TRUE, ); } @@ -1223,13 +1223,13 @@ class CRM_Report_Form extends CRM_Core_Form { case CRM_Report_Form::OP_DATE: // build datetime fields - CRM_Core_Form_Date::buildDateRange($this, $fieldName, $count, '_from', '_to', 'From:', FALSE, $operations); + CRM_Core_Form_Date::buildDateRange($this, $fieldName, $count, '_from', '_to', ts('From:'), FALSE, $operations); $count++; break; case CRM_Report_Form::OP_DATETIME: // build datetime fields - CRM_Core_Form_Date::buildDateRange($this, $fieldName, $count, '_from', '_to', 'From:', FALSE, $operations, 'searchDate', TRUE); + CRM_Core_Form_Date::buildDateRange($this, $fieldName, $count, '_from', '_to', ts('From:'), FALSE, $operations, 'searchDate', TRUE); $count++; break; @@ -1305,12 +1305,12 @@ class CRM_Report_Form extends CRM_Core_Form { $this->assignTabs(); $this->sqlArray[] = $sql; foreach (array('LEFT JOIN') as $term) { - $sql = str_replace($term, '
  ' . $term, $sql); + $sql = str_replace($term, '
  ' . $term, $sql); } foreach (array('FROM', 'WHERE', 'GROUP BY', 'ORDER BY', 'LIMIT', ';') as $term) { - $sql = str_replace($term, '

' . $term, $sql); + $sql = str_replace($term, '

' . $term, $sql); } - $this->sql .= $sql . "
"; + $this->sql .= $sql . "
"; $this->assign('sql', $this->sql); } @@ -1447,8 +1447,8 @@ class CRM_Report_Form extends CRM_Core_Form { for ($i = 1; $i <= 5; $i++) { $this->addElement('select', "order_bys[{$i}][column]", ts('Order by Column'), $options); $this->addElement('select', "order_bys[{$i}][order]", ts('Order by Order'), array( - 'ASC' => 'Ascending', - 'DESC' => 'Descending', + 'ASC' => ts('Ascending'), + 'DESC' => ts('Descending'), )); $this->addElement('checkbox', "order_bys[{$i}][section]", ts('Order by Section'), FALSE, array('id' => "order_by_section_$i")); $this->addElement('checkbox', "order_bys[{$i}][pageBreak]", ts('Page Break'), FALSE, array('id' => "order_by_pagebreak_$i")); @@ -2135,7 +2135,7 @@ WHERE cg.extends IN ('" . implode("','", $this->_customGroupExtends) . "') AND } elseif (isset($this->_columnHeaders[$colName])) { if ($subtotal) { - $row[$colName] = "Subtotal"; + $row[$colName] = ts('Subtotal'); $subtotal = FALSE; } else { @@ -2608,7 +2608,8 @@ WHERE cg.extends IN ('" . implode("','", $this->_customGroupExtends) . "') AND /** * BeginPostProcess function run in both report mode and non-report mode (api). */ - public function beginPostProcessCommon() {} + public function beginPostProcessCommon() { + } /** * Build the report query. @@ -3576,8 +3577,7 @@ ORDER BY cg.weight, cf.weight"; case 'Boolean': $curFilters[$fieldName]['operatorType'] = CRM_Report_Form::OP_SELECT; - $curFilters[$fieldName]['options'] = array('' => ts('- select -')) - + CRM_Core_PseudoConstant::get('CRM_Core_BAO_CustomField', 'custom_' . $customDAO->cf_id, array(), 'search'); + $curFilters[$fieldName]['options'] = array('' => ts('- select -')) + CRM_Core_PseudoConstant::get('CRM_Core_BAO_CustomField', 'custom_' . $customDAO->cf_id, array(), 'search'); $curFilters[$fieldName]['type'] = CRM_Utils_Type::T_INT; break; @@ -4065,7 +4065,7 @@ LEFT JOIN civicrm_contact {$field['alias']} ON {$field['alias']}.id = {$this->_a if ($orderBy) { $addressFields['civicrm_address']['order_bys'] = array( 'street_name' => array('title' => ts('Street Name')), - 'street_number' => array('title' => 'Odd / Even Street Number'), + 'street_number' => array('title' => ts('Odd / Even Street Number')), 'street_address' => NULL, 'city' => NULL, 'postal_code' => NULL, diff --git a/CRM/Report/Form/ActivitySummary.php b/CRM/Report/Form/ActivitySummary.php index 43c2169719..fc83ff1e51 100644 --- a/CRM/Report/Form/ActivitySummary.php +++ b/CRM/Report/Form/ActivitySummary.php @@ -79,7 +79,7 @@ class CRM_Report_Form_ActivitySummary extends CRM_Report_Form { 'dao' => 'CRM_Core_DAO_Email', 'fields' => array( 'email' => array( - 'title' => 'Email', + 'title' => ts('Email'), ), ), 'order_bys' => array( @@ -93,7 +93,7 @@ class CRM_Report_Form_ActivitySummary extends CRM_Report_Form { 'dao' => 'CRM_Core_DAO_Email', 'fields' => array( 'phone' => array( - 'title' => 'Phone', + 'title' => ts('Phone'), ), ), 'grouping' => 'contact-fields', @@ -632,7 +632,7 @@ class CRM_Report_Form_ActivitySummary extends CRM_Report_Form { public function modifyColumnHeaders() { //CRM-16719 modify name of column if (!empty($this->_columnHeaders['civicrm_activity_status_id'])) { - $this->_columnHeaders['civicrm_activity_status_id']['title'] = "Status"; + $this->_columnHeaders['civicrm_activity_status_id']['title'] = ts('Status'); } } diff --git a/CRM/Report/Form/Campaign/SurveyDetails.php b/CRM/Report/Form/Campaign/SurveyDetails.php index 529f98c590..1e2ed8fc81 100644 --- a/CRM/Report/Form/Campaign/SurveyDetails.php +++ b/CRM/Report/Form/Campaign/SurveyDetails.php @@ -223,7 +223,7 @@ class CRM_Report_Form_Campaign_SurveyDetails extends CRM_Report_Form { 'name' => 'street_number', 'dbAlias' => 'address_civireport.street_number%2', ), - 'street_number' => array('title' => 'Street Number'), + 'street_number' => array('title' => ts('Street Number')), ), 'grouping' => 'location-fields', ), diff --git a/CRM/Report/Form/Contact/Relationship.php b/CRM/Report/Form/Contact/Relationship.php index 7d84f079a6..61f86667a0 100644 --- a/CRM/Report/Form/Contact/Relationship.php +++ b/CRM/Report/Form/Contact/Relationship.php @@ -231,9 +231,9 @@ class CRM_Report_Form_Contact_Relationship extends CRM_Report_Form { 'title' => ts('Relationship Status'), 'operatorType' => CRM_Report_Form::OP_SELECT, 'options' => array( - '' => '- Any -', - 1 => 'Active', - 0 => 'Inactive', + '' => ts('- Any -'), + 1 => ts('Active'), + 0 => ts('Inactive'), ), 'type' => CRM_Utils_Type::T_INT, ), @@ -522,8 +522,7 @@ class CRM_Report_Form_Contact_Relationship extends CRM_Report_Form { //for displaying relationship type filter if ($value['title'] == 'Relationship') { $relTypes = CRM_Core_PseudoConstant::relationshipType(); - $op = CRM_Utils_Array::value('relationship_type_id_op', $this->_params) == 'in' ? - ts('Is one of') . ' ' : ts('Is not one of') . ' '; + $op = CRM_Utils_Array::value('relationship_type_id_op', $this->_params) == 'in' ? ts('Is one of') . ' ' : ts('Is not one of') . ' '; $relationshipTypes = array(); foreach ($this->_params['relationship_type_id_value'] as $relationship) { $relationshipTypes[] = $relTypes[$relationship]['label_' . $this->relationType]; diff --git a/CRM/Report/Form/Contribute/Sybunt.php b/CRM/Report/Form/Contribute/Sybunt.php index a38f5116ff..5d5b30a8f4 100644 --- a/CRM/Report/Form/Contribute/Sybunt.php +++ b/CRM/Report/Form/Contribute/Sybunt.php @@ -281,7 +281,7 @@ class CRM_Report_Form_Contribute_Sybunt extends CRM_Report_Form { $select[] = "SUM({$field['dbAlias']}) as {$tableName}_{$fieldName}"; $this->_columnHeaders["civicrm_upto_{$upTo_year}"]['type'] = $field['type']; - $this->_columnHeaders["civicrm_upto_{$upTo_year}"]['title'] = "Up To $upTo_year"; + $this->_columnHeaders["civicrm_upto_{$upTo_year}"]['title'] = ts("Up To %1", array(1 => $upTo_year)); $this->_columnHeaders["year_{$previous_ppyear}"]['type'] = $field['type']; $this->_columnHeaders["year_{$previous_ppyear}"]['title'] = $previous_ppyear; @@ -293,7 +293,7 @@ class CRM_Report_Form_Contribute_Sybunt extends CRM_Report_Form { $this->_columnHeaders["year_{$previous_year}"]['title'] = $previous_year; $this->_columnHeaders["civicrm_life_time_total"]['type'] = $field['type']; - $this->_columnHeaders["civicrm_life_time_total"]['title'] = 'LifeTime';; + $this->_columnHeaders["civicrm_life_time_total"]['title'] = ts('LifeTime'); } elseif ($fieldName == 'receive_date') { $select[] = self::fiscalYearOffset($field['dbAlias']) . @@ -420,7 +420,7 @@ class CRM_Report_Form_Contribute_Sybunt extends CRM_Report_Form { if ($dao->fetch()) { $statistics['counts']['amount'] = array( 'value' => $dao->amount, - 'title' => 'Total LifeTime', + 'title' => ts('Total LifeTime'), 'type' => CRM_Utils_Type::T_MONEY, ); } @@ -526,17 +526,13 @@ class CRM_Report_Form_Contribute_Sybunt extends CRM_Report_Form { foreach ($rows as $key => $row) { $display["upto_{$upto}"] - = CRM_Utils_Array::value("upto_{$upto}", $display) - + CRM_Utils_Array::value("civicrm_upto_{$upto}", $row); + = CRM_Utils_Array::value("upto_{$upto}", $display) + CRM_Utils_Array::value("civicrm_upto_{$upto}", $row); $display[$previous_year] - = CRM_Utils_Array::value($previous_year, $display) - + CRM_Utils_Array::value($previous_year, $row); + = CRM_Utils_Array::value($previous_year, $display) + CRM_Utils_Array::value($previous_year, $row); $display[$previous_two_year] - = CRM_Utils_Array::value($previous_two_year, $display) - + CRM_Utils_Array::value($previous_two_year, $row); + = CRM_Utils_Array::value($previous_two_year, $display) + CRM_Utils_Array::value($previous_two_year, $row); $display[$previous_three_year] - = CRM_Utils_Array::value($previous_three_year, $display) - + CRM_Utils_Array::value($previous_three_year, $row); + = CRM_Utils_Array::value($previous_three_year, $display) + CRM_Utils_Array::value($previous_three_year, $row); } $graphRows['value'] = $display; diff --git a/CRM/Report/Form/Contribute/TopDonor.php b/CRM/Report/Form/Contribute/TopDonor.php index 02362cd317..2481484ea6 100644 --- a/CRM/Report/Form/Contribute/TopDonor.php +++ b/CRM/Report/Form/Contribute/TopDonor.php @@ -164,7 +164,7 @@ class CRM_Report_Form_Contribute_TopDonor extends CRM_Report_Form { 'operatorType' => CRM_Report_Form::OP_DATE, ), 'currency' => array( - 'title' => 'Currency', + 'title' => ts('Currency'), 'operatorType' => CRM_Report_Form::OP_MULTISELECT, 'options' => CRM_Core_OptionGroup::values('currencies_enabled'), 'default' => NULL, diff --git a/CRM/Report/Form/Event/IncomeCountSummary.php b/CRM/Report/Form/Event/IncomeCountSummary.php index fedf49585f..93c9793e98 100644 --- a/CRM/Report/Form/Event/IncomeCountSummary.php +++ b/CRM/Report/Form/Event/IncomeCountSummary.php @@ -65,7 +65,7 @@ class CRM_Report_Form_Event_IncomeCountSummary extends CRM_Report_Form_Event { 'required' => TRUE, ), 'id' => array( - 'title' => 'Event ID', + 'title' => ts('Event ID'), 'no_display' => TRUE, 'required' => TRUE, ), @@ -285,17 +285,17 @@ class CRM_Report_Form_Event_IncomeCountSummary extends CRM_Report_Form_Event { } $statistics['counts']['count'] = array( 'value' => $dao->count, - 'title' => 'Total Participants', + 'title' => ts('Total Participants'), 'type' => CRM_Utils_Type::T_INT, ); $statistics['counts']['amount'] = array( 'value' => $dao->amount, - 'title' => 'Total Income', + 'title' => ts('Total Income'), 'type' => CRM_Utils_Type::T_MONEY, ); $statistics['counts']['avg'] = array( 'value' => $avg, - 'title' => 'Average', + 'title' => ts('Average'), 'type' => CRM_Utils_Type::T_MONEY, ); } diff --git a/CRM/Report/Form/Event/ParticipantListCount.php b/CRM/Report/Form/Event/ParticipantListCount.php index bc95ee0b41..a472ed982d 100644 --- a/CRM/Report/Form/Event/ParticipantListCount.php +++ b/CRM/Report/Form/Event/ParticipantListCount.php @@ -149,7 +149,7 @@ class CRM_Report_Form_Event_ParticipantListCount extends CRM_Report_Form_Event { 'required' => TRUE, ), 'organization_name' => array( - 'title' => 'Employer', + 'title' => ts('Employer'), 'default' => TRUE, 'no_repeat' => TRUE, ), @@ -362,17 +362,17 @@ class CRM_Report_Form_Event_ParticipantListCount extends CRM_Report_Form_Event { } $statistics['counts']['count'] = array( 'value' => $dao->count, - 'title' => 'Total Participants', + 'title' => ts('Total Participants'), 'type' => CRM_Utils_Type::T_INT, ); $statistics['counts']['amount'] = array( 'value' => $dao->amount, - 'title' => 'Total Income', + 'title' => ts('Total Income'), 'type' => CRM_Utils_Type::T_MONEY, ); - $statistics['counts']['avg '] = array( + $statistics['counts']['avg'] = array( 'value' => $avg, - 'title' => 'Average', + 'title' => ts('Average'), 'type' => CRM_Utils_Type::T_MONEY, ); } diff --git a/CRM/Report/Form/Event/Summary.php b/CRM/Report/Form/Event/Summary.php index 247e33ceec..9d1e223444 100644 --- a/CRM/Report/Form/Event/Summary.php +++ b/CRM/Report/Form/Event/Summary.php @@ -283,7 +283,7 @@ class CRM_Report_Form_Event_Summary extends CRM_Report_Form_Event { 'type' => CRM_Utils_Type::T_INT, ); $this->_columnHeaders['totalAmount'] = array( - 'title' => 'Total Income', + 'title' => ts('Total Income'), 'type' => CRM_Utils_Type::T_STRING, ); } diff --git a/CRM/Report/Form/Extended.php b/CRM/Report/Form/Extended.php index 92c6fd7481..886cf569c0 100644 --- a/CRM/Report/Form/Extended.php +++ b/CRM/Report/Form/Extended.php @@ -315,7 +315,7 @@ class CRM_Report_Form_Extended extends CRM_Report_Form { 'civicrm_participant' => array( 'dao' => 'CRM_Event_DAO_Participant', 'fields' => array( - 'participant_id' => array('title' => 'Participant ID'), + 'participant_id' => array('title' => ts('Participant ID')), 'participant_record' => array( 'name' => 'id', 'title' => ts('Participant ID'), @@ -358,7 +358,7 @@ class CRM_Report_Form_Extended extends CRM_Report_Form { 'options' => CRM_Event_PseudoConstant::participantRole(), ), 'participant_register_date' => array( - 'title' => ' Registration Date', + 'title' => ts('Registration Date'), 'operatorType' => CRM_Report_Form::OP_DATE, ), ), @@ -386,12 +386,12 @@ class CRM_Report_Form_Extended extends CRM_Report_Form { 'grouping' => 'member-fields', 'fields' => array( 'membership_type_id' => array( - 'title' => 'Membership Type', + 'title' => ts('Membership Type'), 'required' => TRUE, 'alter_display' => 'alterMembershipTypeID', ), 'status_id' => array( - 'title' => 'Membership Status', + 'title' => ts('Membership Status'), 'required' => TRUE, 'alter_display' => 'alterMembershipStatusID', ), @@ -520,7 +520,7 @@ class CRM_Report_Form_Extended extends CRM_Report_Form { 'title' => ts('Payment Method'), 'alter_display' => 'alterPaymentType', ), - 'source' => array('title' => 'Contribution Source'), + 'source' => array('title' => ts('Contribution Source')), 'trxn_id' => NULL, 'receive_date' => array('default' => TRUE), 'receipt_date' => NULL, @@ -566,7 +566,7 @@ class CRM_Report_Form_Extended extends CRM_Report_Form { 'title' => ts('Individual Contribution'), 'name' => 'id', ), - 'source' => array('title' => 'Contribution Source'), + 'source' => array('title' => ts('Contribution Source')), ), 'grouping' => 'contribution-fields', ), diff --git a/CRM/Report/Form/Member/ContributionDetail.php b/CRM/Report/Form/Member/ContributionDetail.php index 6a6639d4ad..a66b96dfe5 100644 --- a/CRM/Report/Form/Member/ContributionDetail.php +++ b/CRM/Report/Form/Member/ContributionDetail.php @@ -199,7 +199,7 @@ class CRM_Report_Form_Member_ContributionDetail extends CRM_Report_Form { 'options' => CRM_Contribute_PseudoConstant::financialType(), ), 'currency' => array( - 'title' => 'Currency', + 'title' => ts('Currency'), 'operatorType' => CRM_Report_Form::OP_MULTISELECT, 'options' => CRM_Core_OptionGroup::values('currencies_enabled'), 'default' => NULL, diff --git a/CRM/Report/Form/Member/Detail.php b/CRM/Report/Form/Member/Detail.php index fde2da1993..4cc84f6ab2 100644 --- a/CRM/Report/Form/Member/Detail.php +++ b/CRM/Report/Form/Member/Detail.php @@ -86,7 +86,7 @@ class CRM_Report_Form_Member_Detail extends CRM_Report_Form { 'dao' => 'CRM_Member_DAO_Membership', 'fields' => array( 'membership_type_id' => array( - 'title' => 'Membership Type', + 'title' => ts('Membership Type'), 'required' => TRUE, 'no_repeat' => TRUE, ), @@ -102,7 +102,7 @@ class CRM_Report_Form_Member_Detail extends CRM_Report_Form { 'title' => ts('Join Date'), 'default' => TRUE, ), - 'source' => array('title' => 'Source'), + 'source' => array('title' => ts('Source')), ), 'filters' => array( 'join_date' => array('operatorType' => CRM_Report_Form::OP_DATE), @@ -206,7 +206,7 @@ class CRM_Report_Form_Member_Detail extends CRM_Report_Form { 'type' => CRM_Utils_Type::T_INT, ), 'currency' => array( - 'title' => 'Currency', + 'title' => ts('Currency'), 'operatorType' => CRM_Report_Form::OP_MULTISELECT, 'options' => CRM_Core_OptionGroup::values('currencies_enabled'), 'default' => NULL, diff --git a/CRM/Report/Form/Member/Summary.php b/CRM/Report/Form/Member/Summary.php index 8bbba645b1..56953dc98c 100644 --- a/CRM/Report/Form/Member/Summary.php +++ b/CRM/Report/Form/Member/Summary.php @@ -71,7 +71,7 @@ class CRM_Report_Form_Member_Summary extends CRM_Report_Form { 'grouping' => 'member-fields', 'fields' => array( 'membership_type_id' => array( - 'title' => 'Membership Type', + 'title' => ts('Membership Type'), 'required' => TRUE, ), ), @@ -120,7 +120,7 @@ class CRM_Report_Form_Member_Summary extends CRM_Report_Form { 'type' => 12, ), 'membership_type_id' => array( - 'title' => 'Membership Type', + 'title' => ts('Membership Type'), 'default' => TRUE, 'chart' => TRUE, ), @@ -159,7 +159,7 @@ class CRM_Report_Form_Member_Summary extends CRM_Report_Form { ), 'filters' => array( 'currency' => array( - 'title' => 'Currency', + 'title' => ts('Currency'), 'operatorType' => CRM_Report_Form::OP_MULTISELECT, 'options' => CRM_Core_OptionGroup::values('currencies_enabled'), 'default' => NULL, @@ -179,7 +179,7 @@ class CRM_Report_Form_Member_Summary extends CRM_Report_Form { // If we have a campaign, build out the relevant elements if ($campaignEnabled && !empty($this->activeCampaigns)) { $this->_columns['civicrm_membership']['fields']['campaign_id'] = array( - 'title' => 'Campaign', + 'title' => ts('Campaign'), 'default' => 'false', ); $this->_columns['civicrm_membership']['filters']['campaign_id'] = array( diff --git a/CRM/Report/Form/Pledge/Detail.php b/CRM/Report/Form/Pledge/Detail.php index b504d1905b..af3a6a2c47 100644 --- a/CRM/Report/Form/Pledge/Detail.php +++ b/CRM/Report/Form/Pledge/Detail.php @@ -137,7 +137,7 @@ class CRM_Report_Form_Pledge_Detail extends CRM_Report_Form { ), 'filters' => array( 'pledge_create_date' => array( - 'title' => 'Pledge Made Date', + 'title' => ts('Pledge Made Date'), 'operatorType' => CRM_Report_Form::OP_DATE, ), 'pledge_amount' => array( @@ -145,7 +145,7 @@ class CRM_Report_Form_Pledge_Detail extends CRM_Report_Form { 'operatorType' => CRM_Report_Form::OP_INT, ), 'currency' => array( - 'title' => 'Currency', + 'title' => ts('Currency'), 'operatorType' => CRM_Report_Form::OP_MULTISELECT, 'options' => CRM_Core_OptionGroup::values('currencies_enabled'), 'default' => NULL, @@ -189,7 +189,7 @@ class CRM_Report_Form_Pledge_Detail extends CRM_Report_Form { $this->_tagFilter = TRUE; if ($campaignEnabled && !empty($this->activeCampaigns)) { $this->_columns['civicrm_pledge']['fields']['campaign_id'] = array( - 'title' => 'Campaign', + 'title' => ts('Campaign'), 'default' => 'false', ); $this->_columns['civicrm_pledge']['filters']['campaign_id'] = array( @@ -435,11 +435,11 @@ class CRM_Report_Form_Pledge_Detail extends CRM_Report_Form { // Add Special headers $this->_columnHeaders['scheduled_date'] = array( 'type' => CRM_Utils_Type::T_DATE, - 'title' => 'Next Payment Due', + 'title' => ts('Next Payment Due'), ); $this->_columnHeaders['scheduled_amount'] = array( 'type' => CRM_Utils_Type::T_MONEY, - 'title' => 'Next Payment Amount', + 'title' => ts('Next Payment Amount'), ); $this->_columnHeaders['status_id'] = NULL; diff --git a/CRM/Report/Form/Pledge/Pbnp.php b/CRM/Report/Form/Pledge/Pbnp.php index 5bbf9d13d6..2d349bb69c 100644 --- a/CRM/Report/Form/Pledge/Pbnp.php +++ b/CRM/Report/Form/Pledge/Pbnp.php @@ -115,7 +115,7 @@ class CRM_Report_Form_Pledge_Pbnp extends CRM_Report_Form { 'operatorType' => CRM_Report_Form::OP_INT, ), 'currency' => array( - 'title' => 'Currency', + 'title' => ts('Currency'), 'operatorType' => CRM_Report_Form::OP_MULTISELECT, 'options' => CRM_Core_OptionGroup::values('currencies_enabled'), 'default' => NULL, @@ -151,7 +151,7 @@ class CRM_Report_Form_Pledge_Pbnp extends CRM_Report_Form { ), 'scheduled_amount' => array( 'type' => CRM_Utils_Type::T_MONEY, - 'title' => 'Next Payment Amount', + 'title' => ts('Next Payment Amount'), ), ), 'filters' => array( @@ -203,7 +203,7 @@ class CRM_Report_Form_Pledge_Pbnp extends CRM_Report_Form { // If we have a campaign, build out the relevant elements if ($campaignEnabled && !empty($this->activeCampaigns)) { $this->_columns['civicrm_pledge']['fields']['campaign_id'] = array( - 'title' => 'Campaign', + 'title' => ts('Campaign'), 'default' => 'false', ); $this->_columns['civicrm_pledge']['filters']['campaign_id'] = array( diff --git a/CRM/Report/Form/Pledge/Summary.php b/CRM/Report/Form/Pledge/Summary.php index 6fa2d37d64..3abdbca706 100644 --- a/CRM/Report/Form/Pledge/Summary.php +++ b/CRM/Report/Form/Pledge/Summary.php @@ -125,7 +125,7 @@ class CRM_Report_Form_Pledge_Summary extends CRM_Report_Form { ), 'filters' => array( 'pledge_create_date' => array( - 'title' => 'Pledge Made Date', + 'title' => ts('Pledge Made Date'), 'operatorType' => CRM_Report_Form::OP_DATE, ), 'pledge_amount' => array( @@ -133,7 +133,7 @@ class CRM_Report_Form_Pledge_Summary extends CRM_Report_Form { 'operatorType' => CRM_Report_Form::OP_INT, ), 'currency' => array( - 'title' => 'Currency', + 'title' => ts('Currency'), 'operatorType' => CRM_Report_Form::OP_MULTISELECT, 'options' => CRM_Core_OptionGroup::values('currencies_enabled'), 'default' => NULL, @@ -306,16 +306,16 @@ class CRM_Report_Form_Pledge_Summary extends CRM_Report_Form { if ($dao->fetch()) { $statistics['count']['amount'] = array( 'value' => $dao->amount, - 'title' => 'Total Pledged', + 'title' => ts('Total Pledged'), 'type' => CRM_Utils_Type::T_MONEY, ); $statistics['count']['count '] = array( 'value' => $dao->count, - 'title' => 'Total No Pledges', + 'title' => ts('Total No Pledges'), ); $statistics['count']['avg '] = array( 'value' => $dao->avg, - 'title' => 'Average', + 'title' => ts('Average'), 'type' => CRM_Utils_Type::T_MONEY, ); } -- 2.25.1