CRM-18518: ts() string fixes.

diff --git a/CRM/Dedupe/Merger.php b/CRM/Dedupe/Merger.php
index c5079be6cd60211b55040f3793854c7751c71a07..2b09c1143984e5faa07c4e16bc0992ee27fb0e5e 100644 (file)
--- a/CRM/Dedupe/Merger.php
+++ b/CRM/Dedupe/Merger.php
@@ -675,10 +675,10 @@ INNER JOIN  civicrm_membership membership2 ON membership1.membership_type_id = m
     $msg   = '';
     $stats = CRM_Dedupe_Merger::getMergeStats($cacheKeyString);
     if (!empty($stats['merged'])) {
-      $msg = "{$stats['merged']} " . ts(' Contact(s) were merged. ');
+      $msg = "{$stats['merged']} " . ts('Contact(s) were merged.');
     }
     if (!empty($stats['skipped'])) {
-      $msg .= $stats['skipped'] . ts(' Contact(s) were skipped.');
+      $msg .= $stats['skipped'] . ts('Contact(s) were skipped.');
     }
     return $msg;
   }

diff --git a/CRM/Member/BAO/Query.php b/CRM/Member/BAO/Query.php
index b226fa853939cc9eb3180b5d886c623ef0dd902c..569bb0e1015c5456089ab9042b088b310d3e53e5 100644 (file)
--- a/CRM/Member/BAO/Query.php
+++ b/CRM/Member/BAO/Query.php
@@ -312,7 +312,7 @@ class CRM_Member_BAO_Query {
 
       case 'member_is_override':
         $query->_where[$grouping][] = CRM_Contact_BAO_Query::buildClause("civicrm_membership.is_override", $op, $value, "Boolean");
-        $query->_qill[$grouping][] = $value ? ts("Is Membership Status overriden? Yes") : ts("Is Membership Status overriden? No");
+        $query->_qill[$grouping][] = $value ? ts("Membership Status Is Overriden") : ts("Membership Status Is NOT Overriden");
         $query->_tables['civicrm_membership'] = $query->_whereTables['civicrm_membership'] = 1;
         return;
     }
@@ -416,13 +416,13 @@ class CRM_Member_BAO_Query {
    */
   public static function buildSearchForm(&$form) {
     $membershipStatus = CRM_Member_PseudoConstant::membershipStatus(NULL, NULL, 'label', FALSE, FALSE);
-    $form->add('select', 'membership_status_id', ts('Membership Status(s)'), $membershipStatus, FALSE, array(
+    $form->add('select', 'membership_status_id', ts('Membership Status'), $membershipStatus, FALSE, array(
       'id' => 'membership_status_id',
       'multiple' => 'multiple',
       'class' => 'crm-select2',
     ));
 
-    $form->addEntityRef('membership_type_id', ts('Membership Type(s)'), array(
+    $form->addEntityRef('membership_type_id', ts('Membership Type'), array(
       'entity' => 'MembershipType',
       'multiple' => TRUE,
       'placeholder' => ts('- any -'),
@@ -446,7 +446,7 @@ class CRM_Member_BAO_Query {
     $form->addYesNo('member_pay_later', ts('Pay Later?'), TRUE);
     $form->addYesNo('member_auto_renew', ts('Auto-Renew?'), TRUE);
     $form->addYesNo('member_test', ts('Membership is a Test?'), TRUE);
-    $form->addYesNo('member_is_override', ts('Membership Status Is Override?'), TRUE);
+    $form->addYesNo('member_is_override', ts('Membership Status Is Overriden?'), TRUE);
 
     // add all the custom  searchable fields
     $extends = array('Membership');