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:
authordizzy <diosmosis@users.noreply.github.com>2021-09-22 00:43:38 +0300
committerGitHub <noreply@github.com>2021-09-22 00:43:38 +0300
commit962bd82b8069af16bb5fcfcc7d2ef75731a5bf2e (patch)
tree0ad52db0320d177c255e61dd8e783b21d74a4451 /plugins/CoreHome
parent8c3f495c64a5209f0110f49588c4840ff2cd07fe (diff)
add warning about dropping support for users using IE (#18037)
Diffstat (limited to 'plugins/CoreHome')
-rw-r--r--plugins/CoreHome/CoreHome.php4
-rw-r--r--plugins/CoreHome/angularjs/iecheck.js37
-rw-r--r--plugins/CoreHome/lang/en.json5
3 files changed, 44 insertions, 2 deletions
diff --git a/plugins/CoreHome/CoreHome.php b/plugins/CoreHome/CoreHome.php
index 120ecf5b3c..f1a366116d 100644
--- a/plugins/CoreHome/CoreHome.php
+++ b/plugins/CoreHome/CoreHome.php
@@ -297,6 +297,8 @@ class CoreHome extends \Piwik\Plugin
$jsFiles[] = "plugins/CoreHome/angularjs/comparisons/comparisons.service.js";
$jsFiles[] = "plugins/CoreHome/angularjs/comparisons/comparisons.component.js";
+ $jsFiles[] = "plugins/CoreHome/angularjs/iecheck.js";
+
// we have to load these CoreAdminHome files here. If we loaded them in CoreAdminHome,
// there would be JS errors as CoreAdminHome is loaded first. Meaning it is loaded before
// any angular JS file is loaded etc.
@@ -439,6 +441,7 @@ class CoreHome extends \Piwik\Plugin
$translationKeys[] = 'General_Error';
$translationKeys[] = 'General_ErrorRequest';
$translationKeys[] = 'General_ErrorRequestFaqLink';
+ $translationKeys[] = 'General_Warning';
$translationKeys[] = 'General_YourChangesHaveBeenSaved';
$translationKeys[] = 'General_LearnMore';
$translationKeys[] = 'General_ChooseDate';
@@ -497,5 +500,6 @@ class CoreHome extends \Piwik\Plugin
$translationKeys[] = 'General_PreviousPeriod';
$translationKeys[] = 'General_PreviousYear';
$translationKeys[] = 'CoreHome_ReportingCategoryHelpPrefix';
+ $translationKeys[] = 'CoreHome_TechDeprecationWarning';
}
}
diff --git a/plugins/CoreHome/angularjs/iecheck.js b/plugins/CoreHome/angularjs/iecheck.js
new file mode 100644
index 0000000000..234322e82d
--- /dev/null
+++ b/plugins/CoreHome/angularjs/iecheck.js
@@ -0,0 +1,37 @@
+/*!
+ * Matomo - free/libre analytics platform
+ *
+ * @link https://matomo.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+(function () {
+ angular.module('piwikApp').run(['$timeout', function($timeout) {
+ var isIe = detectIfIeIsBeingUsed();
+ if (isIe) {
+ $timeout(function () {
+ var UI = require('piwik/UI');
+ var notification = new UI.Notification();
+
+ var message = _pk_translate('CoreHome_TechDeprecationWarning', [
+ '4.6',
+ 'Internet Explorer',
+ '<a target="_blank" href="https://matomo.org/blog/2021/09/matomo-to-end-support-for-internet-explorer-11/" rel="noreferrer noopener">',
+ '</a>',
+ ]);
+
+ notification.show(message, {
+ title: _pk_translate('General_Warning') + ':',
+ context: 'warning',
+ noclear: true,
+ type: 'persistent',
+ id: 'ieEndingSupportCheck'
+ });
+ });
+ }
+
+ function detectIfIeIsBeingUsed() {
+ var ua = window.navigator.userAgent;
+ return ua.indexOf('MSIE ') !== -1 || ua.indexOf('Trident/') !== -1;
+ }
+ }]);
+})();
diff --git a/plugins/CoreHome/lang/en.json b/plugins/CoreHome/lang/en.json
index 4e83585587..a8761af1bd 100644
--- a/plugins/CoreHome/lang/en.json
+++ b/plugins/CoreHome/lang/en.json
@@ -123,6 +123,7 @@
"SoftwareSubcategoryHelp": "The Software section shows the operating systems, browsers and plugins that your visitors are using to access the site so that you can optimise your site to ensure it is fully compatible with the most popular configurations.",
"EngagementSubcategoryHelp1": "The Engagement section provides reports that help to quantify how many new and returning visitors you get. You can also review reports that break down the average time and number of pages per visit, as well as the number of times a visitor has been to your site and the most common number of days between visits.",
"EngagementSubcategoryHelp2": "This can help you to optimise for frequency and high-interaction visits in addition to maximising your reach.",
- "PeriodHasOnlyRawData": "It looks like reports for this period have not been processed yet. Do you want to see what's happening now? Check out the %1$sVisits log%2$s or choose a different date period until the reports are generated."
+ "PeriodHasOnlyRawData": "It looks like reports for this period have not been processed yet. Do you want to see what's happening now? Check out the %1$sVisits log%2$s or choose a different date period until the reports are generated.",
+ "TechDeprecationWarning": "Starting in version Matomo %1$s, Matomo will be ending support for %2$s. For more information %3$ssee our blog post.%4$s"
}
-} \ No newline at end of file
+}