From 2b27d9df82d919857b160351e6a38abf3c255815 Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Fri, 14 Nov 2014 17:45:13 -0500 Subject: [PATCH] CRM-15603 - Change '-- select --' to '- select -' --- CRM/Admin/Form/Navigation.php | 2 +- CRM/Report/Form/Case/Detail.php | 2 +- CRM/Report/Form/Contribute/History.php | 2 +- CRM/Report/Form/Instance.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CRM/Admin/Form/Navigation.php b/CRM/Admin/Form/Navigation.php index dd0b6199a9..a706e0fdec 100644 --- a/CRM/Admin/Form/Navigation.php +++ b/CRM/Admin/Form/Navigation.php @@ -112,7 +112,7 @@ class CRM_Admin_Form_Navigation extends CRM_Admin_Form { $homeMenuId = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_Navigation', 'Home', 'id', 'name'); unset($parentMenu[$homeMenuId]); - $parent = $this->add('select', 'parent_id', ts('Parent'), array('' => ts('-- select --')) + $parentMenu); + $parent = $this->add('select', 'parent_id', ts('Parent'), array('' => ts('- select -')) + $parentMenu); } } diff --git a/CRM/Report/Form/Case/Detail.php b/CRM/Report/Form/Case/Detail.php index b93c689609..09280195d3 100644 --- a/CRM/Report/Form/Case/Detail.php +++ b/CRM/Report/Form/Case/Detail.php @@ -289,7 +289,7 @@ class CRM_Report_Form_Case_Detail extends CRM_Report_Form { $elements = array(); $elements[] = &$this->createElement('select', 'case_activity_all_dates', NULL, array( - '' => ts('-- select --')) + $this->caseActivityTypes + '' => ts('- select -')) + $this->caseActivityTypes ); $this->addGroup($elements, 'case_detail_extra'); diff --git a/CRM/Report/Form/Contribute/History.php b/CRM/Report/Form/Contribute/History.php index 284fe1204e..910aa2a9f9 100644 --- a/CRM/Report/Form/Contribute/History.php +++ b/CRM/Report/Form/Contribute/History.php @@ -61,7 +61,7 @@ class CRM_Report_Form_Contribute_History extends CRM_Report_Form { $yearsInPast = 4; $date = CRM_Core_SelectValues::date('custom', NULL, $yearsInPast, 0); $count = $date['maxYear']; - $optionYear = array('' => ts('-- select --')); + $optionYear = array('' => ts('- select -')); $this->_yearStatisticsFrom = $date['minYear']; $this->_yearStatisticsTo = $date['maxYear']; diff --git a/CRM/Report/Form/Instance.php b/CRM/Report/Form/Instance.php index 8d8d011ccd..42714ede61 100644 --- a/CRM/Report/Form/Instance.php +++ b/CRM/Report/Form/Instance.php @@ -149,7 +149,7 @@ class CRM_Report_Form_Instance { // navigation field $parentMenu = CRM_Core_BAO_Navigation::getNavigationList(); - $form->add('select', 'parent_id', ts('Parent Menu'), array('' => ts('-- select --')) + $parentMenu); + $form->add('select', 'parent_id', ts('Parent Menu'), array('' => ts('- select -')) + $parentMenu); // For now we only providing drilldown for one primary detail report only. In future this could be multiple reports foreach ($form->_drilldownReport as $reportUrl => $drillLabel) { -- 2.25.1