CRM-17695: ts() fixes.

diff --git a/CRM/Member/BAO/Query.php b/CRM/Member/BAO/Query.php
index 3941b03f79e68921096951babdf8c7fa8da66054..60f7793ba5e490db7be4d0bf7e543fa1ac5f2f53 100644 (file)
--- a/CRM/Member/BAO/Query.php
+++ b/CRM/Member/BAO/Query.php
@@ -225,19 +225,19 @@ class CRM_Member_BAO_Query {
 
         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');
         }
         elseif ($name == 'member_campaign_id') {
           $name = 'campaign_id';
-          $qillName = 'Campaign';
+          $qillName = ts('Campaign');
         }
         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,
@@ -245,11 +245,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;
 

diff --git a/templates/CRM/Admin/Page/Admin.tpl b/templates/CRM/Admin/Page/Admin.tpl
index c4f5a3d3dce225a8b22230694be3fbfd8eba3935..4bb41755202a8f45c2429e50e1f9b5306a9a0aed 100644 (file)
--- 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>