From: yashodha Date: Wed, 10 Aug 2016 09:11:50 +0000 (+0530) Subject: CRM-18972: more fixes X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=8c2959c832b3589226f84bf5741aa06cf7fb70c8;p=civicrm-core.git 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 bfad41fa31..6c6b80d5bd 100644 --- 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 56953dc98c..d9d7c7371a 100644 --- 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'] = 'SubTotal'; + $rows[$rowNum]['civicrm_membership_membership_type_id'] = '' . ts('Subtotal') . ''; $entryFound = TRUE; }