diff options
| author | Thomas Steur <tsteur@users.noreply.github.com> | 2018-01-10 21:45:20 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-10 21:45:20 +0300 |
| commit | 82a9b1b0a01dc20928d50134233e167f0116472d (patch) | |
| tree | a85fb5ecde6e9b9bacdd20f4310919daf674ab59 /plugins/CoreHome/templates/_headerMessage.twig | |
| parent | 92cb21b63c7b971579a9f0e3da57cc7d425a3c4f (diff) | |
Further Piwik.org => Matomo.org replacements (#12415)
* renaming more Piwik mentions
* some more updates
* fix some tests
* support matomo partially as require string
* fix tests
* fix failing system test
* fix tests
* fix system test
* fix test
Diffstat (limited to 'plugins/CoreHome/templates/_headerMessage.twig')
| -rw-r--r-- | plugins/CoreHome/templates/_headerMessage.twig | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/plugins/CoreHome/templates/_headerMessage.twig b/plugins/CoreHome/templates/_headerMessage.twig index 323383ad55..b14cc6ea0a 100644 --- a/plugins/CoreHome/templates/_headerMessage.twig +++ b/plugins/CoreHome/templates/_headerMessage.twig @@ -1,7 +1,7 @@ {# testing, remove test_ from var names #} {% set test_latest_version_available="4.0.0" %} -{% set test_piwikUrl='http://demo.piwik.org/' %} -{% set isPiwikDemo %}{{ piwikUrl == 'http://demo.piwik.org/' or piwikUrl == 'https://demo.piwik.org/' }}{% endset %} +{% set test_piwikUrl='https://demo.matomo.org/' %} +{% set isPiwikDemo %}{{ piwikUrl == 'http://demo.matomo.org/' or piwikUrl == 'https://demo.matomo.org/' }}{% endset %} {% set updateCheck %} <span id="updateCheckLinkContainer"> @@ -30,14 +30,14 @@ <div class="dropdown positionInViewport"> {% if latest_version_available and isSuperUser %} {% if isMultiServerEnvironment %} - {{ 'CoreHome_OneClickUpdateNotPossibleAsMultiServerEnvironment'|translate("<a rel='noreferrer' href='https://builds.piwik.org/piwik-" ~ latest_version_available ~ ".zip'>","</a>")|raw }} + {{ 'CoreHome_OneClickUpdateNotPossibleAsMultiServerEnvironment'|translate("<a rel='noreferrer' href='https://builds.matomo.org/piwik-" ~ latest_version_available ~ ".zip'>","</a>")|raw }} {% else %} - {{ 'General_PiwikXIsAvailablePleaseUpdateNow'|translate(latest_version_available,"<br /><a href='index.php?module=CoreUpdater&action=newVersionAvailable'>","</a>","<a href='?module=Proxy&action=redirect&url=https://piwik.org/changelog/' target='_blank'>","</a>")|raw }} + {{ 'General_PiwikXIsAvailablePleaseUpdateNow'|translate(latest_version_available,"<br /><a href='index.php?module=CoreUpdater&action=newVersionAvailable'>","</a>","<a href='?module=Proxy&action=redirect&url=https://matomo.org/changelog/' target='_blank'>","</a>")|raw }} {% endif %} <br /> {% elseif latest_version_available and not isPiwikDemo and hasSomeViewAccess and not isUserIsAnonymous %} {% set updateSubject = 'General_NewUpdatePiwikX'|translate(latest_version_available)|e('url') %} - {{ 'General_PiwikXIsAvailablePleaseNotifyPiwikAdmin'|translate("<a href='?module=Proxy&action=redirect&url=https://piwik.org/' target='_blank'>Piwik</a> <a href='?module=Proxy&action=redirect&url=https://piwik.org/changelog/' target='_blank'>" ~ latest_version_available ~ "</a>", "<a href='mailto:" ~ superUserEmails ~ "?subject=" ~ updateSubject ~ "'>", "</a>")|raw }} + {{ 'General_PiwikXIsAvailablePleaseNotifyPiwikAdmin'|translate("<a href='?module=Proxy&action=redirect&url=https://matomo.org/' target='_blank'>Piwik</a> <a href='?module=Proxy&action=redirect&url=https://piwik.org/changelog/' target='_blank'>" ~ latest_version_available ~ "</a>", "<a href='mailto:" ~ superUserEmails ~ "?subject=" ~ updateSubject ~ "'>", "</a>")|raw }} <br /> {% endif %} |