From 80d701ff1e6f842202c5c65c46a8ed51af3364ce Mon Sep 17 00:00:00 2001
From: Mathieu Lutfy <mathieu@bidon.ca>
Date: Fri, 11 Dec 2015 11:21:40 -0500
Subject: [PATCH] CRM-17695: ts() fixes.

---
 CRM/Member/BAO/Query.php           | 10 +++++-----
 templates/CRM/Admin/Page/Admin.tpl |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/CRM/Member/BAO/Query.php b/CRM/Member/BAO/Query.php
index 0fff4dc3cb..b9a73a8ea4 100644
--- a/CRM/Member/BAO/Query.php
+++ b/CRM/Member/BAO/Query.php
@@ -211,15 +211,15 @@ class CRM_Member_BAO_Query {
       case 'member_id':
         if (strpos($name, 'status') !== FALSE) {
           $name = 'status_id';
-          $qillName = 'Membership Status(s)';
+          $qillName = ts('Membership Status');
         }
         elseif ($name == 'member_id') {
           $name = 'id';
-          $qillName = 'Membership ID';
+          $qillName = ts('Membership ID');
         }
         else {
           $name = 'membership_type_id';
-          $qillName = 'Membership Type(s)';
+          $qillName = ts('Membership Type');
         }
         $query->_where[$grouping][] = CRM_Contact_BAO_Query::buildClause("civicrm_membership.$name",
           $op,
@@ -227,7 +227,7 @@ class CRM_Member_BAO_Query {
           "Integer"
         );
         list($op, $value) = CRM_Contact_BAO_Query::buildQillForFieldValue('CRM_Member_DAO_Membership', $name, $value, $op);
-        $query->_qill[$grouping][] = ts('%1 %2 %3', array(1 => $qillName, 2 => $op, 3 => $value));
+        $query->_qill[$grouping][] = $qillName . ' ' . $op . ' ' . $value;
         $query->_tables['civicrm_membership'] = $query->_whereTables['civicrm_membership'] = 1;
         return;
 
@@ -397,7 +397,7 @@ 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,
+    $form->add('select', 'membership_status_id', ts('Membership Status'), $membershipStatus, FALSE,
       array('id' => 'membership_status_id', 'multiple' => 'multiple', 'class' => 'crm-select2')
     );
 
diff --git a/templates/CRM/Admin/Page/Admin.tpl b/templates/CRM/Admin/Page/Admin.tpl
index 8954e5ff22..ace006bf06 100644
--- a/templates/CRM/Admin/Page/Admin.tpl
+++ b/templates/CRM/Admin/Page/Admin.tpl
@@ -28,7 +28,7 @@
     <div class="messages status no-popup">
       <table>
         <tr><td class="tasklist">
-          {ts 1='{$registerSite}'}Have you registered this site at CiviCRM.org? If not, please help strengthen the CiviCRM ecosystem by taking a few minutes to <a href="%1" target="_blank">fill out the site registration form</a>. The information collected will help us prioritize improvements, target our communications and build the community. If you have a technical role for this site, be sure to check "Keep in Touch" to receive technical updates (a low volume mailing list).{/ts}</td>
+          {ts 1=$registerSite}Have you registered this site at CiviCRM.org? If not, please help strengthen the CiviCRM ecosystem by taking a few minutes to <a href="%1" target="_blank">fill out the site registration form</a>. The information collected will help us prioritize improvements, target our communications and build the community. If you have a technical role for this site, be sure to check "Keep in Touch" to receive technical updates (a low volume mailing list).{/ts}</td>
         </tr>
       </table>
     </div>
-- 
2.25.1