From d86f3771824fb4e19982f79aa471e9eda08db121 Mon Sep 17 00:00:00 2001 From: Andrew Hunt Date: Mon, 28 Nov 2016 11:10:15 -0500 Subject: [PATCH] CRM-19556 CiviMember: wording on "current" membership search --- CRM/Member/BAO/Query.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CRM/Member/BAO/Query.php b/CRM/Member/BAO/Query.php index 9cdb8ef3af..3553d853af 100644 --- a/CRM/Member/BAO/Query.php +++ b/CRM/Member/BAO/Query.php @@ -261,7 +261,7 @@ class CRM_Member_BAO_Query extends CRM_Core_BAO_Query { case 'membership_is_current_member': // We don't want to include all tests for sql OR CRM-7827 $query->_where[$grouping][] = CRM_Contact_BAO_Query::buildClause("civicrm_membership_status.is_current_member", $op, $value, "Boolean"); - $query->_qill[$grouping][] = ts('Is an %1 Member', array(1 => $value ? 'Active' : 'Inactive')); + $query->_qill[$grouping][] = $value ? ts('Is a current member') : ts('Is a non-current member'); $query->_tables['civicrm_membership_status'] = $query->_whereTables['civicrm_membership_status'] = 1; return; @@ -500,7 +500,7 @@ class CRM_Member_BAO_Query extends CRM_Core_BAO_Query { $form->addFormRule(array('CRM_Member_BAO_Query', 'formRule'), $form); - $form->addYesNo('membership_is_current_member', ts('Active Member?'), TRUE); + $form->addYesNo('membership_is_current_member', ts('Current Member?'), TRUE); $form->addYesNo('member_is_primary', ts('Primary Member?'), TRUE); $form->addYesNo('member_pay_later', ts('Pay Later?'), TRUE); -- 2.25.1