diff options
| author | Filip Brzozowski <fbrzozowski@fiberfuse.co.uk> | 2017-03-28 22:00:23 +0300 |
|---|---|---|
| committer | Matthieu Aubry <mattab@users.noreply.github.com> | 2017-03-28 22:00:23 +0300 |
| commit | f9c555e5c1ac3bfc49559386f3a7c9d12703a762 (patch) | |
| tree | de8abb3660ecf28649c25bab06f6150c68e92139 /plugins/CoreUpdater | |
| parent | c21017aadd9ebd9836c94ed925b08686b686a855 (diff) | |
Issue #11450 - Email clarification for new version (#11542)
* Issue #11450
Add clarification in emails about new version for super users
* Revert "Issue #11450"
This reverts commit ed5d25a20677f7e33a2eaff1e621334cbee65c19.
* #11450 correstions based on feedback
* #11450 test fix
Diffstat (limited to 'plugins/CoreUpdater')
| -rw-r--r-- | plugins/CoreUpdater/Test/Integration/UpdateCommunicationTest.php | 4 | ||||
| -rw-r--r-- | plugins/CoreUpdater/UpdateCommunication.php | 2 | ||||
| -rw-r--r-- | plugins/CoreUpdater/lang/en.json | 3 |
3 files changed, 8 insertions, 1 deletions
diff --git a/plugins/CoreUpdater/Test/Integration/UpdateCommunicationTest.php b/plugins/CoreUpdater/Test/Integration/UpdateCommunicationTest.php index 5b4a03cb37..8533e5675c 100644 --- a/plugins/CoreUpdater/Test/Integration/UpdateCommunicationTest.php +++ b/plugins/CoreUpdater/Test/Integration/UpdateCommunicationTest.php @@ -79,6 +79,8 @@ CoreUpdater_YouCanUpgradeAutomaticallyOrDownloadPackage CoreUpdater_ViewVersionChangelog http://piwik.org/changelog/piwik-33-0-0/ +CoreUpdater_ReceiveEmailBecauseIsSuperUser + CoreUpdater_FeedbackRequest http://piwik.org/contact/"; @@ -95,6 +97,8 @@ CoreUpdater_ThereIsNewVersionAvailableForUpdate CoreUpdater_YouCanUpgradeAutomaticallyOrDownloadPackage {$rootUrl}index.php?module=CoreUpdater&action=newVersionAvailable +CoreUpdater_ReceiveEmailBecauseIsSuperUser + CoreUpdater_FeedbackRequest http://piwik.org/contact/"; diff --git a/plugins/CoreUpdater/UpdateCommunication.php b/plugins/CoreUpdater/UpdateCommunication.php index d39f44c111..971bd16fa0 100644 --- a/plugins/CoreUpdater/UpdateCommunication.php +++ b/plugins/CoreUpdater/UpdateCommunication.php @@ -79,6 +79,8 @@ class UpdateCommunication $message .= "\n\n"; } + $message .= Piwik::translate('CoreUpdater_ReceiveEmailBecauseIsSuperUser', $host); + $message .= "\n\n"; $message .= Piwik::translate('CoreUpdater_FeedbackRequest'); $message .= "\n"; $message .= 'http://piwik.org/contact/'; diff --git a/plugins/CoreUpdater/lang/en.json b/plugins/CoreUpdater/lang/en.json index cd517e0d31..16d2d91aed 100644 --- a/plugins/CoreUpdater/lang/en.json +++ b/plugins/CoreUpdater/lang/en.json @@ -77,6 +77,7 @@ "YouCanUpgradeAutomaticallyOrDownloadPackage": "You can update to version %s automatically or download the package and install it manually:", "YouMustDownloadPackageOrFixPermissions": "Piwik is unable to overwrite your current installation. You can either fix the directory\/file permissions, or download the package and install version %s manually:", "YourDatabaseIsOutOfDate": "Your Piwik database is out-of-date, and must be upgraded before you can continue.", - "ViewVersionChangelog": "View the changelog for this version:" + "ViewVersionChangelog": "View the changelog for this version:", + "ReceiveEmailBecauseIsSuperUser": "You receive this email because you are a Super User on the Piwik at: %s" } }
\ No newline at end of file |