Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Steur <thomas.steur@gmail.com>2015-08-20 11:58:49 +0300
committerThomas Steur <thomas.steur@gmail.com>2015-08-20 11:58:49 +0300
commit9c8a88dd15c73fb40dd7147382db9f672d05eb96 (patch)
treec2c7ac126586f3b0ef81db6c6a2b3ee1e59842dd /plugins/ScheduledReports
parent3270c783ce4941192e4bdb11938b76e2ac048ded (diff)
html scheduled report uses different message
Diffstat (limited to 'plugins/ScheduledReports')
-rw-r--r--plugins/ScheduledReports/ScheduledReports.php14
1 files changed, 7 insertions, 7 deletions
diff --git a/plugins/ScheduledReports/ScheduledReports.php b/plugins/ScheduledReports/ScheduledReports.php
index 12a7f65856..9876ad0ed7 100644
--- a/plugins/ScheduledReports/ScheduledReports.php
+++ b/plugins/ScheduledReports/ScheduledReports.php
@@ -322,12 +322,12 @@ class ScheduledReports extends \Piwik\Plugin
$segmentInfo = Piwik::translate('ScheduledReports_SegmentAppliedToReports', $segment['name']);
}
- $messageFindBelow = Piwik::translate('ScheduledReports_PleaseFindBelow', array($periods[$report['period']], $reportTitle));
+ $messageFindAttached = Piwik::translate('ScheduledReports_PleaseFindAttachedFile', array($periods[$report['period']], $reportTitle));
+ $messageFindBelow = Piwik::translate('ScheduledReports_PleaseFindBelow', array($periods[$report['period']], $reportTitle));
+ $messageSentFrom = '';
$piwikUrl = SettingsPiwik::getPiwikUrl();
- if (empty($piwikUrl)) {
- $messageSentFrom = '';
- } else {
+ if (!empty($piwikUrl)) {
$messageSentFrom = Piwik::translate('ScheduledReports_SentFromX', $piwikUrl);
}
@@ -336,7 +336,7 @@ class ScheduledReports extends \Piwik\Plugin
// Needed when using images as attachment with cid
$mail->setType(Zend_Mime::MULTIPART_RELATED);
- $message .= "<br/>" . $messageFindBelow . "<br/>" . $messageSentFrom;
+ $message .= "<br/>$messageFindBelow<br/>$messageSentFrom";
if ($displaySegmentInfo) {
$message .= " " . $segmentInfo;
@@ -346,7 +346,7 @@ class ScheduledReports extends \Piwik\Plugin
break;
case 'csv':
- $message .= "\n" . $messageFindBelow . "\n" . $messageSentFrom;
+ $message .= "\n$messageFindAttached\n$messageSentFrom";
if ($displaySegmentInfo) {
$message .= " " . $segmentInfo;
@@ -364,7 +364,7 @@ class ScheduledReports extends \Piwik\Plugin
default:
case 'pdf':
- $message .= "\n" . $messageFindBelow . "\n" . $messageSentFrom;
+ $message .= "\n$messageFindAttached\n$messageSentFrom";
if ($displaySegmentInfo) {
$message .= " " . $segmentInfo;