diff options
author | Matthieu Aubry <mattab@users.noreply.github.com> | 2016-12-19 05:21:38 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-12-19 05:21:38 +0300 |
commit | 8dbc563e99432f38de107be3dfb0f0a17b9e8f87 (patch) | |
tree | 3d6bbfa74611f54feb70c3fc5c1df81e8ca6bf94 | |
parent | 4345bd07e36b55506c44d66b5f164ba4f6bee807 (diff) | |
parent | a66957865e969af374caac850a528b96b5b340b0 (diff) |
Offer our support for upgrading Piwik safely (#11037)
-rw-r--r-- | plugins/CoreUpdater/lang/en.json | 2 | ||||
-rw-r--r-- | plugins/CoreUpdater/templates/runUpdaterAndExit_welcome.twig | 3 | ||||
-rw-r--r-- | tests/UI/expected-screenshots/CoreUpdaterDb_main.png | 4 |
3 files changed, 7 insertions, 2 deletions
diff --git a/plugins/CoreUpdater/lang/en.json b/plugins/CoreUpdater/lang/en.json index c75736c204..cd517e0d31 100644 --- a/plugins/CoreUpdater/lang/en.json +++ b/plugins/CoreUpdater/lang/en.json @@ -34,6 +34,8 @@ "ListOfSqlQueriesFYI": "FYI: these are the SQL queries that will be executed to upgrade your database to Piwik %s", "MajorUpdateWarning1": "This is a major update! It will take longer than usual.", "MajorUpdateWarning2": "The following advice is especially important for large installations.", + "NeedHelpUpgrading": "Need help upgrading Piwik?", + "NeedHelpUpgradingText": "If you need support to upgrade your Piwik, the creators of Piwik are here to help you make the Piwik upgrade a success and provide all instructions, best practises and ongoing support. %1$sContact the Piwik experts to get started upgrading your Piwik safely.%2$s", "NoteForLargePiwikInstances": "Important notes for large Piwik installations", "NotificationClickToUpdatePlugins": "Click here to update your plugins now:", "NotificationClickToUpdateThemes": "Click here to update your themes now:", diff --git a/plugins/CoreUpdater/templates/runUpdaterAndExit_welcome.twig b/plugins/CoreUpdater/templates/runUpdaterAndExit_welcome.twig index e5899117ce..3d1a8a5357 100644 --- a/plugins/CoreUpdater/templates/runUpdaterAndExit_welcome.twig +++ b/plugins/CoreUpdater/templates/runUpdaterAndExit_welcome.twig @@ -60,6 +60,9 @@ </div> {% endif %} + <h2>{{ 'CoreUpdater_NeedHelpUpgrading'|translate }}</h2> + <p>{{ 'CoreUpdater_NeedHelpUpgradingText'|translate("<a rel='noreferrer' target='_blank' href='https://piwik.org/support/upgrading-piwik/'>", "</a>")|raw }}</p> + <h2>{{ 'CoreUpdater_ReadyToGo'|translate }}</h2> <p>{{ 'CoreUpdater_TheUpgradeProcessMayTakeAWhilePleaseBePatient'|translate }}</p> {% endif %} diff --git a/tests/UI/expected-screenshots/CoreUpdaterDb_main.png b/tests/UI/expected-screenshots/CoreUpdaterDb_main.png index 8177bcaaa6..8e60bc335f 100644 --- a/tests/UI/expected-screenshots/CoreUpdaterDb_main.png +++ b/tests/UI/expected-screenshots/CoreUpdaterDb_main.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:33c350c7584ee6937224850ac176927157ea8ecee633380cc44ff322b1721b3f -size 262822 +oid sha256:6ed9788df6f0f938486e24797ca3422f310085e336391b81e40787ecd8c5553d +size 289862 |