diff options
| author | diosmosis <diosmosis@users.noreply.github.com> | 2022-09-18 06:05:36 +0300 |
|---|---|---|
| committer | diosmosis <diosmosis@users.noreply.github.com> | 2022-09-18 06:05:36 +0300 |
| commit | 68bba0e9b600ee4ce565b02e29b0637bc670ba03 (patch) | |
| tree | 9d8613eb22b362d267319aa96c8f27ae63c08760 | |
| parent | cbeaf3e79938cdb0ba3941ba8154ca83f424b519 (diff) | |
| parent | 313b105bb62db3530a90e2edbbc000e64b594b3f (diff) | |
Merge branch '4.x-dev' into 5.x-dev
49 files changed, 234 insertions, 176 deletions
diff --git a/composer.lock b/composer.lock index 44a2d8eb42..f536c7369f 100644 --- a/composer.lock +++ b/composer.lock @@ -395,16 +395,16 @@ }, { "name": "matomo/device-detector", - "version": "6.0.2", + "version": "6.0.3", "source": { "type": "git", "url": "https://github.com/matomo-org/device-detector.git", - "reference": "c01910dde14c95708019513ea0ee36c5a174fd4c" + "reference": "6ba69e1afd24b45d66b6de7b04553213f7ef2151" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/matomo-org/device-detector/zipball/c01910dde14c95708019513ea0ee36c5a174fd4c", - "reference": "c01910dde14c95708019513ea0ee36c5a174fd4c", + "url": "https://api.github.com/repos/matomo-org/device-detector/zipball/6ba69e1afd24b45d66b6de7b04553213f7ef2151", + "reference": "6ba69e1afd24b45d66b6de7b04553213f7ef2151", "shasum": "" }, "require": { @@ -460,7 +460,7 @@ "source": "https://github.com/matomo-org/matomo", "wiki": "https://dev.matomo.org/" }, - "time": "2022-07-12T07:49:25+00:00" + "time": "2022-09-12T11:43:29+00:00" }, { "name": "matomo/doctrine-cache-fork", @@ -3231,16 +3231,16 @@ }, { "name": "sebastian/comparator", - "version": "3.0.3", + "version": "3.0.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "1071dfcef776a57013124ff35e1fc41ccd294758" + "reference": "1dc7ceb4a24aede938c7af2a9ed1de09609ca770" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/1071dfcef776a57013124ff35e1fc41ccd294758", - "reference": "1071dfcef776a57013124ff35e1fc41ccd294758", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/1dc7ceb4a24aede938c7af2a9ed1de09609ca770", + "reference": "1dc7ceb4a24aede938c7af2a9ed1de09609ca770", "shasum": "" }, "require": { @@ -3293,7 +3293,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/comparator/issues", - "source": "https://github.com/sebastianbergmann/comparator/tree/3.0.3" + "source": "https://github.com/sebastianbergmann/comparator/tree/3.0.5" }, "funding": [ { @@ -3301,7 +3301,7 @@ "type": "github" } ], - "time": "2020-11-30T08:04:30+00:00" + "time": "2022-09-14T12:31:48+00:00" }, { "name": "sebastian/diff", @@ -3434,16 +3434,16 @@ }, { "name": "sebastian/exporter", - "version": "3.1.4", + "version": "3.1.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "0c32ea2e40dbf59de29f3b49bf375176ce7dd8db" + "reference": "73a9676f2833b9a7c36968f9d882589cd75511e6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/0c32ea2e40dbf59de29f3b49bf375176ce7dd8db", - "reference": "0c32ea2e40dbf59de29f3b49bf375176ce7dd8db", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/73a9676f2833b9a7c36968f9d882589cd75511e6", + "reference": "73a9676f2833b9a7c36968f9d882589cd75511e6", "shasum": "" }, "require": { @@ -3499,7 +3499,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/exporter/issues", - "source": "https://github.com/sebastianbergmann/exporter/tree/3.1.4" + "source": "https://github.com/sebastianbergmann/exporter/tree/3.1.5" }, "funding": [ { @@ -3507,7 +3507,7 @@ "type": "github" } ], - "time": "2021-11-11T13:51:24+00:00" + "time": "2022-09-14T06:00:17+00:00" }, { "name": "sebastian/global-state", diff --git a/core/Db/Schema/Mysql.php b/core/Db/Schema/Mysql.php index 9ac76c951d..7da9b0fab0 100644 --- a/core/Db/Schema/Mysql.php +++ b/core/Db/Schema/Mysql.php @@ -52,7 +52,7 @@ class Mysql implements SchemaInterface superuser_access TINYINT(2) unsigned NOT NULL DEFAULT '0', date_registered TIMESTAMP NULL, ts_password_modified TIMESTAMP NULL, - idchange_last_viewed TIMESTAMP NULL, + idchange_last_viewed INTEGER UNSIGNED NULL, invited_by VARCHAR(100) NULL, invite_token VARCHAR(191) NULL, invite_expired_at TIMESTAMP NULL, diff --git a/core/Updates/4.12.0-b3.php b/core/Updates/4.12.0-b3.php new file mode 100644 index 0000000000..586d3b9e2b --- /dev/null +++ b/core/Updates/4.12.0-b3.php @@ -0,0 +1,62 @@ +<?php + +/** + * Matomo - free/libre analytics platform + * + * @link https://matomo.org + * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later + * + */ + +namespace Piwik\Updates; + +use Piwik\Common; +use Piwik\Db; +use Piwik\Updater; +use Piwik\Updates as PiwikUpdates; +use Piwik\Updater\Migration; +use Piwik\Updater\Migration\Factory as MigrationFactory; + +/** + * Update for version 4.12.0-b3 + */ +class Updates_4_12_0_b3 extends PiwikUpdates +{ + /** + * @var MigrationFactory + */ + private $migration; + + public function __construct(MigrationFactory $factory) + { + $this->migration = $factory; + } + + /** + * @param Updater $updater + * + * @return Migration[] + */ + public function getMigrations(Updater $updater) + { + $column = Db::fetchRow('SHOW COLUMNS FROM ' . Common::prefixTable('user') . ' LIKE \'idchange_last_viewed\''); + + if ( + empty($column) + || strpos(strtolower($column['Type']), 'int') !== false + || strpos(strtolower($column['Type']), 'unsigned') !== false + ) { + return []; + } + + $removeValues = $this->migration->db->sql('UPDATE ' . Common::prefixTable('user') . ' SET idchange_last_viewed = NULL'); + $columnUpdate = $this->migration->db->changeColumnType('user', 'idchange_last_viewed', 'INTEGER UNSIGNED'); + + return [$removeValues, $columnUpdate]; + } + + public function doUpdate(Updater $updater) + { + $updater->executeMigrations(__FILE__, $this->getMigrations($updater)); + } +} diff --git a/core/Version.php b/core/Version.php index 1c774e811c..ec30d71482 100644 --- a/core/Version.php +++ b/core/Version.php @@ -21,7 +21,7 @@ final class Version * The current Matomo version. * @var string */ - const VERSION = '4.12.0-b2'; + const VERSION = '4.12.0-b3'; const MAJOR_VERSION = 4; diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_browserName__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_browserName__API.getSuggestedValuesForSegment.xml index ff376316eb..5746872394 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_browserName__API.getSuggestedValuesForSegment.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_browserName__API.getSuggestedValuesForSegment.xml @@ -8,6 +8,8 @@ <row>Android Browser</row> <row>Safari</row> <row>xStand</row> + <row>xBrowser Pro Super Fast</row> + <row>xBrowser</row> <row>wOSBrowser</row> <row>vivo Browser</row> <row>vBrowser</row> @@ -24,10 +26,8 @@ <row>deg-degan</row> <row>dbrowser</row> <row>Zvu</row> + <row>Zirco Browser</row> <row>Zetakey</row> <row>Yuzu Browser</row> <row>YouCare</row> - <row>Yolo Browser</row> - <row>Yo Browser</row> - <row>Yandex Browser Lite</row> </result>
\ No newline at end of file diff --git a/plugins/CoreAdminHome/lang/en.json b/plugins/CoreAdminHome/lang/en.json index 380e0a42cb..6bb367846f 100644 --- a/plugins/CoreAdminHome/lang/en.json +++ b/plugins/CoreAdminHome/lang/en.json @@ -48,7 +48,7 @@ "JSTracking_CodeNoteBeforeClosingHeadEmail": "Make sure this code is embedded within a script element on every page of your website. We recommend pasting it immediately before the closing head tag.", "JSTracking_CrossDomain": "By default, the visitor ID that identifies a unique visitor is stored in the browser's first party cookies which can only be accessed by pages on the same domain. Enabling cross domain linking lets you track all the actions and pageviews of a specific visitor into the same visit even when they view pages on several domains. Whenever a user clicks on a link to one of your website's alias URLs, it will append a URL parameter pk_vid forwarding the Visitor ID.", "JSTracking_CrossDomain_NeedsMultipleDomains": "Note: To use cross domain linking, you must specify more than one domain name (URLs) for your website.", - "JSTracking_CustomCampaignQueryParam": "Use custom query parameter names for the campaign name & keyword", + "JSTracking_CustomCampaignQueryParam": "Use custom query parameter names for the campaign name and keyword", "JSTracking_CustomCampaignQueryParamDesc": "Note: %1$sMatomo will automatically detect Google Analytics parameters.%2$s", "JSTracking_DisableCookies": "Disable all tracking cookies", "JSTracking_DisableCookiesDesc": "Disables all first party cookies. Existing Matomo cookies for this website will be deleted on the next pageview.", diff --git a/plugins/CoreHome/lang/en.json b/plugins/CoreHome/lang/en.json index 805be8faca..9cd8b40d70 100644 --- a/plugins/CoreHome/lang/en.json +++ b/plugins/CoreHome/lang/en.json @@ -106,8 +106,8 @@ "RowLimit": "Row limit", "CustomLimit": "Custom limit", "ExportFormat": "Export format", - "ExportTooltip": "Note: To use the generated export URL, you will need to specify an app token auth. You can configure these tokens in Admin -> Security -> Token Auths.", - "ExportTooltipWithLink": "Note: To use the generated export URL, you will need to specify an app token auth. You can configure these tokens in %1$s[Admin -> Security -> Auths Tokens]%2$s. Replace %3$s in the Export URL by your Auth token. Warning: Never share the URL with the real token with anyone else.", + "ExportTooltip": "Note: To use the generated export URL, you will need to specify an app token auth. You can configure these tokens in Admin → Security → Token Auths.", + "ExportTooltipWithLink": "Note: To use the generated export URL, you will need to specify an app token auth. You can configure these tokens in %1$s[Admin → Security → Auths Tokens]%2$s. Replace %3$s in the Export URL by your Auth token. Warning: Never share the URL with the real token with anyone else.", "ExpandSubtables": "Expand subtables", "StandardReport": "Standard report", "FlattenReport": "Flatten report", @@ -118,7 +118,7 @@ "Profilable": "Profilable", "SearchOnMatomo": "Search '%1$s' on Matomo.org", "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", - "ReportingCategoryHelpPrefix": "How does the \"%1$s > %2$s\" reporting page help me?", + "ReportingCategoryHelpPrefix": "How does the \"%1$s → %2$s\" reporting page help me?", "VisitorsCategoryHelp1": "The Visitors pages tell you things about who your visitors are. Things like where your visitors came from, what devices and browsers they're using and when they generally visit your website. Understand, in the aggregate, who your audience is, and look for outliers to see how your audience could grow.", "VisitorsCategoryHelp2": "In addition to general information about your visitors, you can also use the %1$sVisits Log%2$s to see what occurred in every individual visit.", "VisitorsOverviewHelp": "The Visitors Overview helps you understand the popularity of your site. It does this by providing charts that show how many visits your site is receiving over a selected period and the average level of engagement for key features, such as searches and downloads.", diff --git a/plugins/CoreHome/stylesheets/layout.less b/plugins/CoreHome/stylesheets/layout.less index 61a115fdac..6574fdef16 100644 --- a/plugins/CoreHome/stylesheets/layout.less +++ b/plugins/CoreHome/stylesheets/layout.less @@ -33,6 +33,7 @@ nav { padding: 8px 10px 10px; display: inline-block; cursor: pointer; + color: @theme-color-header-text; } @media only screen and (min-width: 601px) { @@ -387,6 +388,10 @@ nav { .collapsible-header { border-bottom: 0; cursor: pointer!important; + color: @theme-color-header-text; + & when (@theme-color-header-text = #ffffff) { + color: unset; + } } .collapsible-body { diff --git a/plugins/CoreHome/templates/_menu.twig b/plugins/CoreHome/templates/_menu.twig index 4e9129881a..b1bbc548a1 100644 --- a/plugins/CoreHome/templates/_menu.twig +++ b/plugins/CoreHome/templates/_menu.twig @@ -36,7 +36,7 @@ href="index.php?{{ urlParameters._url|urlRewriteWithParameters|slice(1) }}" {% endif %}> {% if urlParameters._icon is defined and urlParameters._icon %}<span class="icon {{ urlParameters._icon|e('html_attr') }}" style="margin-right: 5px;"></span>{% endif %} - {{ name|translate }} + {{ name|translate|rawSafeDecoded }} </a> </li> {% endif %} diff --git a/plugins/CoreHome/vue/dist/CoreHome.umd.js b/plugins/CoreHome/vue/dist/CoreHome.umd.js index dc44ba729d..76f81e238b 100644 --- a/plugins/CoreHome/vue/dist/CoreHome.umd.js +++ b/plugins/CoreHome/vue/dist/CoreHome.umd.js @@ -4071,45 +4071,46 @@ EnrichedHeadlinevue_type_script_lang_ts.render = EnrichedHeadlinevue_type_templa directiveName: 'piwikEnrichedHeadline', transclude: true })); -// CONCATENATED MODULE: ./node_modules/@vue/cli-plugin-babel/node_modules/cache-loader/dist/cjs.js??ref--12-0!./node_modules/@vue/cli-plugin-babel/node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib!./node_modules/@vue/cli-service/node_modules/vue-loader-v16/dist/templateLoader.js??ref--6!./node_modules/@vue/cli-service/node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/@vue/cli-service/node_modules/vue-loader-v16/dist??ref--0-1!./plugins/CoreHome/vue/src/ContentBlock/ContentBlock.vue?vue&type=template&id=0e5a6942 +// CONCATENATED MODULE: ./node_modules/@vue/cli-plugin-babel/node_modules/cache-loader/dist/cjs.js??ref--12-0!./node_modules/@vue/cli-plugin-babel/node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib!./node_modules/@vue/cli-service/node_modules/vue-loader-v16/dist/templateLoader.js??ref--6!./node_modules/@vue/cli-service/node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/@vue/cli-service/node_modules/vue-loader-v16/dist??ref--0-1!./plugins/CoreHome/vue/src/ContentBlock/ContentBlock.vue?vue&type=template&id=561baeb1 -var ContentBlockvue_type_template_id_0e5a6942_hoisted_1 = { +var ContentBlockvue_type_template_id_561baeb1_hoisted_1 = { class: "card", ref: "root" }; -var ContentBlockvue_type_template_id_0e5a6942_hoisted_2 = { +var ContentBlockvue_type_template_id_561baeb1_hoisted_2 = { class: "card-content" }; -var ContentBlockvue_type_template_id_0e5a6942_hoisted_3 = { +var ContentBlockvue_type_template_id_561baeb1_hoisted_3 = { key: 0, class: "card-title" }; -var ContentBlockvue_type_template_id_0e5a6942_hoisted_4 = { +var ContentBlockvue_type_template_id_561baeb1_hoisted_4 = { key: 1, class: "card-title" }; -var ContentBlockvue_type_template_id_0e5a6942_hoisted_5 = { +var ContentBlockvue_type_template_id_561baeb1_hoisted_5 = { ref: "content" }; -function ContentBlockvue_type_template_id_0e5a6942_render(_ctx, _cache, $props, $setup, $data, $options) { +function ContentBlockvue_type_template_id_561baeb1_render(_ctx, _cache, $props, $setup, $data, $options) { var _component_EnrichedHeadline = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["resolveComponent"])("EnrichedHeadline"); - return Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("div", ContentBlockvue_type_template_id_0e5a6942_hoisted_1, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("div", ContentBlockvue_type_template_id_0e5a6942_hoisted_2, [_ctx.contentTitle && !_ctx.actualFeature && !_ctx.helpUrl && !_ctx.actualHelpText ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("h2", ContentBlockvue_type_template_id_0e5a6942_hoisted_3, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.contentTitle), 1)) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true), _ctx.contentTitle && (_ctx.actualFeature || _ctx.helpUrl || _ctx.actualHelpText) ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("h2", ContentBlockvue_type_template_id_0e5a6942_hoisted_4, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createVNode"])(_component_EnrichedHeadline, { + return Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("div", ContentBlockvue_type_template_id_561baeb1_hoisted_1, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("div", ContentBlockvue_type_template_id_561baeb1_hoisted_2, [_ctx.contentTitle && !_ctx.actualFeature && !_ctx.helpUrl && !_ctx.actualHelpText ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("h2", ContentBlockvue_type_template_id_561baeb1_hoisted_3, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.decode(_ctx.contentTitle)), 1)) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true), _ctx.contentTitle && (_ctx.actualFeature || _ctx.helpUrl || _ctx.actualHelpText) ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("h2", ContentBlockvue_type_template_id_561baeb1_hoisted_4, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createVNode"])(_component_EnrichedHeadline, { "feature-name": _ctx.actualFeature, "help-url": _ctx.helpUrl, "inline-help": _ctx.actualHelpText }, { default: Object(external_commonjs_vue_commonjs2_vue_root_Vue_["withCtx"])(function () { - return [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createTextVNode"])(Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.contentTitle), 1)]; + return [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createTextVNode"])(Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.decode(_ctx.contentTitle)), 1)]; }), _: 1 - }, 8, ["feature-name", "help-url", "inline-help"])])) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("div", ContentBlockvue_type_template_id_0e5a6942_hoisted_5, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["renderSlot"])(_ctx.$slots, "default")], 512)])], 512); + }, 8, ["feature-name", "help-url", "inline-help"])])) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("div", ContentBlockvue_type_template_id_561baeb1_hoisted_5, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["renderSlot"])(_ctx.$slots, "default")], 512)])], 512); } -// CONCATENATED MODULE: ./plugins/CoreHome/vue/src/ContentBlock/ContentBlock.vue?vue&type=template&id=0e5a6942 +// CONCATENATED MODULE: ./plugins/CoreHome/vue/src/ContentBlock/ContentBlock.vue?vue&type=template&id=561baeb1 // CONCATENATED MODULE: ./node_modules/@vue/cli-plugin-typescript/node_modules/cache-loader/dist/cjs.js??ref--14-0!./node_modules/babel-loader/lib!./node_modules/@vue/cli-plugin-typescript/node_modules/ts-loader??ref--14-2!./node_modules/@vue/cli-service/node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/@vue/cli-service/node_modules/vue-loader-v16/dist??ref--0-1!./plugins/CoreHome/vue/src/ContentBlock/ContentBlock.vue?vue&type=script&lang=ts + var adminContent = null; var ContentBlockvue_type_script_lang_ts_window = window, ContentBlockvue_type_script_lang_ts_$ = ContentBlockvue_type_script_lang_ts_window.$; @@ -4187,6 +4188,11 @@ var ContentBlockvue_type_script_lang_ts_window = window, root.style.marginTop = '0'; } } + }, + methods: { + decode: function decode(s) { + return Matomo_Matomo.helper.htmlDecode(s); + } } })); // CONCATENATED MODULE: ./plugins/CoreHome/vue/src/ContentBlock/ContentBlock.vue?vue&type=script&lang=ts @@ -4195,7 +4201,7 @@ var ContentBlockvue_type_script_lang_ts_window = window, -ContentBlockvue_type_script_lang_ts.render = ContentBlockvue_type_template_id_0e5a6942_render +ContentBlockvue_type_script_lang_ts.render = ContentBlockvue_type_template_id_561baeb1_render /* harmony default export */ var ContentBlock = (ContentBlockvue_type_script_lang_ts); // CONCATENATED MODULE: ./plugins/CoreHome/vue/src/ContentBlock/ContentBlock.adapter.ts diff --git a/plugins/CoreHome/vue/dist/CoreHome.umd.min.js b/plugins/CoreHome/vue/dist/CoreHome.umd.min.js index f0d768cc3d..98f0ca93ca 100644 --- a/plugins/CoreHome/vue/dist/CoreHome.umd.min.js +++ b/plugins/CoreHome/vue/dist/CoreHome.umd.min.js @@ -276,7 +276,7 @@ function Dn(e){return{restrict:"A",priority:10,link:function(t,n,r){var i={insta * * @link https://matomo.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later - */function tr(e,t,n,r,i,a){var l=Object(o["resolveComponent"])("EnrichedHeadline");return Object(o["openBlock"])(),Object(o["createElementBlock"])("div",Qn,[Object(o["createElementVNode"])("div",Kn,[!e.contentTitle||e.actualFeature||e.helpUrl||e.actualHelpText?Object(o["createCommentVNode"])("",!0):(Object(o["openBlock"])(),Object(o["createElementBlock"])("h2",Xn,Object(o["toDisplayString"])(e.contentTitle),1)),e.contentTitle&&(e.actualFeature||e.helpUrl||e.actualHelpText)?(Object(o["openBlock"])(),Object(o["createElementBlock"])("h2",Zn,[Object(o["createVNode"])(l,{"feature-name":e.actualFeature,"help-url":e.helpUrl,"inline-help":e.actualHelpText},{default:Object(o["withCtx"])((function(){return[Object(o["createTextVNode"])(Object(o["toDisplayString"])(e.contentTitle),1)]})),_:1},8,["feature-name","help-url","inline-help"])])):Object(o["createCommentVNode"])("",!0),Object(o["createElementVNode"])("div",er,[Object(o["renderSlot"])(e.$slots,"default")],512)])],512)}var nr=null,rr=window,ir=rr.$,or=Object(o["defineComponent"])({props:{contentTitle:String,feature:String,helpUrl:String,helpText:String,anchor:String},components:{EnrichedHeadline:Yn},data:function(){return{actualFeature:this.feature,actualHelpText:this.helpText}},watch:{feature:function(e){this.actualFeature=e},helpText:function(e){this.actualHelpText=e}},mounted:function(){var e=this,t=this.$refs.root,n=this.$refs.content;if(this.anchor&&t&&t.parentElement){var r=document.createElement("a");r.id=this.anchor,ir(t.parentElement).prepend(r)}setTimeout((function(){var t=n.querySelector(".contentHelp");t&&(e.actualHelpText=t.innerHTML,t.remove())}),0),this.actualFeature&&"true"===this.actualFeature&&(this.actualFeature=this.contentTitle),null===nr&&(nr=document.querySelector("#content.admin"));var i=null;if(nr&&(i=nr.offsetTop),i||0===i){var o=t.closest(".widgetLoader"),a=o?o.offsetTop:t.offsetTop;a-i<17&&(t.style.marginTop="0")}}});or.render=tr;var ar=or; + */function tr(e,t,n,r,i,a){var l=Object(o["resolveComponent"])("EnrichedHeadline");return Object(o["openBlock"])(),Object(o["createElementBlock"])("div",Qn,[Object(o["createElementVNode"])("div",Kn,[!e.contentTitle||e.actualFeature||e.helpUrl||e.actualHelpText?Object(o["createCommentVNode"])("",!0):(Object(o["openBlock"])(),Object(o["createElementBlock"])("h2",Xn,Object(o["toDisplayString"])(e.decode(e.contentTitle)),1)),e.contentTitle&&(e.actualFeature||e.helpUrl||e.actualHelpText)?(Object(o["openBlock"])(),Object(o["createElementBlock"])("h2",Zn,[Object(o["createVNode"])(l,{"feature-name":e.actualFeature,"help-url":e.helpUrl,"inline-help":e.actualHelpText},{default:Object(o["withCtx"])((function(){return[Object(o["createTextVNode"])(Object(o["toDisplayString"])(e.decode(e.contentTitle)),1)]})),_:1},8,["feature-name","help-url","inline-help"])])):Object(o["createCommentVNode"])("",!0),Object(o["createElementVNode"])("div",er,[Object(o["renderSlot"])(e.$slots,"default")],512)])],512)}var nr=null,rr=window,ir=rr.$,or=Object(o["defineComponent"])({props:{contentTitle:String,feature:String,helpUrl:String,helpText:String,anchor:String},components:{EnrichedHeadline:Yn},data:function(){return{actualFeature:this.feature,actualHelpText:this.helpText}},watch:{feature:function(e){this.actualFeature=e},helpText:function(e){this.actualHelpText=e}},mounted:function(){var e=this,t=this.$refs.root,n=this.$refs.content;if(this.anchor&&t&&t.parentElement){var r=document.createElement("a");r.id=this.anchor,ir(t.parentElement).prepend(r)}setTimeout((function(){var t=n.querySelector(".contentHelp");t&&(e.actualHelpText=t.innerHTML,t.remove())}),0),this.actualFeature&&"true"===this.actualFeature&&(this.actualFeature=this.contentTitle),null===nr&&(nr=document.querySelector("#content.admin"));var i=null;if(nr&&(i=nr.offsetTop),i||0===i){var o=t.closest(".widgetLoader"),a=o?o.offsetTop:t.offsetTop;a-i<17&&(t.style.marginTop="0")}},methods:{decode:function(e){return S.helper.htmlDecode(e)}}});or.render=tr;var ar=or; /*! * Matomo - free/libre analytics platform * diff --git a/plugins/CoreHome/vue/src/ContentBlock/ContentBlock.vue b/plugins/CoreHome/vue/src/ContentBlock/ContentBlock.vue index c46c4de4b1..2a9d2caae8 100644 --- a/plugins/CoreHome/vue/src/ContentBlock/ContentBlock.vue +++ b/plugins/CoreHome/vue/src/ContentBlock/ContentBlock.vue @@ -10,7 +10,7 @@ <h2 v-if="contentTitle && !actualFeature && !helpUrl && !actualHelpText" class="card-title" - >{{ contentTitle }}</h2> + >{{ decode(contentTitle) }}</h2> <h2 v-if="contentTitle && (actualFeature || helpUrl || actualHelpText)" class="card-title" @@ -20,7 +20,7 @@ :help-url="helpUrl" :inline-help="actualHelpText" > - {{ contentTitle }} + {{ decode(contentTitle) }} </EnrichedHeadline> </h2> <div ref="content"> @@ -33,6 +33,7 @@ <script lang="ts"> import { defineComponent } from 'vue'; import EnrichedHeadline from '../EnrichedHeadline/EnrichedHeadline.vue'; +import Matomo from '../Matomo/Matomo'; let adminContent: HTMLElement|null = null; @@ -110,5 +111,10 @@ export default defineComponent({ } } }, + methods: { + decode(s: string) { + return Matomo.helper.htmlDecode(s); + }, + }, }); </script> diff --git a/plugins/CorePluginsAdmin/lang/en.json b/plugins/CorePluginsAdmin/lang/en.json index 161f8ce00a..90b18fe9a9 100644 --- a/plugins/CorePluginsAdmin/lang/en.json +++ b/plugins/CorePluginsAdmin/lang/en.json @@ -56,7 +56,7 @@ "SuccessfullyActicated": "You have successfully activated <strong>%s<\/strong>.", "TeaserExtendPiwik": "Extend Matomo with Plugins and Themes", "TeaserExtendPiwikByPlugin": "Extend Matomo by %1$sinstalling plugins from the Marketplace%2$s or %3$supload a plugin in .zip format%4$s.", - "TeaserExtendPiwikByTheme": "Enjoy another look & feel by %1$sinstalling a new theme%2$s.", + "TeaserExtendPiwikByTheme": "Enjoy another look and feel by %1$sinstalling a new theme%2$s.", "InstallingNewPluginViaMarketplaceOrUpload": "You may automatically install plugins from the Marketplace or %1$supload a plugin%2$s in .zip format.", "TagManagerNowAvailableTitle": "Matomo Tag Manager is now available", "TagManagerNowAvailableSubtitle": "Manage all your tags easily through one platform to get the insights you want, the opportunities are endless!", diff --git a/plugins/CoreUpdater/lang/en.json b/plugins/CoreUpdater/lang/en.json index b831ea4a33..2adc17408b 100644 --- a/plugins/CoreUpdater/lang/en.json +++ b/plugins/CoreUpdater/lang/en.json @@ -65,7 +65,7 @@ "ThankYouUpdatePiwik": "Thank you for using Matomo and keeping it up to date!", "PostUpdateMessage": "Matomo will always be free to download and use, but it needs your continued support to grow and improve.", "PostUpdateSupport": "If you need help using Matomo, you can get support from its creators:", - "ServicesSupport": "Services & Support", + "ServicesSupport": "Services and support", "CloudHosting": "Cloud hosting", "Updating": "Updating", "UpdateUsingHttpsFailed": "Downloading the latest Matomo version over secure HTTPS connection did not succeed, because of the following error:", diff --git a/plugins/Diagnostics/vue/dist/Diagnostics.umd.js b/plugins/Diagnostics/vue/dist/Diagnostics.umd.js index dbafa81572..8cbc7232fe 100644 --- a/plugins/Diagnostics/vue/dist/Diagnostics.umd.js +++ b/plugins/Diagnostics/vue/dist/Diagnostics.umd.js @@ -139,7 +139,7 @@ if (typeof window !== 'undefined') { // EXTERNAL MODULE: external {"commonjs":"vue","commonjs2":"vue","root":"Vue"} var external_commonjs_vue_commonjs2_vue_root_Vue_ = __webpack_require__("8bbf"); -// CONCATENATED MODULE: ./node_modules/@vue/cli-plugin-babel/node_modules/cache-loader/dist/cjs.js??ref--12-0!./node_modules/@vue/cli-plugin-babel/node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib!./node_modules/@vue/cli-service/node_modules/vue-loader-v16/dist/templateLoader.js??ref--6!./node_modules/@vue/cli-service/node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/@vue/cli-service/node_modules/vue-loader-v16/dist??ref--0-1!./plugins/Diagnostics/vue/src/ConfigFile/ConfigFile.vue?vue&type=template&id=9712b6cc +// CONCATENATED MODULE: ./node_modules/@vue/cli-plugin-babel/node_modules/cache-loader/dist/cjs.js??ref--12-0!./node_modules/@vue/cli-plugin-babel/node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib!./node_modules/@vue/cli-service/node_modules/vue-loader-v16/dist/templateLoader.js??ref--6!./node_modules/@vue/cli-service/node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/@vue/cli-service/node_modules/vue-loader-v16/dist??ref--0-1!./plugins/Diagnostics/vue/src/ConfigFile/ConfigFile.vue?vue&type=template&id=1680ea44 function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); } @@ -165,13 +165,14 @@ var _hoisted_10 = ["innerHTML"]; var _hoisted_11 = { class: "description" }; -var _hoisted_12 = { +var _hoisted_12 = ["innerHTML"]; +var _hoisted_13 = { key: 0 }; -var _hoisted_13 = { +var _hoisted_14 = { key: 0 }; -var _hoisted_14 = ["innerHTML"]; +var _hoisted_15 = ["innerHTML"]; function render(_ctx, _cache, $props, $setup, $data, $options) { var _component_Passthrough = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["resolveComponent"])("Passthrough"); @@ -221,10 +222,12 @@ function render(_ctx, _cache, $props, $setup, $data, $options) { }, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("td", _hoisted_9, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])("".concat(key).concat(configEntry.value !== null && (configEntry.value instanceof Array || _typeof(configEntry.value) === 'object') ? '[]' : '')), 1), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("td", { class: "value", innerHTML: _ctx.$sanitize(_ctx.humanReadableValue(configEntry.value)) - }, null, 8, _hoisted_10), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("td", _hoisted_11, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createTextVNode"])(Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(configEntry.description) + " ", 1), (configEntry.isCustomValue || configEntry.value === null) && configEntry.defaultValue !== null ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("span", _hoisted_12, [configEntry.description ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("br", _hoisted_13)) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createTextVNode"])(" " + Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('General_Default')) + ": ", 1), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("span", { + }, null, 8, _hoisted_10), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("td", _hoisted_11, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("span", { + innerHTML: _ctx.$sanitize(configEntry.description) + }, null, 8, _hoisted_12), (configEntry.isCustomValue || configEntry.value === null) && configEntry.defaultValue !== null ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("span", _hoisted_13, [configEntry.description ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("br", _hoisted_14)) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createTextVNode"])(" " + Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('General_Default')) + ": ", 1), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("span", { class: "defaultValue", innerHTML: _ctx.$sanitize(_ctx.humanReadableValue(configEntry.defaultValue)) - }, null, 8, _hoisted_14)])) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true)])], 2)), [[external_commonjs_vue_commonjs2_vue_root_Vue_["vShow"], configEntry.isCustomValue || !_ctx.hideGlobalConfigValues]]); + }, null, 8, _hoisted_15)])) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true)])], 2)), [[external_commonjs_vue_commonjs2_vue_root_Vue_["vShow"], configEntry.isCustomValue || !_ctx.hideGlobalConfigValues]]); }), 128))]; }), _: 2 @@ -234,7 +237,7 @@ function render(_ctx, _cache, $props, $setup, $data, $options) { _: 1 }, 8, ["content-title"]); } -// CONCATENATED MODULE: ./plugins/Diagnostics/vue/src/ConfigFile/ConfigFile.vue?vue&type=template&id=9712b6cc +// CONCATENATED MODULE: ./plugins/Diagnostics/vue/src/ConfigFile/ConfigFile.vue?vue&type=template&id=1680ea44 // EXTERNAL MODULE: external "CoreHome" var external_CoreHome_ = __webpack_require__("19dc"); diff --git a/plugins/Diagnostics/vue/dist/Diagnostics.umd.min.js b/plugins/Diagnostics/vue/dist/Diagnostics.umd.min.js index 0c2753ebaa..edfc35786c 100644 --- a/plugins/Diagnostics/vue/dist/Diagnostics.umd.min.js +++ b/plugins/Diagnostics/vue/dist/Diagnostics.umd.min.js @@ -1,4 +1,4 @@ -(function(e,t){"object"===typeof exports&&"object"===typeof module?module.exports=t(require("CoreHome"),require("vue")):"function"===typeof define&&define.amd?define(["CoreHome"],t):"object"===typeof exports?exports["Diagnostics"]=t(require("CoreHome"),require("vue")):e["Diagnostics"]=t(e["CoreHome"],e["Vue"])})("undefined"!==typeof self?self:this,(function(e,t){return function(e){var t={};function n(o){if(t[o])return t[o].exports;var c=t[o]={i:o,l:!1,exports:{}};return e[o].call(c.exports,c,c.exports,n),c.l=!0,c.exports}return n.m=e,n.c=t,n.d=function(e,t,o){n.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:o})},n.r=function(e){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},n.t=function(e,t){if(1&t&&(e=n(e)),8&t)return e;if(4&t&&"object"===typeof e&&e&&e.__esModule)return e;var o=Object.create(null);if(n.r(o),Object.defineProperty(o,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var c in e)n.d(o,c,function(t){return e[t]}.bind(null,c));return o},n.n=function(e){var t=e&&e.__esModule?function(){return e["default"]}:function(){return e};return n.d(t,"a",t),t},n.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},n.p="plugins/Diagnostics/vue/dist/",n(n.s="fae3")}({"19dc":function(t,n){t.exports=e},"8bbf":function(e,n){e.exports=t},fae3:function(e,t,n){"use strict";if(n.r(t),n.d(t,"ConfigFile",(function(){return S})),"undefined"!==typeof window){var o=window.document.currentScript,c=o&&o.src.match(/(.+\/)[^/]+\.js(\?.*)?$/);c&&(n.p=c[1])}var r=n("8bbf");function l(e){return l="function"===typeof Symbol&&"symbol"===typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"===typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},l(e)}var i=["innerHTML"],a=["innerHTML"],u=["href"],s=Object(r["createElementVNode"])("br",null,null,-1),b=Object(r["createElementVNode"])("p",null,null,-1),f={class:"diagnostics configfile"},d={colspan:"3"},p=["name"],m={class:"name"},j=["innerHTML"],O={class:"description"},y={key:0},g={key:0},V=["innerHTML"];function h(e,t,n,o,c,h){var v=Object(r["resolveComponent"])("Passthrough"),C=Object(r["resolveComponent"])("ContentBlock"),k=Object(r["resolveDirective"])("content-table");return Object(r["openBlock"])(),Object(r["createBlock"])(C,{"content-title":e.translate("Diagnostics_ConfigFileTitle"),feature:"true"},{default:Object(r["withCtx"])((function(){return[Object(r["createElementVNode"])("p",null,[Object(r["createElementVNode"])("span",{innerHTML:e.$sanitize(e.configFileIntro),style:{"margin-right":"3.5px"}},null,8,i),Object(r["createElementVNode"])("span",{innerHTML:e.$sanitize(e.translate("Diagnostics_HideUnchanged","<a>","</a>")),onClick:t[0]||(t[0]=function(t){return e.onHideUnchanged(t)})},null,8,a)]),Object(r["createElementVNode"])("h3",null,Object(r["toDisplayString"])(e.translate("Diagnostics_Sections")),1),(Object(r["openBlock"])(!0),Object(r["createElementBlock"])(r["Fragment"],null,Object(r["renderList"])(e.allConfigValues,(function(e,t){return Object(r["openBlock"])(),Object(r["createBlock"])(v,{key:t},{default:Object(r["withCtx"])((function(){return[Object(r["createElementVNode"])("a",{href:"#".concat(t)},Object(r["toDisplayString"])(t),9,u),s]})),_:2},1024)})),128)),b,Object(r["withDirectives"])(Object(r["createElementVNode"])("table",f,[Object(r["createElementVNode"])("tbody",null,[(Object(r["openBlock"])(!0),Object(r["createElementBlock"])(r["Fragment"],null,Object(r["renderList"])(e.allConfigValues,(function(t,n){return Object(r["openBlock"])(),Object(r["createBlock"])(v,{key:n},{default:Object(r["withCtx"])((function(){return[Object(r["createElementVNode"])("tr",null,[Object(r["createElementVNode"])("td",d,[Object(r["createElementVNode"])("a",{name:n},null,8,p),Object(r["createElementVNode"])("h3",null,Object(r["toDisplayString"])(n),1)])]),(Object(r["openBlock"])(!0),Object(r["createElementBlock"])(r["Fragment"],null,Object(r["renderList"])(t,(function(t,n){return Object(r["withDirectives"])((Object(r["openBlock"])(),Object(r["createElementBlock"])("tr",{key:n,class:Object(r["normalizeClass"])({"custom-value":t.isCustomValue})},[Object(r["createElementVNode"])("td",m,Object(r["toDisplayString"])("".concat(n).concat(null!==t.value&&(t.value instanceof Array||"object"===l(t.value))?"[]":"")),1),Object(r["createElementVNode"])("td",{class:"value",innerHTML:e.$sanitize(e.humanReadableValue(t.value))},null,8,j),Object(r["createElementVNode"])("td",O,[Object(r["createTextVNode"])(Object(r["toDisplayString"])(t.description)+" ",1),!t.isCustomValue&&null!==t.value||null===t.defaultValue?Object(r["createCommentVNode"])("",!0):(Object(r["openBlock"])(),Object(r["createElementBlock"])("span",y,[t.description?(Object(r["openBlock"])(),Object(r["createElementBlock"])("br",g)):Object(r["createCommentVNode"])("",!0),Object(r["createTextVNode"])(" "+Object(r["toDisplayString"])(e.translate("General_Default"))+": ",1),Object(r["createElementVNode"])("span",{class:"defaultValue",innerHTML:e.$sanitize(e.humanReadableValue(t.defaultValue))},null,8,V)]))])],2)),[[r["vShow"],t.isCustomValue||!e.hideGlobalConfigValues]])})),128))]})),_:2},1024)})),128))])],512),[[k]])]})),_:1},8,["content-title"])}var v=n("19dc");function C(e){return C="function"===typeof Symbol&&"symbol"===typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"===typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},C(e)}var k=Object(r["defineComponent"])({props:{allConfigValues:{type:Object,required:!0}},components:{ContentBlock:v["ContentBlock"],Passthrough:v["Passthrough"]},directives:{ContentTable:v["ContentTable"]},data:function(){return{hideGlobalConfigValues:!1}},methods:{humanReadableValue:function(e){return!1===e?"false":!0===e?"true":null===e?"":""===e?"''":"object"===C(e)&&0===Object.keys(e).length?"[]":"object"===C(e)&&Object.keys(e).length>0?'<div class="pre">'.concat(JSON.stringify(e,null,4),"</div>"):"".concat(e)},onHideUnchanged:function(e){"A"===e.target.tagName&&(this.hideGlobalConfigValues=!this.hideGlobalConfigValues)}},computed:{configFileIntro:function(){return Object(v["translate"])("Diagnostics_ConfigFileIntroduction",'<code>"config/config.ini.php"</code>')}}});k.render=h;var S=k; +(function(e,t){"object"===typeof exports&&"object"===typeof module?module.exports=t(require("CoreHome"),require("vue")):"function"===typeof define&&define.amd?define(["CoreHome"],t):"object"===typeof exports?exports["Diagnostics"]=t(require("CoreHome"),require("vue")):e["Diagnostics"]=t(e["CoreHome"],e["Vue"])})("undefined"!==typeof self?self:this,(function(e,t){return function(e){var t={};function n(o){if(t[o])return t[o].exports;var c=t[o]={i:o,l:!1,exports:{}};return e[o].call(c.exports,c,c.exports,n),c.l=!0,c.exports}return n.m=e,n.c=t,n.d=function(e,t,o){n.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:o})},n.r=function(e){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},n.t=function(e,t){if(1&t&&(e=n(e)),8&t)return e;if(4&t&&"object"===typeof e&&e&&e.__esModule)return e;var o=Object.create(null);if(n.r(o),Object.defineProperty(o,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var c in e)n.d(o,c,function(t){return e[t]}.bind(null,c));return o},n.n=function(e){var t=e&&e.__esModule?function(){return e["default"]}:function(){return e};return n.d(t,"a",t),t},n.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},n.p="plugins/Diagnostics/vue/dist/",n(n.s="fae3")}({"19dc":function(t,n){t.exports=e},"8bbf":function(e,n){e.exports=t},fae3:function(e,t,n){"use strict";if(n.r(t),n.d(t,"ConfigFile",(function(){return S})),"undefined"!==typeof window){var o=window.document.currentScript,c=o&&o.src.match(/(.+\/)[^/]+\.js(\?.*)?$/);c&&(n.p=c[1])}var r=n("8bbf");function l(e){return l="function"===typeof Symbol&&"symbol"===typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"===typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},l(e)}var i=["innerHTML"],a=["innerHTML"],u=["href"],s=Object(r["createElementVNode"])("br",null,null,-1),b=Object(r["createElementVNode"])("p",null,null,-1),f={class:"diagnostics configfile"},d={colspan:"3"},p=["name"],m={class:"name"},j=["innerHTML"],O={class:"description"},y=["innerHTML"],g={key:0},V={key:0},h=["innerHTML"];function v(e,t,n,o,c,v){var C=Object(r["resolveComponent"])("Passthrough"),k=Object(r["resolveComponent"])("ContentBlock"),E=Object(r["resolveDirective"])("content-table");return Object(r["openBlock"])(),Object(r["createBlock"])(k,{"content-title":e.translate("Diagnostics_ConfigFileTitle"),feature:"true"},{default:Object(r["withCtx"])((function(){return[Object(r["createElementVNode"])("p",null,[Object(r["createElementVNode"])("span",{innerHTML:e.$sanitize(e.configFileIntro),style:{"margin-right":"3.5px"}},null,8,i),Object(r["createElementVNode"])("span",{innerHTML:e.$sanitize(e.translate("Diagnostics_HideUnchanged","<a>","</a>")),onClick:t[0]||(t[0]=function(t){return e.onHideUnchanged(t)})},null,8,a)]),Object(r["createElementVNode"])("h3",null,Object(r["toDisplayString"])(e.translate("Diagnostics_Sections")),1),(Object(r["openBlock"])(!0),Object(r["createElementBlock"])(r["Fragment"],null,Object(r["renderList"])(e.allConfigValues,(function(e,t){return Object(r["openBlock"])(),Object(r["createBlock"])(C,{key:t},{default:Object(r["withCtx"])((function(){return[Object(r["createElementVNode"])("a",{href:"#".concat(t)},Object(r["toDisplayString"])(t),9,u),s]})),_:2},1024)})),128)),b,Object(r["withDirectives"])(Object(r["createElementVNode"])("table",f,[Object(r["createElementVNode"])("tbody",null,[(Object(r["openBlock"])(!0),Object(r["createElementBlock"])(r["Fragment"],null,Object(r["renderList"])(e.allConfigValues,(function(t,n){return Object(r["openBlock"])(),Object(r["createBlock"])(C,{key:n},{default:Object(r["withCtx"])((function(){return[Object(r["createElementVNode"])("tr",null,[Object(r["createElementVNode"])("td",d,[Object(r["createElementVNode"])("a",{name:n},null,8,p),Object(r["createElementVNode"])("h3",null,Object(r["toDisplayString"])(n),1)])]),(Object(r["openBlock"])(!0),Object(r["createElementBlock"])(r["Fragment"],null,Object(r["renderList"])(t,(function(t,n){return Object(r["withDirectives"])((Object(r["openBlock"])(),Object(r["createElementBlock"])("tr",{key:n,class:Object(r["normalizeClass"])({"custom-value":t.isCustomValue})},[Object(r["createElementVNode"])("td",m,Object(r["toDisplayString"])("".concat(n).concat(null!==t.value&&(t.value instanceof Array||"object"===l(t.value))?"[]":"")),1),Object(r["createElementVNode"])("td",{class:"value",innerHTML:e.$sanitize(e.humanReadableValue(t.value))},null,8,j),Object(r["createElementVNode"])("td",O,[Object(r["createElementVNode"])("span",{innerHTML:e.$sanitize(t.description)},null,8,y),!t.isCustomValue&&null!==t.value||null===t.defaultValue?Object(r["createCommentVNode"])("",!0):(Object(r["openBlock"])(),Object(r["createElementBlock"])("span",g,[t.description?(Object(r["openBlock"])(),Object(r["createElementBlock"])("br",V)):Object(r["createCommentVNode"])("",!0),Object(r["createTextVNode"])(" "+Object(r["toDisplayString"])(e.translate("General_Default"))+": ",1),Object(r["createElementVNode"])("span",{class:"defaultValue",innerHTML:e.$sanitize(e.humanReadableValue(t.defaultValue))},null,8,h)]))])],2)),[[r["vShow"],t.isCustomValue||!e.hideGlobalConfigValues]])})),128))]})),_:2},1024)})),128))])],512),[[E]])]})),_:1},8,["content-title"])}var C=n("19dc");function k(e){return k="function"===typeof Symbol&&"symbol"===typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"===typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},k(e)}var E=Object(r["defineComponent"])({props:{allConfigValues:{type:Object,required:!0}},components:{ContentBlock:C["ContentBlock"],Passthrough:C["Passthrough"]},directives:{ContentTable:C["ContentTable"]},data:function(){return{hideGlobalConfigValues:!1}},methods:{humanReadableValue:function(e){return!1===e?"false":!0===e?"true":null===e?"":""===e?"''":"object"===k(e)&&0===Object.keys(e).length?"[]":"object"===k(e)&&Object.keys(e).length>0?'<div class="pre">'.concat(JSON.stringify(e,null,4),"</div>"):"".concat(e)},onHideUnchanged:function(e){"A"===e.target.tagName&&(this.hideGlobalConfigValues=!this.hideGlobalConfigValues)}},computed:{configFileIntro:function(){return Object(C["translate"])("Diagnostics_ConfigFileIntroduction",'<code>"config/config.ini.php"</code>')}}});E.render=v;var S=E; /*! * Matomo - free/libre analytics platform * diff --git a/plugins/Diagnostics/vue/src/ConfigFile/ConfigFile.vue b/plugins/Diagnostics/vue/src/ConfigFile/ConfigFile.vue index cc66608208..a68c5112e8 100644 --- a/plugins/Diagnostics/vue/src/ConfigFile/ConfigFile.vue +++ b/plugins/Diagnostics/vue/src/ConfigFile/ConfigFile.vue @@ -48,7 +48,7 @@ </td> <td class="value" v-html="$sanitize(humanReadableValue(configEntry.value))"></td> <td class="description"> - {{ configEntry.description }} + <span v-html="$sanitize(configEntry.description)"></span> <span v-if="(configEntry.isCustomValue || configEntry.value === null) diff --git a/plugins/Feedback/tests/UI/FeedbackForm_spec.js b/plugins/Feedback/tests/UI/FeedbackForm_spec.js index 7c7e59dc86..a715e01f63 100644 --- a/plugins/Feedback/tests/UI/FeedbackForm_spec.js +++ b/plugins/Feedback/tests/UI/FeedbackForm_spec.js @@ -12,10 +12,10 @@ describe("FeedbackForm", function () { await page.goto("?idSite=1&period=year&date=2012-08-09&module=Feedback&action=index"); await page.evaluate(function () { - $('.enrichedHeadline .title').each(function () { - if ($(this).text().indexOf("Matomo") !== -1) { - var replace = $(this).text().replace(/Matomo\s*\d+\.\d+(\.\d+)?([\-a-z]*\d+)?/g, 'Matomo'); - $(this).text(replace); + $('.enrichedHeadline').each(function () { + if ($(this).html().indexOf("Matomo") !== -1) { + var replace = $(this).html().replace(/Matomo\s*\d+\.\d+(\.\d+)?([\-a-z]*\d+)?/g, 'Matomo'); + $(this).html(replace); } }); }); diff --git a/plugins/Goals/lang/en.json b/plugins/Goals/lang/en.json index c888438a02..f182d6bd3b 100644 --- a/plugins/Goals/lang/en.json +++ b/plugins/Goals/lang/en.json @@ -55,7 +55,7 @@ "DocumentationRevenueGeneratedByProductSales": "Product sales. Excludes tax, shipping and discount", "Download": "Download a file", "Ecommerce": "Ecommerce", - "EcommerceAndGoalsMenu": "Ecommerce & Goals", + "EcommerceAndGoalsMenu": "Ecommerce & Goals", "EcommerceLog": "Ecommerce Log", "EcommerceOrder": "Ecommerce order", "EcommerceOverview": "Ecommerce Overview", diff --git a/plugins/Insights/lang/en.json b/plugins/Insights/lang/en.json index edab7e7fdc..326245112b 100644 --- a/plugins/Insights/lang/en.json +++ b/plugins/Insights/lang/en.json @@ -8,7 +8,7 @@ "DayComparedToPreviousWeek": "same day in the previous week", "DayComparedToPreviousYear": "same day in the previous year", "Filter": "Filter", - "FilterIncreaserAndDecreaser": "Increaser & decreaser", + "FilterIncreaserAndDecreaser": "Increaser & decreaser", "FilterOnlyDecreaser": "Only decreaser", "FilterOnlyDisappeared": "Only disappeared", "FilterOnlyIncreaser": "Only increaser", diff --git a/plugins/Insights/templates/insightControls.twig b/plugins/Insights/templates/insightControls.twig index 6c73c6fea8..47ab665dc7 100644 --- a/plugins/Insights/templates/insightControls.twig +++ b/plugins/Insights/templates/insightControls.twig @@ -46,7 +46,7 @@ <div class="col s12 m6 l4 input-field"> <select size="1" name="showIncreaseOrDecrease" title="Show increaser and/or decreaser"> - <option value="both" {% if properties.limit_increaser and properties.limit_decreaser %}selected{%endif%}>{{ 'Insights_FilterIncreaserAndDecreaser'|translate }}</option> + <option value="both" {% if properties.limit_increaser and properties.limit_decreaser %}selected{%endif%}>{{ 'Insights_FilterIncreaserAndDecreaser'|translate|raw }}</option> <option value="increase" {% if properties.limit_increaser and not properties.limit_decreaser %}selected{%endif%}>{{ 'Insights_FilterOnlyIncreaser'|translate }}</option> <option value="decrease" {% if not properties.limit_increaser and properties.limit_decreaser %}selected{%endif%}>{{ 'Insights_FilterOnlyDecreaser'|translate }}</option> </select> diff --git a/plugins/Installation/lang/en.json b/plugins/Installation/lang/en.json index 353745e027..7514f121f5 100644 --- a/plugins/Installation/lang/en.json +++ b/plugins/Installation/lang/en.json @@ -35,7 +35,7 @@ "JSTracking_Intro": "To track your web traffic with Matomo you need to make sure some extra code is added to each of your webpages.", "LargePiwikInstances": "Help for users with high-traffic websites", "Legend": "Legend", - "LoadDataInfileRecommended": "You should fix this problem if your Matomo server tracks high-traffic websites (e.g. > 100,000 pages per month).", + "LoadDataInfileRecommended": "You should fix this problem if your Matomo server tracks high-traffic websites (e.g. over 100,000 pages per month).", "LoadDataInfileUnavailableHelp": "Hint: Using %1$s by updating your PHP and MySQL software and ensuring your database user has the %2$s privilege speeds up Matomo's archiving process a lot.", "NfsFilesystemWarning": "Your server is using an NFS filesystem.", "NfsFilesystemWarningSuffixAdmin": "This means Matomo will be extremely slow when using file-based sessions.", @@ -89,7 +89,7 @@ "SystemCheckFilterHelp": "You need to configure and rebuild PHP with \"filter\" support (don't use --disable-filter).", "SystemCheckFunctions": "Required functions", "SystemCheckShellExecHelp": "It is recommended to turn on this PHP built-in function. %1$sRead this to learn more.%2$s", - "SystemCheckGDFreeType": "GD > 2.x + FreeType (graphics)", + "SystemCheckGDFreeType": "GD > 2.x + FreeType (graphics)", "SystemCheckGDHelp": "The sparklines (small graphs) and image graphs (in the Matomo mobile app and email reports) will not work.", "SystemCheckGlobHelp": "This built-in function has been turned off on your host. Matomo will attempt to emulate the function, but may encounter further security restrictions. Functionality may be impacted.", "SystemCheckGzcompressHelp": "You need to turn on the zlib extension and gzcompress function.", diff --git a/plugins/Installation/templates/_systemCheckSection.twig b/plugins/Installation/templates/_systemCheckSection.twig index b2bdc5bf59..13591c2c80 100644 --- a/plugins/Installation/templates/_systemCheckSection.twig +++ b/plugins/Installation/templates/_systemCheckSection.twig @@ -5,7 +5,7 @@ {% set informational = constant('Piwik\\Plugins\\Diagnostics\\Diagnostic\\DiagnosticResult::STATUS_INFORMATIONAL') %} {%- for result in results %} -#### {{ result.label }}: +#### {{ result.label|rawSafeDecoded }}: {% for item in result.items -%} {%- if item.status == error -%} ⚠ Error: {{ item.comment|anonymiseSystemInfo|striptags('<br><p><strong><code>') }}{% elseif item.status == warning %} ⚠ Warning: {{ item.comment|anonymiseSystemInfo|striptags('<br><p><strong><code>') }}{% elseif item.status == informational %} {{ item.comment|anonymiseSystemInfo|striptags('<br><p><strong><code>') }}{% else %} ✔ {{ item.comment|anonymiseSystemInfo|striptags('<br><p><strong><code>') }}{% endif -%} {%- endfor %} diff --git a/plugins/Installation/vue/dist/Installation.umd.js b/plugins/Installation/vue/dist/Installation.umd.js index dfca22a19c..0f91b702ea 100644 --- a/plugins/Installation/vue/dist/Installation.umd.js +++ b/plugins/Installation/vue/dist/Installation.umd.js @@ -262,52 +262,53 @@ function SystemCheckSectionvue_type_template_id_5d6873c0_render(_ctx, _cache, $p } // CONCATENATED MODULE: ./plugins/Installation/vue/src/SystemCheck/SystemCheckSection.vue?vue&type=template&id=5d6873c0 -// CONCATENATED MODULE: ./node_modules/@vue/cli-plugin-babel/node_modules/cache-loader/dist/cjs.js??ref--12-0!./node_modules/@vue/cli-plugin-babel/node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib!./node_modules/@vue/cli-service/node_modules/vue-loader-v16/dist/templateLoader.js??ref--6!./node_modules/@vue/cli-service/node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/@vue/cli-service/node_modules/vue-loader-v16/dist??ref--0-1!./plugins/Installation/vue/src/SystemCheck/DiagnosticTable.vue?vue&type=template&id=913754cc +// CONCATENATED MODULE: ./node_modules/@vue/cli-plugin-babel/node_modules/cache-loader/dist/cjs.js??ref--12-0!./node_modules/@vue/cli-plugin-babel/node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib!./node_modules/@vue/cli-service/node_modules/vue-loader-v16/dist/templateLoader.js??ref--6!./node_modules/@vue/cli-service/node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/@vue/cli-service/node_modules/vue-loader-v16/dist??ref--0-1!./plugins/Installation/vue/src/SystemCheck/DiagnosticTable.vue?vue&type=template&id=dfcc11da -var DiagnosticTablevue_type_template_id_913754cc_hoisted_1 = { +var DiagnosticTablevue_type_template_id_dfcc11da_hoisted_1 = ["innerHTML"]; +var DiagnosticTablevue_type_template_id_dfcc11da_hoisted_2 = { key: 0 }; -var DiagnosticTablevue_type_template_id_913754cc_hoisted_2 = /*#__PURE__*/Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("span", { +var DiagnosticTablevue_type_template_id_dfcc11da_hoisted_3 = /*#__PURE__*/Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("span", { class: "icon-error" }, null, -1); -var DiagnosticTablevue_type_template_id_913754cc_hoisted_3 = ["innerHTML"]; -var DiagnosticTablevue_type_template_id_913754cc_hoisted_4 = { +var DiagnosticTablevue_type_template_id_dfcc11da_hoisted_4 = ["innerHTML"]; +var DiagnosticTablevue_type_template_id_dfcc11da_hoisted_5 = { key: 1 }; -var DiagnosticTablevue_type_template_id_913754cc_hoisted_5 = /*#__PURE__*/Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("span", { +var DiagnosticTablevue_type_template_id_dfcc11da_hoisted_6 = /*#__PURE__*/Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("span", { class: "icon-warning" }, null, -1); -var DiagnosticTablevue_type_template_id_913754cc_hoisted_6 = ["innerHTML"]; -var DiagnosticTablevue_type_template_id_913754cc_hoisted_7 = { +var DiagnosticTablevue_type_template_id_dfcc11da_hoisted_7 = ["innerHTML"]; +var _hoisted_8 = { key: 2 }; -var _hoisted_8 = /*#__PURE__*/Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("span", { +var _hoisted_9 = /*#__PURE__*/Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("span", { class: "icon-info2" }, null, -1); -var _hoisted_9 = ["innerHTML"]; -var _hoisted_10 = { +var _hoisted_10 = ["innerHTML"]; +var _hoisted_11 = { key: 3 }; -var _hoisted_11 = /*#__PURE__*/Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("span", { +var _hoisted_12 = /*#__PURE__*/Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("span", { class: "icon-ok" }, null, -1); -var _hoisted_12 = ["innerHTML"]; +var _hoisted_13 = ["innerHTML"]; -var _hoisted_13 = /*#__PURE__*/Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("br", null, null, -1); +var _hoisted_14 = /*#__PURE__*/Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("br", null, null, -1); -var _hoisted_14 = { +var _hoisted_15 = { key: 0 }; -var _hoisted_15 = ["innerHTML"]; -function DiagnosticTablevue_type_template_id_913754cc_render(_ctx, _cache, $props, $setup, $data, $options) { +var _hoisted_16 = ["innerHTML"]; +function DiagnosticTablevue_type_template_id_dfcc11da_render(_ctx, _cache, $props, $setup, $data, $options) { var _component_Passthrough = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["resolveComponent"])("Passthrough"); return Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(true), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])(external_commonjs_vue_commonjs2_vue_root_Vue_["Fragment"], null, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["renderList"])(_ctx.results, function (result, index) { @@ -315,33 +316,35 @@ function DiagnosticTablevue_type_template_id_913754cc_render(_ctx, _cache, $prop key: index }, { default: Object(external_commonjs_vue_commonjs2_vue_root_Vue_["withCtx"])(function () { - return [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("tr", null, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("td", null, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(result.label), 1), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("td", null, [(Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(true), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])(external_commonjs_vue_commonjs2_vue_root_Vue_["Fragment"], null, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["renderList"])(result.items, function (item, index) { + return [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("tr", null, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("td", { + innerHTML: _ctx.$sanitize(result.label) + }, null, 8, DiagnosticTablevue_type_template_id_dfcc11da_hoisted_1), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("td", null, [(Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(true), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])(external_commonjs_vue_commonjs2_vue_root_Vue_["Fragment"], null, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["renderList"])(result.items, function (item, index) { return Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("span", { key: index - }, [item.status === 'error' ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("span", DiagnosticTablevue_type_template_id_913754cc_hoisted_1, [DiagnosticTablevue_type_template_id_913754cc_hoisted_2, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("span", { + }, [item.status === 'error' ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("span", DiagnosticTablevue_type_template_id_dfcc11da_hoisted_2, [DiagnosticTablevue_type_template_id_dfcc11da_hoisted_3, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("span", { class: "err", innerHTML: _ctx.$sanitize(typeof item.comment !== 'string' ? '' : item.comment) - }, null, 8, DiagnosticTablevue_type_template_id_913754cc_hoisted_3)])) : item.status === 'warning' ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("span", DiagnosticTablevue_type_template_id_913754cc_hoisted_4, [DiagnosticTablevue_type_template_id_913754cc_hoisted_5, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("span", { + }, null, 8, DiagnosticTablevue_type_template_id_dfcc11da_hoisted_4)])) : item.status === 'warning' ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("span", DiagnosticTablevue_type_template_id_dfcc11da_hoisted_5, [DiagnosticTablevue_type_template_id_dfcc11da_hoisted_6, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("span", { innerHTML: _ctx.$sanitize(typeof item.comment !== 'string' ? '' : item.comment) - }, null, 8, DiagnosticTablevue_type_template_id_913754cc_hoisted_6)])) : item.status === 'informational' ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("span", DiagnosticTablevue_type_template_id_913754cc_hoisted_7, [_hoisted_8, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("span", { + }, null, 8, DiagnosticTablevue_type_template_id_dfcc11da_hoisted_7)])) : item.status === 'informational' ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("span", _hoisted_8, [_hoisted_9, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("span", { innerHTML: _ctx.$sanitize(typeof item.comment !== 'string' ? '' : item.comment) - }, null, 8, _hoisted_9)])) : (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("span", _hoisted_10, [_hoisted_11, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("span", { + }, null, 8, _hoisted_10)])) : (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("span", _hoisted_11, [_hoisted_12, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("span", { innerHTML: _ctx.$sanitize(typeof item.comment !== 'string' ? '' : item.comment) - }, null, 8, _hoisted_12)])), _hoisted_13]); - }), 128))])]), result.longErrorMessage ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("tr", _hoisted_14, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("td", { + }, null, 8, _hoisted_13)])), _hoisted_14]); + }), 128))])]), result.longErrorMessage ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("tr", _hoisted_15, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("td", { colspan: "2", class: "error", style: { "font-size": "small" }, innerHTML: _ctx.$sanitize(result.longErrorMessage) - }, null, 8, _hoisted_15)])) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true)]; + }, null, 8, _hoisted_16)])) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true)]; }), _: 2 }, 1024); }), 128); } -// CONCATENATED MODULE: ./plugins/Installation/vue/src/SystemCheck/DiagnosticTable.vue?vue&type=template&id=913754cc +// CONCATENATED MODULE: ./plugins/Installation/vue/src/SystemCheck/DiagnosticTable.vue?vue&type=template&id=dfcc11da // CONCATENATED MODULE: ./node_modules/@vue/cli-plugin-typescript/node_modules/cache-loader/dist/cjs.js??ref--14-0!./node_modules/babel-loader/lib!./node_modules/@vue/cli-plugin-typescript/node_modules/ts-loader??ref--14-2!./node_modules/@vue/cli-service/node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/@vue/cli-service/node_modules/vue-loader-v16/dist??ref--0-1!./plugins/Installation/vue/src/SystemCheck/DiagnosticTable.vue?vue&type=script&lang=ts @@ -375,7 +378,7 @@ function DiagnosticTablevue_type_template_id_913754cc_render(_ctx, _cache, $prop -DiagnosticTablevue_type_script_lang_ts.render = DiagnosticTablevue_type_template_id_913754cc_render +DiagnosticTablevue_type_script_lang_ts.render = DiagnosticTablevue_type_template_id_dfcc11da_render /* harmony default export */ var DiagnosticTable = (DiagnosticTablevue_type_script_lang_ts); // CONCATENATED MODULE: ./node_modules/@vue/cli-plugin-typescript/node_modules/cache-loader/dist/cjs.js??ref--14-0!./node_modules/babel-loader/lib!./node_modules/@vue/cli-plugin-typescript/node_modules/ts-loader??ref--14-2!./node_modules/@vue/cli-service/node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/@vue/cli-service/node_modules/vue-loader-v16/dist??ref--0-1!./plugins/Installation/vue/src/SystemCheck/SystemCheckSection.vue?vue&type=script&lang=ts diff --git a/plugins/Installation/vue/dist/Installation.umd.min.js b/plugins/Installation/vue/dist/Installation.umd.min.js index 3e9ca0eacb..42314274d4 100644 --- a/plugins/Installation/vue/dist/Installation.umd.min.js +++ b/plugins/Installation/vue/dist/Installation.umd.min.js @@ -1,4 +1,4 @@ -(function(e,t){"object"===typeof exports&&"object"===typeof module?module.exports=t(require("CoreHome"),require("vue")):"function"===typeof define&&define.amd?define(["CoreHome"],t):"object"===typeof exports?exports["Installation"]=t(require("CoreHome"),require("vue")):e["Installation"]=t(e["CoreHome"],e["Vue"])})("undefined"!==typeof self?self:this,(function(e,t){return function(e){var t={};function n(r){if(t[r])return t[r].exports;var o=t[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,n),o.l=!0,o.exports}return n.m=e,n.c=t,n.d=function(e,t,r){n.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},n.r=function(e){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},n.t=function(e,t){if(1&t&&(e=n(e)),8&t)return e;if(4&t&&"object"===typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(n.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var o in e)n.d(r,o,function(t){return e[t]}.bind(null,o));return r},n.n=function(e){var t=e&&e.__esModule?function(){return e["default"]}:function(){return e};return n.d(t,"a",t),t},n.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},n.p="plugins/Installation/vue/dist/",n(n.s="fae3")}({"19dc":function(t,n){t.exports=e},"8bbf":function(e,n){e.exports=t},fae3:function(e,t,n){"use strict";if(n.r(t),n.d(t,"SystemCheckPage",(function(){return W})),n.d(t,"SystemCheck",(function(){return se})),"undefined"!==typeof window){var r=window.document.currentScript,o=r&&r.src.match(/(.+\/)[^/]+\.js(\?.*)?$/);o&&(n.p=o[1])}var l=n("8bbf"),a={key:0,class:"alert alert-danger"},c=["innerHTML"],i={key:1,class:"alert alert-warning"},s={key:2,class:"alert alert-success"};function p(e,t,n,r,o,p){var u=Object(l["resolveComponent"])("SystemCheckSection"),m=Object(l["resolveComponent"])("ContentBlock");return Object(l["openBlock"])(),Object(l["createBlock"])(m,{"content-title":e.translate("Installation_SystemCheck"),feature:"true"},{default:Object(l["withCtx"])((function(){return[e.hasErrors?(Object(l["openBlock"])(),Object(l["createElementBlock"])("div",a,[Object(l["createElementVNode"])("span",{innerHTML:e.$sanitize(e.thereWereErrorsText)},null,8,c),Object(l["createTextVNode"])(" "+Object(l["toDisplayString"])(e.translate("Installation_SeeBelowForMoreInfo")),1)])):e.hasWarnings?(Object(l["openBlock"])(),Object(l["createElementBlock"])("div",i,Object(l["toDisplayString"])(e.translate("Installation_SystemCheckSummaryThereWereWarnings"))+" "+Object(l["toDisplayString"])(e.translate("Installation_SeeBelowForMoreInfo")),1)):(Object(l["openBlock"])(),Object(l["createElementBlock"])("div",s,Object(l["toDisplayString"])(e.translate("Installation_SystemCheckSummaryNoProblems")),1)),Object(l["createVNode"])(u,{"error-type":e.errorType,"warning-type":e.warningType,"informational-type":e.informationalType,"system-check-info":e.systemCheckInfo,"mandatory-results":e.mandatoryResults,"optional-results":e.optionalResults,"informational-results":e.informationalResults,"is-installation":e.isInstallation},null,8,["error-type","warning-type","informational-type","system-check-info","mandatory-results","optional-results","informational-results","is-installation"])]})),_:1},8,["content-title"])}var u=n("19dc"),m=Object(l["createElementVNode"])("br",null,null,-1),y=Object(l["createTextVNode"])(),d=Object(l["createElementVNode"])("br",null,null,-1),b=["innerHTML"],f={class:"entityTable system-check",id:"systemCheckRequired"},j={class:"entityTable system-check",id:"systemCheckOptional"},O={class:"entityTable system-check",id:"systemCheckInformational"};function g(e,t,n,r,o,a){var c=Object(l["resolveComponent"])("DiagnosticTable"),i=Object(l["resolveDirective"])("content-table");return Object(l["openBlock"])(),Object(l["createElementBlock"])(l["Fragment"],null,[Object(l["createElementVNode"])("p",null,[Object(l["createTextVNode"])(Object(l["toDisplayString"])(e.translate("Installation_CopyBelowInfoForSupport"))+" ",1),m,y,d,Object(l["createElementVNode"])("a",{href:"",onClick:t[0]||(t[0]=Object(l["withModifiers"])((function(t){return e.copyInfo()}),["prevent"])),class:"btn",style:{"margin-right":"3.5px"}},Object(l["toDisplayString"])(e.translate("Installation_CopySystemCheck")),1),Object(l["createElementVNode"])("a",{href:"",onClick:t[1]||(t[1]=Object(l["withModifiers"])((function(t){return e.downloadInfo()}),["prevent"])),class:"btn"},Object(l["toDisplayString"])(e.translate("Installation_DownloadSystemCheck")),1)]),Object(l["createElementVNode"])("div",null,[Object(l["createElementVNode"])("textarea",{style:{width:"100%",height:"200px"},readonly:"",id:"matomo_system_check_info",ref:"systemCheckInfo",innerHTML:e.$sanitize(e.systemCheckInfo)},null,8,b),Object(l["withDirectives"])(Object(l["createElementVNode"])("table",f,[Object(l["createElementVNode"])("tbody",null,[Object(l["createVNode"])(c,{results:e.mandatoryResults,"informational-type":e.informationalType,"warning-type":e.warningType,"error-type":e.errorType},null,8,["results","informational-type","warning-type","error-type"])])],512),[[i,{off:e.isInstallation}]]),Object(l["createElementVNode"])("h3",null,Object(l["toDisplayString"])(e.translate("Installation_Optional")),1),Object(l["withDirectives"])(Object(l["createElementVNode"])("table",j,[Object(l["createElementVNode"])("tbody",null,[Object(l["createVNode"])(c,{results:e.optionalResults,"informational-type":e.informationalType,"warning-type":e.warningType,"error-type":e.errorType},null,8,["results","informational-type","warning-type","error-type"])])],512),[[i,{off:e.isInstallation}]]),Object(l["createElementVNode"])("h3",null,Object(l["toDisplayString"])(e.translate("Installation_InformationalResults")),1),Object(l["withDirectives"])(Object(l["createElementVNode"])("table",O,[Object(l["createElementVNode"])("tbody",null,[Object(l["createVNode"])(c,{results:e.informationalResults,"informational-type":e.informationalType,"warning-type":e.warningType,"error-type":e.errorType},null,8,["results","informational-type","warning-type","error-type"])])],512),[[i,{off:e.isInstallation}]])])],64)}var k={key:0},h=Object(l["createElementVNode"])("span",{class:"icon-error"},null,-1),S=["innerHTML"],E={key:1},N=Object(l["createElementVNode"])("span",{class:"icon-warning"},null,-1),C=["innerHTML"],T={key:2},V=Object(l["createElementVNode"])("span",{class:"icon-info2"},null,-1),v=["innerHTML"],w={key:3},B=Object(l["createElementVNode"])("span",{class:"icon-ok"},null,-1),I=["innerHTML"],q=Object(l["createElementVNode"])("br",null,null,-1),_={key:0},x=["innerHTML"];function D(e,t,n,r,o,a){var c=Object(l["resolveComponent"])("Passthrough");return Object(l["openBlock"])(!0),Object(l["createElementBlock"])(l["Fragment"],null,Object(l["renderList"])(e.results,(function(t,n){return Object(l["openBlock"])(),Object(l["createBlock"])(c,{key:n},{default:Object(l["withCtx"])((function(){return[Object(l["createElementVNode"])("tr",null,[Object(l["createElementVNode"])("td",null,Object(l["toDisplayString"])(t.label),1),Object(l["createElementVNode"])("td",null,[(Object(l["openBlock"])(!0),Object(l["createElementBlock"])(l["Fragment"],null,Object(l["renderList"])(t.items,(function(t,n){return Object(l["openBlock"])(),Object(l["createElementBlock"])("span",{key:n},["error"===t.status?(Object(l["openBlock"])(),Object(l["createElementBlock"])("span",k,[h,Object(l["createElementVNode"])("span",{class:"err",innerHTML:e.$sanitize("string"!==typeof t.comment?"":t.comment)},null,8,S)])):"warning"===t.status?(Object(l["openBlock"])(),Object(l["createElementBlock"])("span",E,[N,Object(l["createElementVNode"])("span",{innerHTML:e.$sanitize("string"!==typeof t.comment?"":t.comment)},null,8,C)])):"informational"===t.status?(Object(l["openBlock"])(),Object(l["createElementBlock"])("span",T,[V,Object(l["createElementVNode"])("span",{innerHTML:e.$sanitize("string"!==typeof t.comment?"":t.comment)},null,8,v)])):(Object(l["openBlock"])(),Object(l["createElementBlock"])("span",w,[B,Object(l["createElementVNode"])("span",{innerHTML:e.$sanitize("string"!==typeof t.comment?"":t.comment)},null,8,I)])),q])})),128))])]),t.longErrorMessage?(Object(l["openBlock"])(),Object(l["createElementBlock"])("tr",_,[Object(l["createElementVNode"])("td",{colspan:"2",class:"error",style:{"font-size":"small"},innerHTML:e.$sanitize(t.longErrorMessage)},null,8,x)])):Object(l["createCommentVNode"])("",!0)]})),_:2},1024)})),128)}var M=Object(l["defineComponent"])({props:{errorType:{type:String,required:!0},warningType:{type:String,required:!0},informationalType:{type:String,required:!0},results:{type:Array,required:!0}},components:{Passthrough:u["Passthrough"]}});M.render=D;var L=M,R=window,H=R.$,P=Object(l["defineComponent"])({props:{errorType:{type:String,required:!0},warningType:{type:String,required:!0},informationalType:{type:String,required:!0},systemCheckInfo:{type:String,required:!0},mandatoryResults:{type:Array,required:!0},optionalResults:{type:Array,required:!0},informationalResults:{type:Array,required:!0},isInstallation:Boolean},components:{DiagnosticTable:L},directives:{ContentTable:u["ContentTable"]},methods:{copyInfo:function(){var e=this.$refs.systemCheckInfo;e.select(),document.execCommand("copy"),H(e).effect("highlight",{},600)},downloadInfo:function(){var e=this.$refs.systemCheckInfo;u["Matomo"].helper.sendContentAsDownload("matomo_system_check.txt",e.innerHTML)}}});P.render=g;var $=P,A=Object(l["defineComponent"])({props:{errorType:{type:String,required:!0},warningType:{type:String,required:!0},informationalType:{type:String,required:!0},systemCheckInfo:{type:String,required:!0},mandatoryResults:{type:Array,required:!0},optionalResults:{type:Array,required:!0},informationalResults:{type:Array,required:!0},isInstallation:Boolean,hasErrors:Boolean,hasWarnings:Boolean},components:{ContentBlock:u["ContentBlock"],SystemCheckSection:$},computed:{thereWereErrorsText:function(){return Object(u["translate"])("Installation_SystemCheckSummaryThereWereErrors","<strong>","</strong>","<strong>","</strong>")}}});A.render=p;var W=A,z={key:0},F=Object(l["createElementVNode"])("br",{style:{clear:"both"}},null,-1),G={key:1},U={key:0},J=Object(l["createElementVNode"])("span",{class:"icon-export"},null,-1),K={target:"_blank",rel:"noreferrer noopener",href:"https://matomo.org/docs/requirements/"};function Q(e,t,n,r,o,a){var c=Object(l["resolveComponent"])("SystemCheckLegend"),i=Object(l["resolveComponent"])("SystemCheckSection");return Object(l["openBlock"])(),Object(l["createElementBlock"])("div",null,[e.showNextStep?Object(l["createCommentVNode"])("",!0):(Object(l["openBlock"])(),Object(l["createElementBlock"])("div",z,[Object(l["createVNode"])(c,{url:e.systemCheckLegendUrl},null,8,["url"]),F])),Object(l["createElementVNode"])("h2",null,Object(l["toDisplayString"])(e.translate("Installation_SystemCheck")),1),Object(l["createVNode"])(i,{"error-type":e.errorType,"warning-type":e.warningType,"informational-type":e.informationalType,"system-check-info":e.systemCheckInfo,"mandatory-results":e.mandatoryResults,"optional-results":e.optionalResults,"informational-results":e.informationalResults,"is-installation":e.isInstallation},null,8,["error-type","warning-type","informational-type","system-check-info","mandatory-results","optional-results","informational-results","is-installation"]),e.showNextStep?Object(l["createCommentVNode"])("",!0):(Object(l["openBlock"])(),Object(l["createElementBlock"])("div",G,[e.showNextStep?Object(l["createCommentVNode"])("",!0):(Object(l["openBlock"])(),Object(l["createElementBlock"])("p",U,[J,Object(l["createElementVNode"])("a",K,Object(l["toDisplayString"])(e.translate("Installation_Requirements")),1)])),Object(l["createVNode"])(c,{url:e.systemCheckLegendUrl},null,8,["url"])]))])}var X={class:"system-check-legend"},Y=Object(l["createElementVNode"])("span",{class:"icon-ok"},null,-1),Z=Object(l["createElementVNode"])("span",{class:"icon-warning"},null,-1),ee=Object(l["createElementVNode"])("span",{class:"icon-error"},null,-1),te={class:"next-step"},ne=["href"];function re(e,t,n,r,o,a){return Object(l["openBlock"])(),Object(l["createElementBlock"])(l["Fragment"],null,[Object(l["createElementVNode"])("div",X,[Object(l["createElementVNode"])("h2",null,Object(l["toDisplayString"])(e.translate("Installation_Legend")),1),Object(l["createElementVNode"])("p",null,[Y,Object(l["createTextVNode"])(" "+Object(l["toDisplayString"])(e.translate("General_Ok")),1)]),Object(l["createElementVNode"])("p",null,[Z,Object(l["createTextVNode"])(" "+Object(l["toDisplayString"])(e.translate("General_Warning"))+": "+Object(l["toDisplayString"])(e.translate("Installation_SystemCheckWarning")),1)]),Object(l["createElementVNode"])("p",null,[ee,Object(l["createTextVNode"])(" "+Object(l["toDisplayString"])(e.translate("General_Error"))+": "+Object(l["toDisplayString"])(e.translate("Installation_SystemCheckError")),1)])]),Object(l["createElementVNode"])("p",te,[Object(l["createElementVNode"])("a",{href:e.url},Object(l["toDisplayString"])(e.translate("General_RefreshPage"))+" »",9,ne)])],64)}var oe=Object(l["defineComponent"])({props:{url:{type:String,required:!0}}});oe.render=re;var le=oe,ae=window,ce=ae.$,ie=Object(l["defineComponent"])({props:{showNextStep:Boolean,systemCheckLegendUrl:{type:String,required:!0},errorType:{type:String,required:!0},warningType:{type:String,required:!0},informationalType:{type:String,required:!0},systemCheckInfo:{type:String,required:!0},mandatoryResults:{type:Array,required:!0},optionalResults:{type:Array,required:!0},informationalResults:{type:Array,required:!0},isInstallation:Boolean},components:{SystemCheckSection:$,SystemCheckLegend:le},mounted:function(){if("https:"===document.location.protocol){var e=ce("p.next-step a");e.attr("href","".concat(e.attr("href"),"&clientProtocol=https"))}}});ie.render=Q;var se=ie; +(function(e,t){"object"===typeof exports&&"object"===typeof module?module.exports=t(require("CoreHome"),require("vue")):"function"===typeof define&&define.amd?define(["CoreHome"],t):"object"===typeof exports?exports["Installation"]=t(require("CoreHome"),require("vue")):e["Installation"]=t(e["CoreHome"],e["Vue"])})("undefined"!==typeof self?self:this,(function(e,t){return function(e){var t={};function n(r){if(t[r])return t[r].exports;var o=t[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,n),o.l=!0,o.exports}return n.m=e,n.c=t,n.d=function(e,t,r){n.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},n.r=function(e){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},n.t=function(e,t){if(1&t&&(e=n(e)),8&t)return e;if(4&t&&"object"===typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(n.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var o in e)n.d(r,o,function(t){return e[t]}.bind(null,o));return r},n.n=function(e){var t=e&&e.__esModule?function(){return e["default"]}:function(){return e};return n.d(t,"a",t),t},n.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},n.p="plugins/Installation/vue/dist/",n(n.s="fae3")}({"19dc":function(t,n){t.exports=e},"8bbf":function(e,n){e.exports=t},fae3:function(e,t,n){"use strict";if(n.r(t),n.d(t,"SystemCheckPage",(function(){return W})),n.d(t,"SystemCheck",(function(){return pe})),"undefined"!==typeof window){var r=window.document.currentScript,o=r&&r.src.match(/(.+\/)[^/]+\.js(\?.*)?$/);o&&(n.p=o[1])}var l=n("8bbf"),a={key:0,class:"alert alert-danger"},c=["innerHTML"],i={key:1,class:"alert alert-warning"},s={key:2,class:"alert alert-success"};function p(e,t,n,r,o,p){var u=Object(l["resolveComponent"])("SystemCheckSection"),m=Object(l["resolveComponent"])("ContentBlock");return Object(l["openBlock"])(),Object(l["createBlock"])(m,{"content-title":e.translate("Installation_SystemCheck"),feature:"true"},{default:Object(l["withCtx"])((function(){return[e.hasErrors?(Object(l["openBlock"])(),Object(l["createElementBlock"])("div",a,[Object(l["createElementVNode"])("span",{innerHTML:e.$sanitize(e.thereWereErrorsText)},null,8,c),Object(l["createTextVNode"])(" "+Object(l["toDisplayString"])(e.translate("Installation_SeeBelowForMoreInfo")),1)])):e.hasWarnings?(Object(l["openBlock"])(),Object(l["createElementBlock"])("div",i,Object(l["toDisplayString"])(e.translate("Installation_SystemCheckSummaryThereWereWarnings"))+" "+Object(l["toDisplayString"])(e.translate("Installation_SeeBelowForMoreInfo")),1)):(Object(l["openBlock"])(),Object(l["createElementBlock"])("div",s,Object(l["toDisplayString"])(e.translate("Installation_SystemCheckSummaryNoProblems")),1)),Object(l["createVNode"])(u,{"error-type":e.errorType,"warning-type":e.warningType,"informational-type":e.informationalType,"system-check-info":e.systemCheckInfo,"mandatory-results":e.mandatoryResults,"optional-results":e.optionalResults,"informational-results":e.informationalResults,"is-installation":e.isInstallation},null,8,["error-type","warning-type","informational-type","system-check-info","mandatory-results","optional-results","informational-results","is-installation"])]})),_:1},8,["content-title"])}var u=n("19dc"),m=Object(l["createElementVNode"])("br",null,null,-1),y=Object(l["createTextVNode"])(),d=Object(l["createElementVNode"])("br",null,null,-1),b=["innerHTML"],f={class:"entityTable system-check",id:"systemCheckRequired"},j={class:"entityTable system-check",id:"systemCheckOptional"},O={class:"entityTable system-check",id:"systemCheckInformational"};function g(e,t,n,r,o,a){var c=Object(l["resolveComponent"])("DiagnosticTable"),i=Object(l["resolveDirective"])("content-table");return Object(l["openBlock"])(),Object(l["createElementBlock"])(l["Fragment"],null,[Object(l["createElementVNode"])("p",null,[Object(l["createTextVNode"])(Object(l["toDisplayString"])(e.translate("Installation_CopyBelowInfoForSupport"))+" ",1),m,y,d,Object(l["createElementVNode"])("a",{href:"",onClick:t[0]||(t[0]=Object(l["withModifiers"])((function(t){return e.copyInfo()}),["prevent"])),class:"btn",style:{"margin-right":"3.5px"}},Object(l["toDisplayString"])(e.translate("Installation_CopySystemCheck")),1),Object(l["createElementVNode"])("a",{href:"",onClick:t[1]||(t[1]=Object(l["withModifiers"])((function(t){return e.downloadInfo()}),["prevent"])),class:"btn"},Object(l["toDisplayString"])(e.translate("Installation_DownloadSystemCheck")),1)]),Object(l["createElementVNode"])("div",null,[Object(l["createElementVNode"])("textarea",{style:{width:"100%",height:"200px"},readonly:"",id:"matomo_system_check_info",ref:"systemCheckInfo",innerHTML:e.$sanitize(e.systemCheckInfo)},null,8,b),Object(l["withDirectives"])(Object(l["createElementVNode"])("table",f,[Object(l["createElementVNode"])("tbody",null,[Object(l["createVNode"])(c,{results:e.mandatoryResults,"informational-type":e.informationalType,"warning-type":e.warningType,"error-type":e.errorType},null,8,["results","informational-type","warning-type","error-type"])])],512),[[i,{off:e.isInstallation}]]),Object(l["createElementVNode"])("h3",null,Object(l["toDisplayString"])(e.translate("Installation_Optional")),1),Object(l["withDirectives"])(Object(l["createElementVNode"])("table",j,[Object(l["createElementVNode"])("tbody",null,[Object(l["createVNode"])(c,{results:e.optionalResults,"informational-type":e.informationalType,"warning-type":e.warningType,"error-type":e.errorType},null,8,["results","informational-type","warning-type","error-type"])])],512),[[i,{off:e.isInstallation}]]),Object(l["createElementVNode"])("h3",null,Object(l["toDisplayString"])(e.translate("Installation_InformationalResults")),1),Object(l["withDirectives"])(Object(l["createElementVNode"])("table",O,[Object(l["createElementVNode"])("tbody",null,[Object(l["createVNode"])(c,{results:e.informationalResults,"informational-type":e.informationalType,"warning-type":e.warningType,"error-type":e.errorType},null,8,["results","informational-type","warning-type","error-type"])])],512),[[i,{off:e.isInstallation}]])])],64)}var k=["innerHTML"],h={key:0},S=Object(l["createElementVNode"])("span",{class:"icon-error"},null,-1),E=["innerHTML"],N={key:1},C=Object(l["createElementVNode"])("span",{class:"icon-warning"},null,-1),T=["innerHTML"],V={key:2},v=Object(l["createElementVNode"])("span",{class:"icon-info2"},null,-1),w=["innerHTML"],B={key:3},I=Object(l["createElementVNode"])("span",{class:"icon-ok"},null,-1),q=["innerHTML"],_=Object(l["createElementVNode"])("br",null,null,-1),x={key:0},M=["innerHTML"];function D(e,t,n,r,o,a){var c=Object(l["resolveComponent"])("Passthrough");return Object(l["openBlock"])(!0),Object(l["createElementBlock"])(l["Fragment"],null,Object(l["renderList"])(e.results,(function(t,n){return Object(l["openBlock"])(),Object(l["createBlock"])(c,{key:n},{default:Object(l["withCtx"])((function(){return[Object(l["createElementVNode"])("tr",null,[Object(l["createElementVNode"])("td",{innerHTML:e.$sanitize(t.label)},null,8,k),Object(l["createElementVNode"])("td",null,[(Object(l["openBlock"])(!0),Object(l["createElementBlock"])(l["Fragment"],null,Object(l["renderList"])(t.items,(function(t,n){return Object(l["openBlock"])(),Object(l["createElementBlock"])("span",{key:n},["error"===t.status?(Object(l["openBlock"])(),Object(l["createElementBlock"])("span",h,[S,Object(l["createElementVNode"])("span",{class:"err",innerHTML:e.$sanitize("string"!==typeof t.comment?"":t.comment)},null,8,E)])):"warning"===t.status?(Object(l["openBlock"])(),Object(l["createElementBlock"])("span",N,[C,Object(l["createElementVNode"])("span",{innerHTML:e.$sanitize("string"!==typeof t.comment?"":t.comment)},null,8,T)])):"informational"===t.status?(Object(l["openBlock"])(),Object(l["createElementBlock"])("span",V,[v,Object(l["createElementVNode"])("span",{innerHTML:e.$sanitize("string"!==typeof t.comment?"":t.comment)},null,8,w)])):(Object(l["openBlock"])(),Object(l["createElementBlock"])("span",B,[I,Object(l["createElementVNode"])("span",{innerHTML:e.$sanitize("string"!==typeof t.comment?"":t.comment)},null,8,q)])),_])})),128))])]),t.longErrorMessage?(Object(l["openBlock"])(),Object(l["createElementBlock"])("tr",x,[Object(l["createElementVNode"])("td",{colspan:"2",class:"error",style:{"font-size":"small"},innerHTML:e.$sanitize(t.longErrorMessage)},null,8,M)])):Object(l["createCommentVNode"])("",!0)]})),_:2},1024)})),128)}var L=Object(l["defineComponent"])({props:{errorType:{type:String,required:!0},warningType:{type:String,required:!0},informationalType:{type:String,required:!0},results:{type:Array,required:!0}},components:{Passthrough:u["Passthrough"]}});L.render=D;var R=L,H=window,$=H.$,P=Object(l["defineComponent"])({props:{errorType:{type:String,required:!0},warningType:{type:String,required:!0},informationalType:{type:String,required:!0},systemCheckInfo:{type:String,required:!0},mandatoryResults:{type:Array,required:!0},optionalResults:{type:Array,required:!0},informationalResults:{type:Array,required:!0},isInstallation:Boolean},components:{DiagnosticTable:R},directives:{ContentTable:u["ContentTable"]},methods:{copyInfo:function(){var e=this.$refs.systemCheckInfo;e.select(),document.execCommand("copy"),$(e).effect("highlight",{},600)},downloadInfo:function(){var e=this.$refs.systemCheckInfo;u["Matomo"].helper.sendContentAsDownload("matomo_system_check.txt",e.innerHTML)}}});P.render=g;var A=P,z=Object(l["defineComponent"])({props:{errorType:{type:String,required:!0},warningType:{type:String,required:!0},informationalType:{type:String,required:!0},systemCheckInfo:{type:String,required:!0},mandatoryResults:{type:Array,required:!0},optionalResults:{type:Array,required:!0},informationalResults:{type:Array,required:!0},isInstallation:Boolean,hasErrors:Boolean,hasWarnings:Boolean},components:{ContentBlock:u["ContentBlock"],SystemCheckSection:A},computed:{thereWereErrorsText:function(){return Object(u["translate"])("Installation_SystemCheckSummaryThereWereErrors","<strong>","</strong>","<strong>","</strong>")}}});z.render=p;var W=z,F={key:0},G=Object(l["createElementVNode"])("br",{style:{clear:"both"}},null,-1),U={key:1},J={key:0},K=Object(l["createElementVNode"])("span",{class:"icon-export"},null,-1),Q={target:"_blank",rel:"noreferrer noopener",href:"https://matomo.org/docs/requirements/"};function X(e,t,n,r,o,a){var c=Object(l["resolveComponent"])("SystemCheckLegend"),i=Object(l["resolveComponent"])("SystemCheckSection");return Object(l["openBlock"])(),Object(l["createElementBlock"])("div",null,[e.showNextStep?Object(l["createCommentVNode"])("",!0):(Object(l["openBlock"])(),Object(l["createElementBlock"])("div",F,[Object(l["createVNode"])(c,{url:e.systemCheckLegendUrl},null,8,["url"]),G])),Object(l["createElementVNode"])("h2",null,Object(l["toDisplayString"])(e.translate("Installation_SystemCheck")),1),Object(l["createVNode"])(i,{"error-type":e.errorType,"warning-type":e.warningType,"informational-type":e.informationalType,"system-check-info":e.systemCheckInfo,"mandatory-results":e.mandatoryResults,"optional-results":e.optionalResults,"informational-results":e.informationalResults,"is-installation":e.isInstallation},null,8,["error-type","warning-type","informational-type","system-check-info","mandatory-results","optional-results","informational-results","is-installation"]),e.showNextStep?Object(l["createCommentVNode"])("",!0):(Object(l["openBlock"])(),Object(l["createElementBlock"])("div",U,[e.showNextStep?Object(l["createCommentVNode"])("",!0):(Object(l["openBlock"])(),Object(l["createElementBlock"])("p",J,[K,Object(l["createElementVNode"])("a",Q,Object(l["toDisplayString"])(e.translate("Installation_Requirements")),1)])),Object(l["createVNode"])(c,{url:e.systemCheckLegendUrl},null,8,["url"])]))])}var Y={class:"system-check-legend"},Z=Object(l["createElementVNode"])("span",{class:"icon-ok"},null,-1),ee=Object(l["createElementVNode"])("span",{class:"icon-warning"},null,-1),te=Object(l["createElementVNode"])("span",{class:"icon-error"},null,-1),ne={class:"next-step"},re=["href"];function oe(e,t,n,r,o,a){return Object(l["openBlock"])(),Object(l["createElementBlock"])(l["Fragment"],null,[Object(l["createElementVNode"])("div",Y,[Object(l["createElementVNode"])("h2",null,Object(l["toDisplayString"])(e.translate("Installation_Legend")),1),Object(l["createElementVNode"])("p",null,[Z,Object(l["createTextVNode"])(" "+Object(l["toDisplayString"])(e.translate("General_Ok")),1)]),Object(l["createElementVNode"])("p",null,[ee,Object(l["createTextVNode"])(" "+Object(l["toDisplayString"])(e.translate("General_Warning"))+": "+Object(l["toDisplayString"])(e.translate("Installation_SystemCheckWarning")),1)]),Object(l["createElementVNode"])("p",null,[te,Object(l["createTextVNode"])(" "+Object(l["toDisplayString"])(e.translate("General_Error"))+": "+Object(l["toDisplayString"])(e.translate("Installation_SystemCheckError")),1)])]),Object(l["createElementVNode"])("p",ne,[Object(l["createElementVNode"])("a",{href:e.url},Object(l["toDisplayString"])(e.translate("General_RefreshPage"))+" »",9,re)])],64)}var le=Object(l["defineComponent"])({props:{url:{type:String,required:!0}}});le.render=oe;var ae=le,ce=window,ie=ce.$,se=Object(l["defineComponent"])({props:{showNextStep:Boolean,systemCheckLegendUrl:{type:String,required:!0},errorType:{type:String,required:!0},warningType:{type:String,required:!0},informationalType:{type:String,required:!0},systemCheckInfo:{type:String,required:!0},mandatoryResults:{type:Array,required:!0},optionalResults:{type:Array,required:!0},informationalResults:{type:Array,required:!0},isInstallation:Boolean},components:{SystemCheckSection:A,SystemCheckLegend:ae},mounted:function(){if("https:"===document.location.protocol){var e=ie("p.next-step a");e.attr("href","".concat(e.attr("href"),"&clientProtocol=https"))}}});se.render=X;var pe=se; /*! * Matomo - free/libre analytics platform * diff --git a/plugins/Installation/vue/src/SystemCheck/DiagnosticTable.vue b/plugins/Installation/vue/src/SystemCheck/DiagnosticTable.vue index c74fc26c4f..13acb5930c 100644 --- a/plugins/Installation/vue/src/SystemCheck/DiagnosticTable.vue +++ b/plugins/Installation/vue/src/SystemCheck/DiagnosticTable.vue @@ -7,7 +7,7 @@ <template> <Passthrough v-for="(result, index) in results" :key="index"> <tr> - <td>{{ result.label }}</td> + <td v-html="$sanitize(result.label)"></td> <td> <span v-for="(item, index) in result.items" :key="index"> <span v-if="item.status === 'error'"> diff --git a/plugins/IntranetMeasurable/tests/UI/expected-screenshots/IntranetMeasurable_intranet_create.png b/plugins/IntranetMeasurable/tests/UI/expected-screenshots/IntranetMeasurable_intranet_create.png index 4971fe5e84..4adbc5a1dd 100644 --- a/plugins/IntranetMeasurable/tests/UI/expected-screenshots/IntranetMeasurable_intranet_create.png +++ b/plugins/IntranetMeasurable/tests/UI/expected-screenshots/IntranetMeasurable_intranet_create.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d1a6974d8cae7d5cb793967740aa2631941febb01142050bf611ac2d1aebe6de -size 352084 +oid sha256:ee58986df1afbbfbd4ddc52394b78765c3368d30b7d81e84ff62c4283e53d17b +size 351698 diff --git a/plugins/LoginLdap b/plugins/LoginLdap -Subproject d55286bf582435c823171c3107252e9ac2857ca +Subproject bd9750d4d385d07ba9bd4ecd5d313fddd773369 diff --git a/plugins/MobileMessaging/lang/en.json b/plugins/MobileMessaging/lang/en.json index b5a2a4f13d..0a2ba8e627 100644 --- a/plugins/MobileMessaging/lang/en.json +++ b/plugins/MobileMessaging/lang/en.json @@ -41,8 +41,8 @@ "SMS_Content_Too_Long": "[too long]", "Available_Credits": "Available credits: %1$s", "TopLinkTooltip": "Get Web Analytics Reports delivered to your email inbox or your mobile phone.", - "TopMenu": "Email & SMS Reports", + "TopMenu": "Email & SMS Reports", "UserKey": "Userkey", - "VerificationText": "Code is %1$s. To validate your phone number and receive Matomo SMS reports please copy this code in the form accessible via Matomo > %2$s > %3$s." + "VerificationText": "Code is %1$s. To validate your phone number and receive Matomo SMS reports please copy this code in the form accessible via Matomo → %2$s → %3$s." } }
\ No newline at end of file diff --git a/plugins/MultiSites/lang/en.json b/plugins/MultiSites/lang/en.json index dd2973a766..770ef0b81c 100644 --- a/plugins/MultiSites/lang/en.json +++ b/plugins/MultiSites/lang/en.json @@ -7,7 +7,7 @@ "SingleWebsitesDashboardDocumentation": "This report gives you an informational overview for a specific website, containing the most general metrics about your visitors.", "AllWebsitesDashboardDocumentation": "This report gives you an informational overview for each of your websites, containing the most general metrics about your visitors.", "EvolutionComparisonIncomplete": "The currently selected time period is %1$s complete.", - "EvolutionComparisonProportional": "When the previous period was also %1$s complete, there would have been an estimated %2$s %3$s\n (out of a total of %4$s %3$s in the previous period).", + "EvolutionComparisonProportional": "When the previous period was also %1$s complete, there would have been an estimated %2$s %3$s\n(out of a total of %4$s %3$s in the previous period).", "EvolutionComparisonDay": "%1$s %2$s this day compared to %3$s %2$s in the previous partial period (%4$s) Evolution: %5$s", "EvolutionComparisonWeek": "%1$s %2$s this week compared to %3$s %2$s in the previous partial period (%4$s) Evolution: %5$s", "EvolutionComparisonMonth": "%1$s %2$s this month compared to %3$s %2$s in the previous partial period (%4$s) Evolution: %5$s", diff --git a/plugins/PrivacyManager/changes.json b/plugins/PrivacyManager/changes.json index 9a3f42abea..cdd4617b96 100644 --- a/plugins/PrivacyManager/changes.json +++ b/plugins/PrivacyManager/changes.json @@ -4,6 +4,6 @@ "description": "The privacy manager user opt-out has been updated to provide new code generation options that improve compatibility and allow additional customisation.", "version": "4.12.0", "link_name": "For more information go here", - "link": "https://matomo.org/blog/2022/09/weve-improved-the-opt-out-feature" + "link": "https://matomo.org/blog/2022/09/improvements-to-matomo-opt-out-form-feature/" } -]
\ No newline at end of file +] diff --git a/plugins/PrivacyManager/lang/en.json b/plugins/PrivacyManager/lang/en.json index 067bda31bf..daf4542b99 100644 --- a/plugins/PrivacyManager/lang/en.json +++ b/plugins/PrivacyManager/lang/en.json @@ -37,7 +37,7 @@ "UnsetVisitColumnsHelp": "This action cannot be undone. A list of database columns in scope visit that you want to unset. Each value for that column will be set to its default value. Please note that if the same column exists in scope 'conversion', then this column will be deleted as well", "UnsetActionColumns": "Unset action columns", "UnsetActionColumnsHelp": "This action cannot be undone. A list of database columns in scope action that you want to unset. Each value for that column will be set to its default value.", - "AwarenessDocumentation": "Awareness & documentation", + "AwarenessDocumentation": "Awareness & documentation", "AwarenessDocumentationIntro": "Inform your users clearly and transparently, and make your colleagues aware of the data being collected and how it is used:", "AwarenessDocumentationDesc1": "Inform your visitors through a clear privacy notice whenever you’re collecting personal data.", "AwarenessDocumentationDesc2": "Inform your users in your privacy policy about what data you collect and how the data is used.", @@ -52,7 +52,7 @@ "ReportsRemovedAfter": "all aggregated reports are deleted after %1$s.", "ReportsNeverRemoved": "aggregated reports are <strong>never<\/strong> deleted.", "DBPurged": "DB purged.", - "DeleteBothConfirm": "You are about to enable both raw data deletion & report data deletion. This will permanently remove your ability to view old analytics data. Are you sure you want to do this?", + "DeleteBothConfirm": "You are about to enable both raw data deletion and report data deletion. This will permanently remove your ability to view old analytics data. Are you sure you want to do this?", "DeleteDataDescription": "You can configure Matomo to regularly delete old raw data and\/or aggregated reports to keep your database small or to meet privacy regulations such as GDPR.", "DeleteDataInterval": "Delete old data every", "DeleteOldVisitorLogs": "Delete old visitor logs", @@ -190,14 +190,14 @@ "ImprintUrlDescription": "A link to your Imprint page.", "PrivacyPolicyUrl": "Privacy Policy URL", "PrivacyPolicyUrlDescription": "A link to your Privacy Policy page.", - "TermsAndConditionUrl": "Terms & Conditions URL", - "TermsAndConditionUrlDescription": "A link to your Terms & Conditions page.", + "TermsAndConditionUrl": "Terms & Conditions URL", + "TermsAndConditionUrlDescription": "A link to your Terms & Conditions page.", "PrivacyPolicyUrlDescriptionSuffix": "If you set this, it will be displayed at the bottom of the login page and on pages that the '%1$s' user can access.", "ShowInEmbeddedWidgets": "Show in embedded widgets", - "ShowInEmbeddedWidgetsDescription": "If checked, a link to your Privacy Policy and your Terms & Conditions will be displayed at the bottom of embedded widgets.", + "ShowInEmbeddedWidgetsDescription": "If checked, a link to your Privacy Policy and your Terms & Conditions will be displayed at the bottom of embedded widgets.", "Imprint": "Imprint", "PrivacyPolicy": "Privacy Policy", - "TermsAndConditions": "Terms & Conditions", + "TermsAndConditions": "Terms & Conditions", "VisitsSuccessfullyExported": "Visits were successfully exported", "VisitsSuccessfullyDeleted": "Visits were successfully deleted", "LastAction": "Last action", diff --git a/plugins/PrivacyManager/templates/footerLinks.twig b/plugins/PrivacyManager/templates/footerLinks.twig index 5754e4f97f..41a17328b7 100644 --- a/plugins/PrivacyManager/templates/footerLinks.twig +++ b/plugins/PrivacyManager/templates/footerLinks.twig @@ -3,5 +3,5 @@ {% if imprintUrl|default('') is not empty and (privacyPolicyUrl|default('') is not empty or termsAndCondition|default('') is not empty) %}|{% endif %} {% if privacyPolicyUrl|default('') is not empty %}<a target="_blank" rel="noreferrer noopener" href="{{ privacyPolicyUrl|safelink|e('html_attr') }}">{{ 'PrivacyManager_PrivacyPolicy'|translate }}</a>{% endif %} {% if privacyPolicyUrl|default('') is not empty and termsAndCondition|default('') is not empty %}|{% endif %} - {% if termsAndCondition|default('') is not empty %}<a target="_blank" rel="noreferrer noopener" href="{{ termsAndCondition|safelink|e('html_attr') }}">{{ 'PrivacyManager_TermsAndConditions'|translate }}</a>{% endif %} + {% if termsAndCondition|default('') is not empty %}<a target="_blank" rel="noreferrer noopener" href="{{ termsAndCondition|safelink|e('html_attr') }}">{{ 'PrivacyManager_TermsAndConditions'|translate|rawSafeDecoded }}</a>{% endif %} </div> diff --git a/plugins/ProfessionalServices/lang/en.json b/plugins/ProfessionalServices/lang/en.json index 5b56bbfe0f..b13c41a54e 100644 --- a/plugins/ProfessionalServices/lang/en.json +++ b/plugins/ProfessionalServices/lang/en.json @@ -1,5 +1,5 @@ { "ProfessionalServices": { - "WidgetPremiumServicesForPiwik": "Premium Features & Services for Matomo" + "WidgetPremiumServicesForPiwik": "Premium Features & Services for Matomo" } }
\ No newline at end of file diff --git a/plugins/Referrers/lang/en.json b/plugins/Referrers/lang/en.json index b2ff338534..e1589bc286 100644 --- a/plugins/Referrers/lang/en.json +++ b/plugins/Referrers/lang/en.json @@ -66,7 +66,7 @@ "Socials": "Social Networks", "SocialsReportDocumentation": "This report shows which social networks led visitors to your website.<br />By clicking on a row in the table, you can see from which social network pages visitors came to your website.", "SocialsSubcategoryHelp": "In this table, you can see which websites referred visitors to your site.", - "SubmenuSearchEngines": "Search Engines & Keywords", + "SubmenuSearchEngines": "Search Engines & Keywords", "SubmenuWebsitesOnly": "Websites", "Type": "Channel Type", "TypeCampaigns": "%s from campaigns", diff --git a/plugins/SegmentEditor/lang/en.json b/plugins/SegmentEditor/lang/en.json index 8386674d01..dcdf639b52 100644 --- a/plugins/SegmentEditor/lang/en.json +++ b/plugins/SegmentEditor/lang/en.json @@ -12,12 +12,12 @@ "CurrentlySelectedSegment": "Currently selected segment: %s", "DataAvailableAtLaterDate": "Your segmented analytics reports will be available later. We apologize for the inconvenience.", "DefaultAllVisits": "All visits", - "DragDropCondition": "Drag & Drop condition", + "DragDropCondition": "Drag & Drop condition", "HideMessageInFuture": "Hide this message in the future", "LoadingSegmentedDataMayTakeSomeTime": "Processing segmented visitor data may take a few minutes...", "OperatorAND": "AND", "OperatorOR": "OR", - "SaveAndApply": "Save & Apply", + "SaveAndApply": "Save & Apply", "SegmentDisplayedAllWebsites": "all websites", "SegmentDisplayedThisWebsiteOnly": "this website only", "SegmentEditor": "Segment editor", @@ -52,7 +52,7 @@ "CustomUnprocessedSegmentApiError3": "(Alternatively, you can create a new segment programmatically using the SegmentEditor.add API method).", "CustomUnprocessedSegmentApiError4": "Once created the segment in the editor (or via API), this error message will disappear and within a few hours you will see your segmented report data, after the segment data has been pre-processed. (If it does not, there may be a problem.)", "CustomUnprocessedSegmentApiError5": "Please note that you can test whether your segment will work without having to wait for it to be processed by using the Live.getLastVisitsDetails API.", - "CustomUnprocessedSegmentApiError6": "When using this API method, you will see which users and actions were matched by your &segment= parameter.", + "CustomUnprocessedSegmentApiError6": "When using this API method, you will see which users and actions were matched by your &segment= parameter.", "CustomUnprocessedSegmentNoData": "To see data for this segment, you must create this segment manually in the Segment Editor, then wait a couple hours for preprocessing to complete.", "AddThisToMatomo": "Add this segment to Matomo", "ThisSegmentIsCompared": "This segment is currently compared.", diff --git a/plugins/SegmentEditor/templates/_segmentSelector.twig b/plugins/SegmentEditor/templates/_segmentSelector.twig index c03e31d14b..6afb5f5c23 100644 --- a/plugins/SegmentEditor/templates/_segmentSelector.twig +++ b/plugins/SegmentEditor/templates/_segmentSelector.twig @@ -78,7 +78,7 @@ {% if isVisitorLogEnabled %} <a class="btn-flat testSegment">{{ 'SegmentEditor_Test'|translate }}</a> {% endif %} - <button class="btn saveAndApply">{{ 'SegmentEditor_SaveAndApply'|translate }}</button> + <button class="btn saveAndApply">{{ 'SegmentEditor_SaveAndApply'|translate|raw }}</button> </div> </div> </div> diff --git a/plugins/SitesManager/lang/en.json b/plugins/SitesManager/lang/en.json index 5f41ac8a58..05528567ac 100644 --- a/plugins/SitesManager/lang/en.json +++ b/plugins/SitesManager/lang/en.json @@ -2,8 +2,8 @@ "SitesManager": { "AddSite": "Add a new website", "AddMeasurable": "Add a new measurable", - "AdvancedTimezoneSupportNotFound": "Advanced timezones support was not found in your PHP (supported in PHP>=5.2). You can still choose a manual UTC offset.", - "AliasUrlHelp": "It is recommended, but not required, to specify the various URLs, one per line, that your visitors use to access this website. Alias URLs for a website will not appear in the Referrers > Websites report. Note that it is not necessary to specify the URLs with and without 'www' as Matomo automatically considers both.", + "AdvancedTimezoneSupportNotFound": "Advanced timezones support was not found in your PHP (supported in PHP>=5.2). You can still choose a manual UTC offset.", + "AliasUrlHelp": "It is recommended, but not required, to specify the various URLs, one per line, that your visitors use to access this website. Alias URLs for a website will not appear in the Referrers → Websites report. Note that it is not necessary to specify the URLs with and without 'www' as Matomo automatically considers both.", "ChangingYourTimezoneWillOnlyAffectDataForward": "Changing your time zone will only affect data going forward, and will not be applied retroactively.", "Currency": "Currency", "CurrencySymbolWillBeUsedForGoals": "The Currency symbol will be displayed next to Goals revenues.", @@ -65,7 +65,7 @@ "NotFound": "No websites found for", "NoWebsites": "You don't have any website to administrate.", "OnlyOneSiteAtTime": "You can only edit one website at a time. Please Save or Cancel your current modifications to the website %s.", - "PiwikOffersEcommerceAnalytics": "Matomo allows for advanced Ecommerce Analytics tracking & reporting. Learn more about %1$s Ecommerce Analytics%2$s.", + "PiwikOffersEcommerceAnalytics": "Matomo allows for advanced Ecommerce Analytics tracking and reporting. Learn more about %1$s Ecommerce Analytics%2$s.", "PiwikWillAutomaticallyExcludeCommonSessionParameters": "Matomo will automatically exclude the common session parameters (%s).", "PluginDescription": "Websites management lets you add a new website and edit existing websites.", "SearchCategoryDesc": "Matomo can also track the Search category for each internal site search keyword.", diff --git a/plugins/SitesManager/tests/System/expected/test_SitesManager__SitesManager.getSiteSettings.xml b/plugins/SitesManager/tests/System/expected/test_SitesManager__SitesManager.getSiteSettings.xml index ec126b4734..3a5ed76ddc 100644 --- a/plugins/SitesManager/tests/System/expected/test_SitesManager__SitesManager.getSiteSettings.xml +++ b/plugins/SitesManager/tests/System/expected/test_SitesManager__SitesManager.getSiteSettings.xml @@ -22,7 +22,7 @@ https://www.example.org/</placeholder> </uiControlAttributes> <availableValues /> <description /> - <inlineHelp>It is recommended, but not required, to specify the various URLs, one per line, that your visitors use to access this website. Alias URLs for a website will not appear in the Referrers > Websites report. Note that it is not necessary to specify the URLs with and without 'www' as Matomo automatically considers both.</inlineHelp> + <inlineHelp>It is recommended, but not required, to specify the various URLs, one per line, that your visitors use to access this website. Alias URLs for a website will not appear in the Referrers → Websites report. Note that it is not necessary to specify the URLs with and without 'www' as Matomo automatically considers both.</inlineHelp> <templateFile /> <introduction /> <condition /> @@ -242,7 +242,7 @@ https://www.example.org/</placeholder> <row>Ecommerce enabled</row> </availableValues> <description /> - <inlineHelp>When enabled, the "Goals" report will have a new "Ecommerce" section.<br />Matomo allows for advanced Ecommerce Analytics tracking & reporting. Learn more about <a href='https://matomo.org/docs/ecommerce-analytics/' target='_blank'> Ecommerce Analytics</a>.</inlineHelp> + <inlineHelp>When enabled, the "Goals" report will have a new "Ecommerce" section.<br />Matomo allows for advanced Ecommerce Analytics tracking and reporting. Learn more about <a href='https://matomo.org/docs/ecommerce-analytics/' target='_blank'> Ecommerce Analytics</a>.</inlineHelp> <templateFile /> <introduction /> <condition /> diff --git a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_site_edit_url.png b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_site_edit_url.png index 411f71682c..a7cd08cb50 100644 --- a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_site_edit_url.png +++ b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_site_edit_url.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:842fa540739ba6eb056bb155455eb1735ef3554f05d4300fcdcb30944d755fdf -size 380304 +oid sha256:7374c11a6513c3b934932ad4468f0aabaeda7735b617ea5c0d4c6133342d7277 +size 380007 diff --git a/plugins/VisitFrequency/Reports/Get.php b/plugins/VisitFrequency/Reports/Get.php index 124c7b4e8b..58f5e7b923 100644 --- a/plugins/VisitFrequency/Reports/Get.php +++ b/plugins/VisitFrequency/Reports/Get.php @@ -1,4 +1,5 @@ <?php + /** * Matomo - free/libre analytics platform * @@ -6,10 +7,9 @@ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later * */ + namespace Piwik\Plugins\VisitFrequency\Reports; -use Piwik\DataTable; -use Piwik\NumberFormatter; use Piwik\Piwik; use Piwik\Plugin\ViewDataTable; use Piwik\Plugins\CoreHome\Columns\Metrics\ActionsPerVisit; @@ -30,15 +30,15 @@ class Get extends \Piwik\Plugin\Report $this->categoryId = 'General_Actions'; $this->name = Piwik::translate('VisitFrequency_ColumnReturningVisits'); $this->documentation = Piwik::translate('VisitFrequency_VisitFrequencyReportDocumentation'); - $this->processedMetrics = array( + $this->processedMetrics = [ new ReturningMetric(new AverageTimeOnSite(), API::RETURNING_COLUMN_SUFFIX), new ReturningMetric(new ActionsPerVisit(), API::RETURNING_COLUMN_SUFFIX), new ReturningMetric(new BounceRate(), API::RETURNING_COLUMN_SUFFIX), new ReturningMetric(new AverageTimeOnSite(), API::NEW_COLUMN_SUFFIX), new ReturningMetric(new ActionsPerVisit(), API::NEW_COLUMN_SUFFIX), new ReturningMetric(new BounceRate(), API::NEW_COLUMN_SUFFIX) - ); - $this->metrics = array( + ]; + $this->metrics = [ 'nb_visits_returning', 'nb_actions_returning', 'nb_uniq_visitors_returning', @@ -50,7 +50,7 @@ class Get extends \Piwik\Plugin\Report 'nb_uniq_visitors_new', 'nb_users_new', 'max_actions_new', - ); + ]; $this->order = 40; $this->subcategoryId = 'VisitorInterest_Engagement'; } @@ -79,50 +79,24 @@ class Get extends \Piwik\Plugin\Report $view->requestConfig->apiMethodToRequestDataTable = 'VisitFrequency.get'; $this->addSparklineColumns($view); $view->config->addTranslations($this->getSparklineTranslations()); - - $numberFormatter = NumberFormatter::getInstance(); - $view->config->filters[] = function (DataTable $table) use ($numberFormatter) { - $firstRow = $table->getFirstRow(); - if ($firstRow) { - $value = $firstRow->getColumn('nb_visits_returning'); - if (false !== $value) { - $firstRow->setColumn('nb_visits_returning', $numberFormatter->formatNumber($value)); - } - - $value = $firstRow->getColumn('nb_actions_returning'); - if (false !== $value) { - $firstRow->setColumn('nb_actions_returning', $numberFormatter->formatNumber($value)); - } - - $value = $firstRow->getColumn('nb_actions_per_visit_returning'); - if (false !== $value) { - $firstRow->setColumn('nb_actions_per_visit_returning', $numberFormatter->formatNumber($value, 1)); - } - - $value = $firstRow->getColumn('bounce_rate_returning'); - if (false !== $value) { - $firstRow->setColumn('bounce_rate_returning', $numberFormatter->formatNumber($value, $precision = 1)); - } - } - }; } } private function getSparklineTranslations() { - $translations = array( + $translations = [ 'nb_visits_returning' => 'ReturnVisits', 'nb_actions_returning' => 'ReturnActions', 'nb_actions_per_visit_returning' => 'ReturnAvgActions', 'avg_time_on_site_returning' => 'ReturnAverageVisitDuration', 'bounce_rate_returning' => 'ReturnBounceRate', - + 'nb_visits_new' => 'NewVisits', 'nb_actions_new' => 'NewActions', 'nb_actions_per_visit_new' => 'NewAvgActions', 'avg_time_on_site_new' => 'NewAverageVisitDuration', 'bounce_rate_new' => 'NewBounceRate', - ); + ]; foreach ($translations as $metric => $key) { $translations[$metric] = Piwik::translate('VisitFrequency_' . $key); @@ -133,20 +107,19 @@ class Get extends \Piwik\Plugin\Report private function addSparklineColumns(Sparklines $view) { - $metrics = array( + $metrics = [ 'nb_visits', 'avg_time_on_site', 'nb_actions_per_visit', 'bounce_rate', 'nb_actions' - ); + ]; $i = 1; foreach ($metrics as $metric) { - foreach (array('_returning', '_new') as $suffix) { - $view->config->addSparklineMetric(array($metric . $suffix), $i++); + foreach (['_returning', '_new'] as $suffix) { + $view->config->addSparklineMetric([$metric . $suffix], $i++); } } - } } diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml index bdd0dd09db..8c2d7ce7cb 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml @@ -27,7 +27,7 @@ https://www.example.org/</placeholder> </uiControlAttributes> <availableValues /> <description /> - <inlineHelp>It is recommended, but not required, to specify the various URLs, one per line, that your visitors use to access this website. Alias URLs for a website will not appear in the Referrers > Websites report. Note that it is not necessary to specify the URLs with and without 'www' as Matomo automatically considers both.</inlineHelp> + <inlineHelp>It is recommended, but not required, to specify the various URLs, one per line, that your visitors use to access this website. Alias URLs for a website will not appear in the Referrers → Websites report. Note that it is not necessary to specify the URLs with and without 'www' as Matomo automatically considers both.</inlineHelp> <templateFile /> <introduction /> <condition /> @@ -245,7 +245,7 @@ https://www.example.org/</placeholder> <row>Ecommerce enabled</row> </availableValues> <description /> - <inlineHelp>When enabled, the "Goals" report will have a new "Ecommerce" section.<br />Matomo allows for advanced Ecommerce Analytics tracking & reporting. Learn more about <a href='https://matomo.org/docs/ecommerce-analytics/' target='_blank'> Ecommerce Analytics</a>.</inlineHelp> + <inlineHelp>When enabled, the "Goals" report will have a new "Ecommerce" section.<br />Matomo allows for advanced Ecommerce Analytics tracking and reporting. Learn more about <a href='https://matomo.org/docs/ecommerce-analytics/' target='_blank'> Ecommerce Analytics</a>.</inlineHelp> <templateFile /> <introduction /> <condition /> @@ -347,7 +347,7 @@ https://www.example.org/</placeholder> </uiControlAttributes> <availableValues /> <description /> - <inlineHelp>It is recommended, but not required, to specify the various URLs, one per line, that your visitors use to access this website. Alias URLs for a website will not appear in the Referrers > Websites report. Note that it is not necessary to specify the URLs with and without 'www' as Matomo automatically considers both.</inlineHelp> + <inlineHelp>It is recommended, but not required, to specify the various URLs, one per line, that your visitors use to access this website. Alias URLs for a website will not appear in the Referrers → Websites report. Note that it is not necessary to specify the URLs with and without 'www' as Matomo automatically considers both.</inlineHelp> <templateFile /> <introduction /> <condition /> @@ -565,7 +565,7 @@ https://www.example.org/</placeholder> <row>Ecommerce enabled</row> </availableValues> <description /> - <inlineHelp>When enabled, the "Goals" report will have a new "Ecommerce" section.<br />Matomo allows for advanced Ecommerce Analytics tracking & reporting. Learn more about <a href='https://matomo.org/docs/ecommerce-analytics/' target='_blank'> Ecommerce Analytics</a>.</inlineHelp> + <inlineHelp>When enabled, the "Goals" report will have a new "Ecommerce" section.<br />Matomo allows for advanced Ecommerce Analytics tracking and reporting. Learn more about <a href='https://matomo.org/docs/ecommerce-analytics/' target='_blank'> Ecommerce Analytics</a>.</inlineHelp> <templateFile /> <introduction /> <condition /> diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml index 355b54997c..1887db193b 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml @@ -124,7 +124,7 @@ <category>Visitors</category> <name>Device brand</name> <segment>deviceBrand</segment> - <acceptedValues>2E, 3GNET, 3GO, 3Q, 4Good, 4ife, 7 Mobile, 360, 8848, A1, Accent, Ace, Acer, Acteck, Adronix, Advan, Advance, AFFIX, AfriOne, AGM, AG Mobile, AIDATA, Ainol, Airness, AIRON, Airtel, Airties, AIS, Aiuto, Aiwa, Akai, AKIRA, Alba, Alcatel, Alcor, ALDI NORD, ALDI SÜD, Alfawise, Aligator, AllCall, AllDocube, Allview, Allwinner, Alps, Altech UEC, Altice, altron, Amazon, AMCV, AMGOO, Amigoo, Amino, Amoi, Andowl, Angelcare, Anker, Anry, ANS, AOC, Aocos, AOpen, Aoro, Aoson, AOYODKG, Apple, Aquarius, Archos, Arian Space, Ark, ArmPhone, Arnova, ARRIS, Artel, Artizlee, ArtLine, Asano, Asanzo, Ask, Aspera, Assistant, Astro, Asus, AT&T, Atmaca Elektronik, ATMAN, Atom, Atvio, Audiovox, AURIS, Autan, AUX, Avenzo, AVH, Avvio, Awow, Axioo, Axxion, AYYA, Azumi Mobile, b2m, BangOlufsen, Barnes & Noble, BBK, BB Mobile, BDF, BDQ, BDsharing, Becker, Beeline, Beelink, Beetel, Beista, Bellphone, Benco, Benesse, BenQ, BenQ-Siemens, Benzo, Beyond, Bezkam, BGH, Bigben, BIHEE, BilimLand, Billion, BioRugged, Bird, Bitel, Bitmore, Bittium, Bkav, Black Bear, Black Fox, Blackview, Blaupunkt, Bleck, Blloc, Blow, Blu, Bluboo, Bluebird, Bluedot, Bluegood, Bluewave, BMAX, Bmobile, Bobarry, bogo, Boway, bq, Brandt, Bravis, BrightSign, Brondi, BROR, BS Mobile, Bubblegum, Bundy, Bush, CAGI, Camfone, Canal Digital, Capitel, Captiva, Carrefour, Casio, Casper, Cat, Cavion, Celcus, Celkon, Cell-C, CellAllure, Cellution, Centric, CG Mobile, CGV, Changhong, Cherry Mobile, Chico Mobile, China Mobile, China Telecom, Chuwi, Claresta, Clarmin, ClearPHONE, Clementoni, Cloud, Cloudfone, Cloudpad, Clout, CnM, Cobalt, Coby Kyros, Colors, Comio, Compal, Compaq, COMPUMAX, ComTrade Tesla, Concord, ConCorde, Condor, Connectce, Connex, Conquest, Contixo, Coolpad, CORN, Cosmote, Covia, Cowon, COYOTE, CreNova, Crescent, Cricket, Crius Mea, Crony, Crosscall, Crown, Cube, CUBOT, CVTE, Cyrus, Daewoo, Danew, Datalogic, Datamini, Datang, Datawind, Datsun, Dazen, Dbtel, Dell, Denver, Desay, DeWalt, DEXP, DF, Dialog, Dicam, Digi, Digicel, DIGIFORS, Digihome, Digiland, Digma, DING DING, DISH, Ditecma, Diva, Divisat, DIXON, DMM, DNS, DoCoMo, Doffler, Dolamee, Doogee, Doopro, Doov, Dopod, Doppio, DORLAND, Doro, Dragon Touch, Dreamgate, Droxio, Dune HD, DUNNS Mobile, E-Boda, E-Ceros, E-tel, Eagle, Easypix, EBEN, EBEST, Echo Mobiles, ecom, ECON, ECS, EE, EGL, Einstein, EKO, Eks Mobility, EKT, ELARI, Electroneum, ELECTRONIA, Elekta, Element, Elenberg, Elephone, Eltex, Ematic, Energizer, Energy Sistem, Engel, Enot, Epik One, Epson, Ergo, Ericsson, Ericy, Erisson, Essential, Essentielb, eSTAR, Eton, eTouch, Etuline, Eurocase, Eurostar, Evercoss, Evertek, Evolio, Evolveo, Evoo, EVPAD, EvroMedia, EWIS, EXCEED, Exmart, ExMobile, EXO, Explay, Extrem, EYU, Ezio, Ezze, F&U, F2 Mobile, F150, Facebook, Fairphone, Famoco, Fantec, FaRao Pro, FarEasTone, Fengxiang, FEONAL, Fero, FiGi, FiGO, FiiO, FinePower, Finlux, FireFly Mobile, FISE, Fly, FLYCAT, FMT, FNB, FNF, Fondi, Fonos, FOODO, FORME, Formuler, Forstar, Fortis, Fourel, Four Mobile, Foxconn, Freetel, Fuego, Fujitsu, Funai, Fusion5, Future Mobile Technology, G-TiDE, G-Touch, Galaxy Innovations, Garmin-Asus, Gateway, Gemini, General Mobile, Genesis, GEOFOX, Geotel, Geotex, GFive, Ghia, Ghong, Ghost, Gigabyte, Gigaset, Gini, Ginzzu, Gionee, Globex, Glofiish, GLONYX, GLX, GOCLEVER, Gocomma, GoGEN, Gol Mobile, Goly, Gome, GoMobile, Google, Goophone, Gooweel, Gplus, Gradiente, Grape, Gree, Greentel, Gresso, Gretel, Grundig, Gtel, H96, Hafury, Haier, Haipai, Hamlet, HannSpree, HAOVM, Hardkernel, Hasee, Helio, HERO, Hezire, Hi, Hi-Level, High Q, Highscreen, HiMax, Hi Nova, Hipstreet, Hisense, Hitachi, Hitech, HKPro, Hoffmann, Hometech, Homtom, Honeywell, Hoozo, Horizon, Horizont, Hosin, Hotel, Hot Pepper, HOTREALS, Hotwav, How, HP, HTC, Huadoo, Huagan, Huavi, Huawei, Humax, Hurricane, Huskee, Hyrican, Hyundai, Hyve, i-Cherry, i-Joy, i-mate, i-mobile, iBall, iBerry, iBrit, IconBIT, iData, iDroid, iGet, iHunt, Ikea, IKI Mobile, iKoMo, iKon, IKU Mobile, iLA, iLife, iMan, iMars, IMO Mobile, Impression, INCAR, Inch, Inco, iNew, Infinix, InFocus, InfoKit, Inkti, InnJoo, Innos, Innostream, Inoi, INQ, Insignia, INSYS, Intek, Intex, Invens, Inverto, Invin, iOcean, iOutdoor, iPEGTOP, iPro, iQ&T, IQM, IRA, Irbis, Iris, iRola, iRulu, iSafe Mobile, iSWAG, IT, iTel, iTruck, IUNI, iVA, iView, iVooMi, ivvi, iWaylink, iZotron, JAY-Tech, Jedi, Jeka, Jesy, JFone, Jiake, Jiayu, Jinga, Jio, Jivi, JKL, Jolla, Joy, Jumper, Juniper Systems, Just5, JVC, K-Touch, Kaan, Kaiomy, Kalley, Kanji, Karbonn, Kata, KATV1, Kazam, Kazuna, KDDI, Kempler & Strauss, Keneksi, Kenxinda, Kiano, Kingbox, Kingsun, KINGZONE, Kiowa, Kivi, Klipad, Kocaso, Kodak, Kogan, Komu, Konka, Konrow, Koobee, Koolnee, Kooper, KOPO, Koridy, Koslam, KREZ, KRIP, KRONO, Krüger&Matz, KT-Tech, KUBO, Kuliao, Kult, Kumai, Kurio, Kvant, Kyocera, Kyowon, Kzen, L-Max, LAIQ, Land Rover, Landvo, Lanix, Lark, Laurus, Lava, LCT, Leader Phone, Leagoo, Leben, Ledstar, LeEco, Leff, Leke, LEMFO, Lemhoov, Lenco, Lenovo, Leotec, Le Pan, Lephone, Lesia, Lexand, Lexibook, LG, Liberton, Lifemaxx, Lingwin, Linnex, Linsar, Listo, Loewe, Logic, Logic Instrument, Logicom, LOKMAT, Loview, LT Mobile, Lumigon, Lumus, Luna, Luxor, LYF, M-Horse, M-Tech, M.T.T., M4tel, MAC AUDIO, Macoox, Mafe, Magicsee, Magnus, Majestic, Malata, Manhattan, Mann, Manta Multimedia, Mantra, Mara, Massgo, Masstel, Mastertech, Matrix, Maxcom, Maximus, Maxtron, MAXVI, Maxwest, MAXX, Maze, Maze Speed, MBI, MBOX, MDC Store, MDTV, meanIT, Mecer, Mecool, Mediacom, MediaTek, Medion, MEEG, MegaFon, Meitu, Meizu, Melrose, Memup, Metz, MEU, MicroMax, Microsoft, Microtech, Minix, Mintt, Mio, Mione, Miray, Mito, Mitsubishi, Mitsui, MIVO, MIXC, MiXzo, MLLED, MLS, MMI, Mobicel, MobiIoT, Mobiistar, Mobiola, Mobistel, MobiWire, Mobo, Modecom, Mofut, Motorola, Movic, mPhone, Mpman, MSI, MStar, MTC, MTN, Multilaser, MYFON, MyGica, Mymaga, MyPhone, Myria, Myros, Mystery, MyTab, MyWigo, Nabi, Naomi Phone, National, Navcity, Navitech, Navitel, Navon, NavRoad, NEC, Necnot, Neffos, Neo, Neolix, Neomi, Neon IQ, Netgear, NeuImage, New Balance, Newgen, Newland, Newman, Newsday, NewsMy, Nexa, NEXBOX, Nexian, NEXON, Nextbit, NextBook, NextTab, NGM, NG Optics, Nikon, Nintendo, NOA, Noain, Nobby, Noblex, NOBUX, NOGA, Nokia, Nomi, Nomu, Noontec, Nordmende, NorthTech, Nos, Nous, Novex, NuAns, Nubia, NUU Mobile, Nuvo, Nvidia, NYX Mobile, O+, O2, Oale, OASYS, Obabox, Obi, Oculus, Odys, OINOM, Ok, Okapia, OKSI, OKWU, OMIX, Onda, OnePlus, Onix, Onkyo, ONN, ONYX BOOX, Ookee, OpelMobile, Openbox, OPPO, Opsson, Orange, Orbic, Orbita, Ordissimo, Orion, OUJIA, Ouki, Oukitel, OUYA, Overmax, Ovvi, Owwo, OYSIN, Oysters, Oyyu, OzoneHD, P-UP, Packard Bell, Paladin, Palm, Panacom, Panasonic, Pantech, Parrot Mobile, PCBOX, PCD, PCD Argentina, PEAQ, Pelitt, Pendoo, Pentagram, Perfeo, Phicomm, Philco, Philips, Phonemax, phoneOne, Pico, Pioneer, PiPO, Pixela, Pixelphone, Pixus, Planet Computers, Ployer, Plum, Pluzz, PocketBook, POCO, Point Mobile, Point of View, Polar, PolarLine, Polaroid, Polestar, PolyPad, Polytron, Pomp, Poppox, POPTEL, Porsche, Positivo, Positivo BGH, PPTV, Premio, Prestigio, Primepad, Primux, Prixton, PROFiLO, Proline, Prology, ProScan, Protruly, ProVision, PULID, Purism, Q-Box, Q-Touch, Q.Bell, Qilive, QLink, QMobile, Qnet Mobile, QTECH, Qtek, Quantum, Qubo, Quechua, Qumo, Qware, R-TV, Rakuten, Ramos, Raspberry, Ravoz, Razer, RCA Tablets, Reach, Readboy, Realme, RED, Redfox, Reeder, REGAL, Remdun, Retroid Pocket, Revo, Rikomagic, RIM, Rinno, Ritmix, Ritzviva, Riviera, Rivo, ROADMAX, Roadrover, Rokit, Roku, Rombica, Ross&Moor, Rover, RoverPad, Royole, RoyQueen, RT Project, RugGear, Ruio, Runbo, Ryte, S-TELL, S2Tel, Saba, Safaricom, Sagem, Saiet, Salora, Samsung, Sanei, Sansui, Santin, Sanyo, Savio, SCBC, Schneider, Schok, Seatel, Seeken, SEG, Sega, Selecline, Selenga, Selevision, Selfix, SEMP TCL, Sencor, Sendo, Senkatel, Senseit, Senwa, Seuic, SFR, Shanling, Sharp, Shift Phones, Shivaki, Shtrikh-M, Shuttle, Sico, Siemens, Sigma, Silelis, Silent Circle, Simbans, Simply, Singtech, Siragon, Sirin labs, SK Broadband, SKG, Sky, Skyworth, Smadl, Smailo, Smart, Smartab, SmartBook, SMARTEC, Smart Electronic, Smartfren, Smartisan, Smarty, Smooth Mobile, Smotreshka, Softbank, Soho Style, SOLE, SOLO, Solone, Sonim, SONOS, Sony, Sony Ericsson, Soundmax, Soyes, Spark, SPC, Spectralink, Spectrum, Spice, Sprint, SQOOL, Star, Starlight, Starmobile, Starway, Starwind, STF Mobile, STG Telecom, STK, Stonex, Storex, StrawBerry, STRONG, Stylo, Subor, Sugar, Sumvision, Sunmi, Sunny, Sunstech, SunVan, Sunvell, SUNWIND, SuperSonic, SuperTab, Supra, Suzuki, Swipe, SWISSMOBILITY, Swisstone, SWTV, Sylvania, Symphony, Syrox, T-Mobile, TAG Tech, Taiga System, Takara, Tambo, Tanix, TB Touch, TCL, TD Systems, TD Tech, Technicolor, Technika, TechniSat, Technopc, TechnoTrend, TechPad, Techwood, Teclast, Tecno Mobile, TEENO, Teknosa, Tele2, Telefunken, Telego, Telenor, Telia, Telit, Telpo, TENPLUS, Tesco, Tesla, Tetratab, teXet, ThL, Thomson, Thuraya, TIANYU, Tigers, Time2, Timovi, Tinai, Tinmo, TiPhone, TiVo, TJC, TOKYO, Tolino, Tone, Tooky, Topelotek, Top House, Toplux, Topway, Torex, TOSCIDO, Toshiba, Touchmate, Transpeed, TrekStor, Trevi, Trident, Trifone, Trio, Tronsmart, True, True Slim, TTEC, TuCEL, Tunisie Telecom, Turbo, Turbo-X, TurboKids, TurboPad, Turkcell, TVC, TWM, Twoe, TWZ, Tymes, Türk Telekom, U-Magic, U.S. Cellular, Ugoos, Uhans, Uhappy, Ulefone, Umax, UMIDIGI, Unihertz, Unimax, Uniscope, UNIWA, Unknown, Unnecto, UNNO, Unonu, Unowhy, Urovo, UTime, UTOK, UTStarcom, UZ Mobile, v-mobile, VAIO, Vankyo, Vargo, Vastking, VAVA, VC, VDVD, Vega, Venso, Venturer, VEON, Verico, Verizon, Vernee, Verssed, Vertex, Vertu, Verykool, Vesta, Vestel, Vexia, VGO TEL, Videocon, Videoweb, ViewSonic, Vinabox, Vinga, Vinsoc, Vios, Vipro, Virzo, Vision Touch, Vitelcom, Viumee, Vivax, Vivo, VIWA, Vizio, VK Mobile, VKworld, Vodacom, Vodafone, VOGA, Vonino, Vontar, Vorago, Vorcom, Vorke, Vortex, Voto, VOX, Voxtel, Voyo, Vsmart, Vsun, VUCATIMES, Vulcan, VVETIME, Walton, WE, Web TV, Weimei, WellcoM, WELLINGTON, Western Digital, Westpoint, Wexler, Wieppo, Wigor, Wiko, Wileyfox, Winds, Wink, Winmax, Winnovo, Wintouch, Wiseasy, WIWA, Wizz, Wolder, Wolfgang, Wolki, Wonu, Woo, Wortmann, Woxter, X-AGE, X-BO, X-TIGI, X-View, X.Vision, XGIMI, Xgody, Xiaodu, Xiaolajiao, Xiaomi, Xion, Xolo, Xoro, Xshitou, Xtouch, Xtratech, Yandex, Yarvik, YASIN, YEPEN, Yes, Yezz, Yoka TV, Yota, YOTOPT, Ytone, Yu, Yuandao, YU Fly, YUHO, Yuno, Yusun, Yxtel, Zaith, Zatec, Zebra, Zeeker, Zeemi, Zen, Zenek, Zentality, Zfiner, ZH&K, Zidoo, ZIFRO, Ziox, Zonda, Zonko, Zopo, ZTE, Zuum, Zync, ZYQ, Zyrex, öwn</acceptedValues> + <acceptedValues>2E, 3GNET, 3GO, 3Q, 4Good, 4ife, 7 Mobile, 360, 8848, A1, Accent, Ace, Acer, Acteck, actiMirror, Adronix, Advan, Advance, AFFIX, AfriOne, AGM, AG Mobile, AIDATA, Ainol, Airness, AIRON, Airtel, Airties, AIS, Aiuto, Aiwa, Akai, AKIRA, Alba, Alcatel, Alcor, ALDI NORD, ALDI SÜD, Alfawise, Aligator, AllCall, AllDocube, Allview, Allwinner, Alps, Altech UEC, Altice, altron, Amazon, AMCV, AMGOO, Amigoo, Amino, Amoi, Andowl, Angelcare, Anker, Anry, ANS, AOC, Aocos, AOpen, Aoro, Aoson, AOYODKG, Apple, Aquarius, Archos, Arian Space, Ark, ArmPhone, Arnova, ARRIS, Artel, Artizlee, ArtLine, Asano, Asanzo, Ask, Aspera, Assistant, Astro, Asus, AT&T, Athesi, Atmaca Elektronik, ATMAN, ATOL, Atom, Atvio, Audiovox, AURIS, Autan, AUX, Avenzo, AVH, Avvio, Awow, Axioo, AXXA, Axxion, AYYA, Azumi Mobile, b2m, Backcell, BangOlufsen, Barnes & Noble, BBK, BB Mobile, BDF, BDQ, BDsharing, Becker, Beeline, Beelink, Beetel, Beista, Bellphone, Benco, Benesse, BenQ, BenQ-Siemens, Benzo, Beyond, Bezkam, BGH, Bigben, BIHEE, BilimLand, Billion, Billow, BioRugged, Bird, Bitel, Bitmore, Bittium, Bkav, Black Bear, Black Fox, Blackview, Blaupunkt, Bleck, BLISS, Blloc, Blow, Blu, Bluboo, Bluebird, Bluedot, Bluegood, BlueSky, Bluewave, BMAX, Bmobile, Bobarry, bogo, Boost, Boway, bq, BrandCode, Brandt, Bravis, BrightSign, Brondi, BROR, BS Mobile, Bubblegum, Bundy, Bush, C5 Mobile, CAGI, Camfone, Canal Digital, Capitel, Captiva, Carrefour, Casio, Casper, Cat, Cavion, Ceibal, Celcus, Celkon, Cell-C, Cellacom, CellAllure, Cellution, Centric, CG Mobile, CGV, Chainway, Changhong, Cherry Mobile, Chico Mobile, China Mobile, China Telecom, Chuwi, CipherLab, Claresta, Clarmin, ClearPHONE, Clementoni, Cloud, Cloudfone, Cloudpad, Clout, CnM, Cobalt, Coby Kyros, Colors, Comio, Compal, Compaq, COMPUMAX, ComTrade Tesla, Concord, ConCorde, Condor, Connectce, Connex, Conquest, Contixo, Coolpad, Coopers, CORN, Cosmote, Covia, Cowon, COYOTE, CreNova, Crescent, Cricket, Crius Mea, Crony, Crosscall, Crown, Cube, CUBOT, CVTE, Cyrus, D-Tech, Daewoo, Danew, Dany, DASS, Datalogic, Datamini, Datang, Datawind, Datsun, Dazen, DbPhone, Dbtel, Dcode, Dell, Denali, Denver, Desay, DeWalt, DEXP, DF, Dialog, Dicam, Digi, Digicel, DIGICOM, DIGIFORS, Digihome, Digiland, Digit4G, Digma, DING DING, DISH, Ditecma, Diva, Divisat, DIXON, DL, DMM, DNS, DoCoMo, Doffler, Dolamee, Doogee, Doopro, Doov, Dopod, Doppio, DORLAND, Doro, Dragon Touch, Dreamgate, DreamStar, DreamTab, Droxio, Dune HD, DUNNS Mobile, E-Boda, E-Ceros, E-tel, Eagle, Easypix, EBEN, EBEST, Echo Mobiles, ecom, ECON, ECS, EE, EGL, Einstein, EKO, Eks Mobility, EKT, ELARI, Electroneum, ELECTRONIA, Elekta, Element, Elenberg, Elephone, Elevate, Elong Mobile, Eltex, Ematic, Emporia, ENACOM, Energizer, Energy Sistem, Engel, ENIE, Enot, eNOVA, Envizen, Epik One, Epson, Equator, Ergo, Ericsson, Ericy, Erisson, Essential, Essentielb, eSTAR, Eton, eTouch, Etuline, Eurocase, Eurostar, Evercoss, Evertek, Evolio, Evolveo, Evoo, EVPAD, EvroMedia, EWIS, EXCEED, Exmart, ExMobile, EXO, Explay, Extrem, EYU, Ezio, Ezze, F&U, F2 Mobile, F150, Facebook, Facetel, Fairphone, Famoco, Famous, Fantec, FaRao Pro, FarEasTone, Fengxiang, FEONAL, Fero, FiGi, FiGO, FiiO, FILIX, FinePower, Finlux, FireFly Mobile, FISE, Fly, FLYCAT, FMT, FNB, FNF, Fondi, Fonos, FOODO, FORME, Formuler, Forstar, Fortis, Fourel, Four Mobile, Foxconn, Freetel, Fuego, Fujitsu, Funai, Fusion5, Future Mobile Technology, G-TiDE, G-Touch, Galaxy Innovations, Garmin-Asus, Gateway, Gazer, Geanee, Gemini, General Mobile, Genesis, GEOFOX, Geotel, Geotex, GEOZON, GFive, Ghia, Ghong, Ghost, Gigabyte, Gigaset, Gini, Ginzzu, Gionee, Globex, Glofiish, GLONYX, GLX, GOCLEVER, Gocomma, GoGEN, Gol Mobile, Goly, Gome, GoMobile, Google, Goophone, Gooweel, Gplus, Gradiente, Grape, Gree, Greentel, Gresso, Gretel, Grundig, Gtel, H96, Hafury, Haier, Haipai, Hamlet, Handheld, HannSpree, HAOVM, Hardkernel, Harper, Hasee, HDC, Helio, HERO, HexaByte, Hezire, Hi, Hi-Level, High Q, Highscreen, HiHi, HiKing, HiMax, Hi Nova, Hipstreet, Hisense, Hitachi, Hitech, HKPro, HLLO, Hoffmann, Hometech, Homtom, Honeywell, Hoozo, Horizon, Horizont, Hosin, Hotel, Hot Pepper, HOTREALS, Hotwav, How, HP, HTC, Huadoo, Huagan, Huavi, Huawei, Hugerock, Humax, Hurricane, Huskee, Hyrican, Hytera, Hyundai, Hyve, i-Cherry, I-INN, i-Joy, i-mate, i-mobile, iBall, iBerry, iBrit, IconBIT, iData, iDroid, iGet, iHunt, Ikea, IKI Mobile, iKoMo, iKon, IKU Mobile, iLA, iLife, iMan, iMars, IMO Mobile, Imose, Impression, INCAR, Inch, Inco, iNew, Infiniton, Infinix, InFocus, InfoKit, InFone, Inkti, InnJoo, Innos, Innostream, Inoi, iNo Mobile, iNOVA, INQ, Insignia, INSYS, Intek, Intel, Intex, Invens, Inverto, Invin, iOcean, iOutdoor, iPEGTOP, iPro, iQ&T, IQM, IRA, Irbis, iReplace, Iris, iRola, iRulu, iSafe Mobile, iStar, iSWAG, IT, iTel, iTruck, IUNI, iVA, iView, iVooMi, ivvi, iWaylink, iXTech, iZotron, JAY-Tech, Jedi, Jeka, Jesy, JFone, Jiake, Jiayu, Jinga, Jio, Jivi, JKL, Jolla, Joy, JPay, JREN, Jumper, Juniper Systems, Just5, JVC, JXD, K-Touch, Kaan, Kaiomy, Kalley, Kanji, Karbonn, Kata, KATV1, Kazam, Kazuna, KDDI, Kempler & Strauss, Kenbo, Keneksi, Kenxinda, Kiano, Kingbox, Kingstar, Kingsun, KINGZONE, Kiowa, Kivi, Klipad, Kocaso, Kodak, Kogan, Komu, Konka, Konrow, Koobee, Koolnee, Kooper, KOPO, Koridy, Koslam, KREZ, KRIP, KRONO, Krüger&Matz, KT-Tech, KUBO, Kuliao, Kult, Kumai, Kurio, Kvant, Kyocera, Kyowon, Kzen, L-Max, LAIQ, Land Rover, Landvo, Lanin, Lanix, Lark, Laurus, Lava, LCT, Leader Phone, Leagoo, Leben, Ledstar, LeEco, Leff, Legend, Leke, LEMFO, Lemhoov, Lenco, Lenovo, Leotec, Le Pan, Lephone, Lesia, Lexand, Lexibook, LG, Liberton, Lifemaxx, Lingwin, Linnex, Linsar, Listo, LNMBBS, Loewe, Logic, Logic Instrument, Logicom, LOKMAT, Loview, Lovme, LT Mobile, Lumigon, Lumitel, Lumus, Luna, Luxor, LYF, M-Horse, M-Tech, M.T.T., M3 Mobile, M4tel, MAC AUDIO, Macoox, Mafe, Magicsee, Magnus, Majestic, Malata, Mango, Manhattan, Mann, Manta Multimedia, Mantra, Mara, Massgo, Masstel, Mastertech, Matrix, Maxcom, Maximus, Maxtron, MAXVI, Maxwest, MAXX, Maze, Maze Speed, MBI, MBOX, MDC Store, MDTV, meanIT, Mecer, Mecool, Mediacom, MediaTek, Medion, MEEG, MegaFon, Meitu, Meizu, Melrose, Memup, Meta, Metz, MEU, MicroMax, Microsoft, Microtech, Minix, Mintt, Mio, Mione, Miray, Mito, Mitsubishi, Mitsui, MIVO, MIXC, MiXzo, MLLED, MLS, MMI, Mobicel, MobiIoT, Mobiistar, Mobiola, Mobistel, MobiWire, Mobo, Modecom, Mofut, Motorola, Movic, mPhone, Mpman, MSI, MStar, MTC, MTN, Multilaser, MYFON, MyGica, Mymaga, MyMobile, MyPhone, Myria, Myros, Mystery, MyTab, MyWigo, Nabi, Naomi Phone, National, Navcity, Navitech, Navitel, Navon, NavRoad, NEC, Necnot, Neffos, Neo, neoCore, Neolix, Neomi, Neon IQ, Netgear, NeuImage, New Balance, New Bridge, Newgen, Newland, Newman, Newsday, NewsMy, Nexa, NEXBOX, Nexian, NEXON, Nextbit, NextBook, NextTab, NGM, NG Optics, Nikon, Nintendo, nJoy, NOA, Noain, Nobby, Noblex, NOBUX, NOGA, Nokia, Nomi, Nomu, Noontec, Nordmende, NorthTech, Nos, Nothing Phone, Nous, Novex, Novey, NTT West, NuAns, Nubia, NUU Mobile, Nuvo, Nvidia, NYX Mobile, O+, O2, Oale, OASYS, Obabox, Obi, Odotpad, Odys, OINOM, Ok, Okapia, OKSI, OKWU, Ollee, OMIX, Onda, OneClick, OnePlus, Onix, Onkyo, ONN, ONYX BOOX, Ookee, OpelMobile, Openbox, OPPO, Opsson, Optoma, Orange, Orbic, Orbita, Orbsmart, Ordissimo, Orion, OTTO, OUJIA, Ouki, Oukitel, OUYA, Overmax, Ovvi, Owwo, OYSIN, Oysters, Oyyu, OzoneHD, P-UP, Packard Bell, Paladin, Palm, Panacom, Panasonic, Pantech, PAPYRE, Parrot Mobile, Partner Mobile, PCBOX, PCD, PCD Argentina, PEAQ, Pelitt, Pendoo, Pentagram, Perfeo, Phicomm, Philco, Philips, Phonemax, phoneOne, Pico, Pioneer, Pioneer Computers, PiPO, PIRANHA, Pixela, Pixelphone, Pixus, Planet Computers, Ployer, Plum, PlusStyle, Pluzz, PocketBook, POCO, Point Mobile, Point of View, Polar, PolarLine, Polaroid, Polestar, PolyPad, Polytron, Pomp, Poppox, POPTEL, Porsche, Positivo, Positivo BGH, PPTV, Premio, Prestigio, Primepad, Primux, Pritom, Prixton, PROFiLO, Proline, Prology, ProScan, Protruly, ProVision, PULID, Purism, Q-Box, Q-Touch, Q.Bell, Qilive, QLink, QMobile, Qnet Mobile, QTECH, Qtek, Quantum, Qubo, Quechua, Quest, Qumo, Qware, R-TV, Rakuten, Ramos, Raspberry, Ravoz, Raylandz, Razer, RCA Tablets, Reach, Readboy, Realme, RED, Redbean, Redfox, Redway, Reeder, REGAL, Remdun, Retroid Pocket, Revo, Ricoh, Rikomagic, RIM, Rinno, Ritmix, Ritzviva, Riviera, Rivo, ROADMAX, Roadrover, Rokit, Roku, Rombica, Ross&Moor, Rover, RoverPad, Royole, RoyQueen, RT Project, RugGear, Ruio, Runbo, Ryte, S-TELL, S2Tel, Saba, Safaricom, Sagem, Saiet, Salora, Samsung, Sanei, Sansui, Santin, Sanyo, Savio, SCBC, Schneider, Schok, Seatel, Seeken, SEG, Sega, Selecline, Selenga, Selevision, Selfix, SEMP TCL, Sencor, Sendo, Senkatel, Senseit, Senwa, Seuic, SFR, Shanling, Sharp, Shift Phones, Shivaki, Shtrikh-M, Shuttle, Sico, Siemens, Sigma, Silelis, Silent Circle, Simbans, Simply, Singtech, Siragon, Sirin Labs, SK Broadband, SKG, Sky, Skyworth, Smadl, Smailo, Smart, Smartab, SmartBook, SMARTEC, Smart Electronic, Smartfren, Smartisan, Smart Kassel, Smarty, Smooth Mobile, Smotreshka, SNAMI, Softbank, Soho Style, SOLE, SOLO, Solone, Sonim, SONOS, Sony, Sony Ericsson, Soundmax, Soyes, Spark, SPC, Spectralink, Spectrum, Spice, Sprint, SQOOL, Star, Starlight, Starmobile, Starway, Starwind, STF Mobile, STG Telecom, STK, Stonex, Storex, StrawBerry, Stream, STRONG, Stylo, Subor, Sugar, Sumvision, Sunmi, Sunny, Sunstech, SunVan, Sunvell, SUNWIND, SuperSonic, SuperTab, Supra, Suzuki, Swipe, SWISSMOBILITY, Swisstone, SWTV, Sylvania, Symphony, Syrox, T-Mobile, T96, TAG Tech, Taiga System, Takara, Tambo, Tanix, TB Touch, TCL, TD Systems, TD Tech, TeachTouch, Technicolor, Technika, TechniSat, Technopc, TechnoTrend, TechPad, Techwood, Teclast, Tecno Mobile, TEENO, Teknosa, Tele2, Telefunken, Telego, Telenor, Telia, Telit, Telpo, TENPLUS, Teracube, Tesco, Tesla, Tetratab, teXet, ThL, Thomson, Thuraya, TIANYU, Tibuta, Tigers, Time2, Timovi, Tinai, Tinmo, TiPhone, TiVo, TJC, TOKYO, Tolino, Tone, Tooky, TOPDON, Topelotek, Top House, Toplux, Topsion, Topway, Torex, Torque, TOSCIDO, Toshiba, Touchmate, Touch Plus, TOX, Transpeed, TrekStor, Trevi, Trident, Trifone, Trio, Tronsmart, True, True Slim, TTEC, TTK-TV, TuCEL, Tunisie Telecom, Turbo, Turbo-X, TurboKids, TurboPad, Turkcell, TVC, TWM, Twoe, TWZ, Tymes, Türk Telekom, U-Magic, U.S. Cellular, Ugoos, Uhans, Uhappy, Ulefone, Umax, UMIDIGI, Unblock Tech, Unihertz, Unimax, Uniscope, Unistrong, UNIWA, Unknown, Unnecto, Unnion Technologies, UNNO, Unonu, Unowhy, Urovo, UTime, UTOK, UTStarcom, UZ Mobile, v-mobile, VAIO, VALEM, Vankyo, Vargo, Vastking, VAVA, VC, VDVD, Vega, Venso, Venstar, Venturer, VEON, Verico, Verizon, Vernee, Verssed, Vertex, Vertu, Verykool, Vesta, Vestel, Vexia, VGO TEL, Victurio, Videocon, Videoweb, ViewSonic, Vinabox, Vinga, Vinsoc, Vios, Vipro, Virzo, Vision Touch, Vitelcom, Viumee, Vivax, Vivo, VIWA, Vizio, VK Mobile, VKworld, Vodacom, Vodafone, VOGA, Vonino, Vontar, Vorago, Vorcom, Vorke, Vortex, Voto, VOX, Voxtel, Voyo, Vsmart, Vsun, VUCATIMES, Vue Micro, Vulcan, VVETIME, Völfen, Walton, Wanmukang, WE, Web TV, Weelikeit, Weimei, WellcoM, WELLINGTON, Western Digital, Westpoint, Wexler, Wieppo, Wigor, Wiko, Wileyfox, Winds, Wink, Winmax, Winnovo, Wintouch, Wiseasy, WIWA, WizarPos, Wizz, Wolder, Wolfgang, Wolki, Wonu, Woo, Wortmann, Woxter, X-AGE, X-BO, X-TIGI, X-View, X.Vision, X88, X96, X96Q, XGIMI, Xgody, Xiaodu, Xiaolajiao, Xiaomi, Xion, Xolo, Xoro, Xshitou, Xtouch, Xtratech, Yandex, Yarvik, YASIN, YEPEN, Yes, Yezz, Yoka TV, Yota, YOTOPT, Ytone, Yu, Yuandao, YU Fly, YUHO, YUMKEM, YUNDOO, Yuno, Yusun, Yxtel, Zaith, Zatec, Zealot, Zebra, Zeeker, Zeemi, Zen, Zenek, Zentality, Zfiner, ZH&K, Zidoo, ZIFRO, ZIK, Zinox, Ziox, Zonda, Zonko, Zopo, ZTE, Zuum, Zync, ZYQ, Zyrex, öwn</acceptedValues> </row> <row> <type>dimension</type> diff --git a/tests/UI/expected-screenshots/MeasurableManager_add_measurable_view.png b/tests/UI/expected-screenshots/MeasurableManager_add_measurable_view.png index 7900ac673d..5e8d43eccd 100644 --- a/tests/UI/expected-screenshots/MeasurableManager_add_measurable_view.png +++ b/tests/UI/expected-screenshots/MeasurableManager_add_measurable_view.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f410432470a8cacf09dcf3b1ecdbd6e95dc4a6d5d5b46ec6175107613d333d9f -size 536031 +oid sha256:1a20318980da9d6c9f7e56353b9e73328d6d62f86261e9638be0e3f064a18186 +size 535762 diff --git a/tests/UI/expected-screenshots/OneClickUpdate_update_success.png b/tests/UI/expected-screenshots/OneClickUpdate_update_success.png index 6c5607f5af..bad7670d9b 100644 --- a/tests/UI/expected-screenshots/OneClickUpdate_update_success.png +++ b/tests/UI/expected-screenshots/OneClickUpdate_update_success.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5de9ddc99af708b5314651e54fcae22f9222f939577ae7f4148d50b8f48c6087 -size 73714 +oid sha256:d12443ea4ac5a07bc26d9c928a2955bde3aeebcc0a3b703150065105923071ea +size 73818 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_category_help.png b/tests/UI/expected-screenshots/UIIntegrationTest_category_help.png index c14b7687c3..d592e5d40f 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_category_help.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_category_help.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:94f990c894251eca9bcba9ae84f23d1a06120305730a69daea3ff7465f4d9970 -size 131900 +oid sha256:36771298b82dba4ded35ae4451deeed41a7fb6557512367e4037aa90e322d909 +size 131621 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard4.png b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard4.png index 1908787128..4ab4465953 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard4.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard4.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0835a8b5d1c816dbbec188401ee02d1a6d6b60fbdbf3dcbb913402e1aae0629a -size 362471 +oid sha256:747a1248d446467bb736e314d0b4c41c0dbdb67254c1ca60012ee1dc4c0838d8 +size 362524 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_engagement.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_engagement.png index 2d6b3772ad..a53c48aeeb 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_engagement.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_engagement.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fc118e390966c687cbbaa61c9fea73b8629403e4873a9bdd954f01795ff1dde2 -size 164567 +oid sha256:d0d73e7a0b8fa18d2fc9c6af54f3043f2a776495980b45ff0ddeaf43374e5abc +size 165068 diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_export_options_2.png b/tests/UI/expected-screenshots/ViewDataTableTest_export_options_2.png index 34c18e8e0c..b60d3efac0 100644 --- a/tests/UI/expected-screenshots/ViewDataTableTest_export_options_2.png +++ b/tests/UI/expected-screenshots/ViewDataTableTest_export_options_2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:55ee36f394e4b137c7357c77fe405aa9f524f6491a9bd5082cab2ca70269c3f6 -size 76536 +oid sha256:09c7bad0199703a3f5a9fa2a8e83f5aebd489aafaed70812613faf31bf8d0562 +size 76516 |
