From ba8f6a69d2ead5a824ed13ee3d77e8f011fa2ef1 Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Sun, 1 Mar 2015 21:24:11 -0500 Subject: [PATCH] Don't translate empty strings That was... silly. --- CRM/Contact/Form/Search/Criteria.php | 2 +- CRM/Contact/Form/Search/Custom/ActivitySearch.php | 6 +++--- CRM/Contact/Form/Search/Custom/Basic.php | 2 +- CRM/Contribute/Form/ContributionPage/Settings.php | 2 +- CRM/Core/Block.php | 2 +- CRM/Core/Form/RecurringEntity.php | 2 +- CRM/Grant/BAO/Query.php | 8 ++++---- CRM/Upgrade/Form.php | 2 +- .../org.civicrm.search.activity/ActivitySearch.php | 6 +++--- tools/extensions/org.civicrm.search.basic/Basic.php | 5 +++-- 10 files changed, 19 insertions(+), 18 deletions(-) diff --git a/CRM/Contact/Form/Search/Criteria.php b/CRM/Contact/Form/Search/Criteria.php index 8578b763af..74d449c9bc 100644 --- a/CRM/Contact/Form/Search/Criteria.php +++ b/CRM/Contact/Form/Search/Criteria.php @@ -255,7 +255,7 @@ class CRM_Contact_Form_Search_Criteria { $commPreff[] = $form->createElement('advcheckbox', $k, NULL, $v); } - $onHold[] = $form->createElement('advcheckbox', 'on_hold', NULL, ts('')); + $onHold[] = $form->createElement('advcheckbox', 'on_hold', NULL, ''); $form->addGroup($onHold, 'email_on_hold', ts('Email On Hold')); $form->addGroup($commPreff, 'preferred_communication_method', ts('Preferred Communication Method')); diff --git a/CRM/Contact/Form/Search/Custom/ActivitySearch.php b/CRM/Contact/Form/Search/Custom/ActivitySearch.php index daa784f8bb..c051ce0d0d 100644 --- a/CRM/Contact/Form/Search/Custom/ActivitySearch.php +++ b/CRM/Contact/Form/Search/Custom/ActivitySearch.php @@ -55,9 +55,9 @@ class CRM_Contact_Form_Search_Custom_ActivitySearch implements CRM_Contact_Form_ ts('Activity Subject') => 'activity_subject', ts('Scheduled By') => 'source_contact', ts('Scheduled Date') => 'activity_date', - ts(' ') => 'activity_id', - ts(' ') => 'activity_type_id', - ts(' ') => 'case_id', + ' ' => 'activity_id', + ' ' => 'activity_type_id', + ' ' => 'case_id', ts('Location') => 'location', ts('Duration') => 'duration', ts('Details') => 'details', diff --git a/CRM/Contact/Form/Search/Custom/Basic.php b/CRM/Contact/Form/Search/Custom/Basic.php index 0823a8ba0e..5a71382d5b 100644 --- a/CRM/Contact/Form/Search/Custom/Basic.php +++ b/CRM/Contact/Form/Search/Custom/Basic.php @@ -47,7 +47,7 @@ class CRM_Contact_Form_Search_Custom_Basic extends CRM_Contact_Form_Search_Custo $this->normalize(); $this->_columns = array( - ts('') => 'contact_type', + '' => 'contact_type', ts('Name') => 'sort_name', ts('Address') => 'street_address', ts('City') => 'city', diff --git a/CRM/Contribute/Form/ContributionPage/Settings.php b/CRM/Contribute/Form/ContributionPage/Settings.php index eaade9d0a1..8719d6652c 100644 --- a/CRM/Contribute/Form/ContributionPage/Settings.php +++ b/CRM/Contribute/Form/ContributionPage/Settings.php @@ -164,7 +164,7 @@ class CRM_Contribute_Form_ContributionPage_Settings extends CRM_Contribute_Form_ $options = array(); $options[] = $this->createElement('radio', NULL, NULL, ts('Optional'), 1); $options[] = $this->createElement('radio', NULL, NULL, ts('Required'), 2); - $this->addGroup($options, 'is_for_organization', ts('')); + $this->addGroup($options, 'is_for_organization', ''); $this->add('textarea', 'for_organization', ts('On behalf of Label'), $attributes['for_organization']); // collect goal amount diff --git a/CRM/Core/Block.php b/CRM/Core/Block.php index 569f055212..662e756b9e 100644 --- a/CRM/Core/Block.php +++ b/CRM/Core/Block.php @@ -90,7 +90,7 @@ class CRM_Core_Block { self::CREATE_NEW => array( 'template' => 'CreateNew.tpl', 'info' => ts('CiviCRM Create New Record'), - 'subject' => ts(''), + 'subject' => '', 'active' => TRUE, 'cache' => BLOCK_CACHE_GLOBAL, 'visibility' => 1, diff --git a/CRM/Core/Form/RecurringEntity.php b/CRM/Core/Form/RecurringEntity.php index de26da8a7d..babbb9ec96 100644 --- a/CRM/Core/Form/RecurringEntity.php +++ b/CRM/Core/Form/RecurringEntity.php @@ -209,7 +209,7 @@ class CRM_Core_Form_RecurringEntity { '2' => ts('On'), ); $form->addRadio('ends', ts("Ends"), $eoptionTypes, array(), NULL); - $form->add('text', 'start_action_offset', ts(''), array('size' => 3, 'maxlength' => 2)); + $form->add('text', 'start_action_offset', '', array('size' => 3, 'maxlength' => 2)); $form->addFormRule(array('CRM_Core_Form_RecurringEntity', 'formRule')); $form->addDate('repeat_absolute_date', ts('On'), FALSE, array('formatType' => 'mailing')); $form->add('text', 'exclude_date_list', ts('Exclude Dates'), array( diff --git a/CRM/Grant/BAO/Query.php b/CRM/Grant/BAO/Query.php index f10860f476..db3abfba0e 100644 --- a/CRM/Grant/BAO/Query.php +++ b/CRM/Grant/BAO/Query.php @@ -378,22 +378,22 @@ class CRM_Grant_BAO_Query { $form->addDate('grant_application_received_date_low', ts('App. Received Date - From'), FALSE, array('formatType' => 'searchDate')); $form->addDate('grant_application_received_date_high', ts('To'), FALSE, array('formatType' => 'searchDate')); - $form->addElement('checkbox', 'grant_application_received_notset', ts(''), NULL); + $form->addElement('checkbox', 'grant_application_received_notset', '', NULL); $form->addDate('grant_money_transfer_date_low', ts('Money Sent Date - From'), FALSE, array('formatType' => 'searchDate')); $form->addDate('grant_money_transfer_date_high', ts('To'), FALSE, array('formatType' => 'searchDate')); - $form->addElement('checkbox', 'grant_money_transfer_date_notset', ts(''), NULL); + $form->addElement('checkbox', 'grant_money_transfer_date_notset', '', NULL); $form->addDate('grant_due_date_low', ts('Report Due Date - From'), FALSE, array('formatType' => 'searchDate')); $form->addDate('grant_due_date_high', ts('To'), FALSE, array('formatType' => 'searchDate')); - $form->addElement('checkbox', 'grant_due_date_notset', ts(''), NULL); + $form->addElement('checkbox', 'grant_due_date_notset', '', NULL); $form->addDate('grant_decision_date_low', ts('Grant Decision Date - From'), FALSE, array('formatType' => 'searchDate')); $form->addDate('grant_decision_date_high', ts('To'), FALSE, array('formatType' => 'searchDate')); - $form->addElement('checkbox', 'grant_decision_date_notset', ts(''), NULL); + $form->addElement('checkbox', 'grant_decision_date_notset', '', NULL); $form->addYesNo('grant_report_received', ts('Grant report received?'), TRUE); diff --git a/CRM/Upgrade/Form.php b/CRM/Upgrade/Form.php index e6d27cbe1d..aeda599555 100644 --- a/CRM/Upgrade/Form.php +++ b/CRM/Upgrade/Form.php @@ -232,7 +232,7 @@ class CRM_Upgrade_Form extends CRM_Core_Form { * @return string */ public function getFieldsetTitle() { - return ts(''); + return ''; } /** diff --git a/tools/extensions/org.civicrm.search.activity/ActivitySearch.php b/tools/extensions/org.civicrm.search.activity/ActivitySearch.php index 08b85cec1d..8b7faed798 100644 --- a/tools/extensions/org.civicrm.search.activity/ActivitySearch.php +++ b/tools/extensions/org.civicrm.search.activity/ActivitySearch.php @@ -58,9 +58,9 @@ class org_civicrm_search_activityimplementsCRM_Contact_Form_Search_Interface { ts('Activity Subject') => 'activity_subject', ts('Scheduled By') => 'source_contact', ts('Scheduled Date') => 'activity_date', - ts(' ') => 'activity_id', - ts(' ') => 'activity_type_id', - ts(' ') => 'case_id', + ' ' => 'activity_id', + ' ' => 'activity_type_id', + ' ' => 'case_id', ts('Location') => 'location', ts('Duration') => 'duration', ts('Details') => 'details', diff --git a/tools/extensions/org.civicrm.search.basic/Basic.php b/tools/extensions/org.civicrm.search.basic/Basic.php index aab47c09a3..03752b157b 100644 --- a/tools/extensions/org.civicrm.search.basic/Basic.php +++ b/tools/extensions/org.civicrm.search.basic/Basic.php @@ -49,8 +49,9 @@ class org_civicrm_search_basic extends CRM_Contact_Form_Search_Custom_Baseimplem parent::__construct($formValues); $this->normalize(); - $this->_columns = array(ts('') => 'contact_type', - ts('') => 'contact_sub_type', + $this->_columns = array( + '' => 'contact_type', + '' => 'contact_sub_type', ts('Name') => 'sort_name', ts('Address') => 'street_address', ts('City') => 'city', -- 2.25.1