From afc07ada2ec817685887ce969cb57b280102b685 Mon Sep 17 00:00:00 2001
From: mattab <matthieu.aubry@gmail.com>
Date: Tue, 7 Oct 2014 14:35:31 +1300
Subject: [PATCH] Fixes #6309 Remove "Website" from the Email subject and form
the report title.
---
core/ReportRenderer/Html.php | 3 +--
plugins/ScheduledReports/API.php | 2 +-
tests/PHPUnit/Integration/Plugins/ScheduledReportsTest.php | 5 +++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/core/ReportRenderer/Html.php b/core/ReportRenderer/Html.php
index c929c9a449..d8ff678bc8 100644
--- a/core/ReportRenderer/Html.php
+++ b/core/ReportRenderer/Html.php
@@ -189,10 +189,9 @@ class Html extends ReportRenderer
$additionalFile['filename'] =
sprintf(
- '%s - %s - %s %d - %s %d%s.png',
+ '%s - %s - %d - %s %d%s.png',
$processedReportMetadata['name'],
$prettyDate,
- Piwik::translate('General_Website'),
$report['idsite'],
Piwik::translate('General_Report'),
$report['idreport'],
diff --git a/plugins/ScheduledReports/API.php b/plugins/ScheduledReports/API.php
index a42b5bb209..9e91defd06 100644
--- a/plugins/ScheduledReports/API.php
+++ b/plugins/ScheduledReports/API.php
@@ -560,7 +560,7 @@ class API extends \Piwik\Plugin\API
private static function getReportSubjectAndReportTitle($websiteName, $reports)
{
// if the only report is "All websites", we don't display the site name
- $reportTitle = Piwik::translate('General_Website') . " " . $websiteName;
+ $reportTitle = $websiteName;
$reportSubject = $websiteName;
if (count($reports) == 1
&& $reports[0] == 'MultiSites_getAll'
diff --git a/tests/PHPUnit/Integration/Plugins/ScheduledReportsTest.php b/tests/PHPUnit/Integration/Plugins/ScheduledReportsTest.php
index 9ce8430f42..676f8f9cf1 100644
--- a/tests/PHPUnit/Integration/Plugins/ScheduledReportsTest.php
+++ b/tests/PHPUnit/Integration/Plugins/ScheduledReportsTest.php
@@ -24,6 +24,7 @@ require_once 'ScheduledReports/ScheduledReports.php';
* Class Plugins_ScheduledReportsTest
*
* @group Plugins
+ * @group ScheduledReportsTest
*/
class Plugins_ScheduledReportsTest extends DatabaseTestCase
{
@@ -399,8 +400,8 @@ class Plugins_ScheduledReportsTest extends DatabaseTestCase
public function getGetReportSubjectAndReportTitleTestCases()
{
return array(
- array('Piwik.org', 'General_Website Piwik.org', 'Piwik.org', array('UserSettings_getBrowserType')),
- array('Piwik.org', 'General_Website Piwik.org', 'Piwik.org', array('MultiSites_getAll', 'UserSettings_getBrowserType')),
+ array('<Piwik.org>', '<Piwik.org>', '<Piwik.org>', array('UserSettings_getBrowserType')),
+ array('Piwik.org', 'Piwik.org', 'Piwik.org', array('MultiSites_getAll', 'UserSettings_getBrowserType')),
array('General_MultiSitesSummary', 'General_MultiSitesSummary', 'Piwik.org', array('MultiSites_getAll')),
);
}
--
GitLab