CRM-18972: more fixes

----------------------------------------
* CRM-18972: List of strings that cannot be localized cause the absence of ts() function
  https://issues.civicrm.org/jira/browse/CRM-18972

diff --git a/CRM/Report/Form.php b/CRM/Report/Form.php
index bfad41fa31d6e2905cf2cf96f8d8559ccf7e3eb2..6c6b80d5bd362752a5e94ae92e4a0d1a31c66507 100644 (file)
--- a/CRM/Report/Form.php
+++ b/CRM/Report/Form.php
@@ -2135,7 +2135,7 @@ WHERE cg.extends IN ('" . implode("','", $this->_customGroupExtends) . "') AND
       }
       elseif (isset($this->_columnHeaders[$colName])) {
         if ($subtotal) {
-          $row[$colName] = ts('Subtotal');
+          $row[$colName] = 'Subtotal';
           $subtotal = FALSE;
         }
         else {

diff --git a/CRM/Report/Form/Member/Summary.php b/CRM/Report/Form/Member/Summary.php
index 56953dc98cc8f72c7473714184365edeae9e5f0b..d9d7c7371a2c2ff1ea3ba2ccc6d88370de1dc003 100644 (file)
--- a/CRM/Report/Form/Member/Summary.php
+++ b/CRM/Report/Form/Member/Summary.php
@@ -625,7 +625,7 @@ GROUP BY    {$this->_aliases['civicrm_contribution']}.currency
         !$row['civicrm_membership_membership_type_id']
       ) {
         $this->fixSubTotalDisplay($rows[$rowNum], $this->_statFields, FALSE);
-        $rows[$rowNum]['civicrm_membership_membership_type_id'] = '<b>SubTotal</b>';
+        $rows[$rowNum]['civicrm_membership_membership_type_id'] = '<b>' . ts('Subtotal') . '</b>';
         $entryFound = TRUE;
       }