Merge pull request #9457 from agh1/activemembersearchlabel

CRM-19556 CiviMember: wording on "current" membership search
civicrm · Nov 28, 2016 · f6102d1 · f6102d1
2 parents 1111c0f + d86f377
commit f6102d1
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/CRM/Member/BAO/Query.php b/CRM/Member/BAO/Query.php
@@ -261,7 +261,7 @@ public static function whereClauseSingle(&$values, &$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 @@ public static function buildSearchForm(&$form) {
 
     $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);