diff options
| author | diosmosis <diosmosis@users.noreply.github.com> | 2022-07-11 07:47:59 +0300 |
|---|---|---|
| committer | diosmosis <diosmosis@users.noreply.github.com> | 2022-07-11 07:47:59 +0300 |
| commit | 0645349398a5be7497021f382c8a4f3b586c32e2 (patch) | |
| tree | 7f32cd49e7937aa195ec0659dc6c3e98d7eecffc | |
| parent | 674f1411f6ed6a0009ef59e248ef4f9c55635322 (diff) | |
| parent | a0ec25efb4943d78e525b2183948c6f8fb526a71 (diff) | |
Merge branch '5.x-dev' into vue-remove-angularjs-ExampleVuevue-remove-angularjs-ExampleVue
50 files changed, 309 insertions, 291 deletions
diff --git a/composer.json b/composer.json index f56540db8e..f488b576f6 100644 --- a/composer.json +++ b/composer.json @@ -28,7 +28,10 @@ "php": "7.2.9" }, "prepend-autoloader": false, - "sort-packages": true + "sort-packages": true, + "allow-plugins": { + "dealerdirect/phpcodesniffer-composer-installer": true + } }, "require": { "php": ">=7.2.5", diff --git a/plugins/CoreHome/stylesheets/layout.less b/plugins/CoreHome/stylesheets/layout.less index 6c5ffb517e..4841b4f2bf 100644 --- a/plugins/CoreHome/stylesheets/layout.less +++ b/plugins/CoreHome/stylesheets/layout.less @@ -28,12 +28,21 @@ nav { .icon-more-verti, .icon-menu-hamburger { - font-size: 2.7rem; + // nav{line-height:56px} - {padding:10+10px} + font-size: 36px; padding: 8px 10px 10px; display: inline-block; cursor: pointer; } + @media only screen and (min-width: 601px) { + .icon-more-verti, + .icon-menu-hamburger { + // nav{line-height:64px} - {padding:10+10px} + font-size: 48px; + } + } + .side-nav { .languageSelection { display: block !important; diff --git a/plugins/CoreHome/vue/dist/CoreHome.umd.js b/plugins/CoreHome/vue/dist/CoreHome.umd.js index 6019b20262..0f7a209045 100644 --- a/plugins/CoreHome/vue/dist/CoreHome.umd.js +++ b/plugins/CoreHome/vue/dist/CoreHome.umd.js @@ -5761,44 +5761,44 @@ PeriodDatePickervue_type_script_lang_ts.render = PeriodDatePickervue_type_templa directiveName: 'piwikPeriodDatePicker', restrict: 'E' })); -// 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/SiteSelector/SiteSelector.vue?vue&type=template&id=72269392 +// 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/SiteSelector/SiteSelector.vue?vue&type=template&id=2c07efef -var SiteSelectorvue_type_template_id_72269392_hoisted_1 = ["value", "name"]; -var SiteSelectorvue_type_template_id_72269392_hoisted_2 = ["title"]; -var SiteSelectorvue_type_template_id_72269392_hoisted_3 = ["textContent"]; -var SiteSelectorvue_type_template_id_72269392_hoisted_4 = { +var SiteSelectorvue_type_template_id_2c07efef_hoisted_1 = ["value", "name"]; +var SiteSelectorvue_type_template_id_2c07efef_hoisted_2 = ["title"]; +var SiteSelectorvue_type_template_id_2c07efef_hoisted_3 = ["textContent"]; +var SiteSelectorvue_type_template_id_2c07efef_hoisted_4 = { key: 1, class: "placeholder" }; -var SiteSelectorvue_type_template_id_72269392_hoisted_5 = { +var SiteSelectorvue_type_template_id_2c07efef_hoisted_5 = { class: "dropdown" }; -var SiteSelectorvue_type_template_id_72269392_hoisted_6 = { +var SiteSelectorvue_type_template_id_2c07efef_hoisted_6 = { class: "custom_select_search" }; -var SiteSelectorvue_type_template_id_72269392_hoisted_7 = ["placeholder"]; -var SiteSelectorvue_type_template_id_72269392_hoisted_8 = { +var SiteSelectorvue_type_template_id_2c07efef_hoisted_7 = ["placeholder"]; +var SiteSelectorvue_type_template_id_2c07efef_hoisted_8 = { key: 0 }; -var SiteSelectorvue_type_template_id_72269392_hoisted_9 = { +var SiteSelectorvue_type_template_id_2c07efef_hoisted_9 = { class: "custom_select_container" }; -var SiteSelectorvue_type_template_id_72269392_hoisted_10 = ["onClick"]; -var SiteSelectorvue_type_template_id_72269392_hoisted_11 = ["innerHTML", "href", "title"]; -var SiteSelectorvue_type_template_id_72269392_hoisted_12 = { +var SiteSelectorvue_type_template_id_2c07efef_hoisted_10 = ["onClick"]; +var SiteSelectorvue_type_template_id_2c07efef_hoisted_11 = ["innerHTML", "href", "title"]; +var SiteSelectorvue_type_template_id_2c07efef_hoisted_12 = { class: "ui-autocomplete ui-front ui-menu ui-widget ui-widget-content ui-corner-all\n siteSelect" }; -var SiteSelectorvue_type_template_id_72269392_hoisted_13 = { +var SiteSelectorvue_type_template_id_2c07efef_hoisted_13 = { class: "ui-menu-item" }; -var SiteSelectorvue_type_template_id_72269392_hoisted_14 = { +var SiteSelectorvue_type_template_id_2c07efef_hoisted_14 = { class: "ui-corner-all", tabindex: "-1" }; var _hoisted_15 = { key: 1 }; -function SiteSelectorvue_type_template_id_72269392_render(_ctx, _cache, $props, $setup, $data, $options) { +function SiteSelectorvue_type_template_id_2c07efef_render(_ctx, _cache, $props, $setup, $data, $options) { var _ctx$modelValue, _ctx$modelValue2, _ctx$modelValue3, _ctx$modelValue4; var _component_AllSitesLink = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["resolveComponent"])("AllSitesLink"); @@ -5817,7 +5817,7 @@ function SiteSelectorvue_type_template_id_72269392_render(_ctx, _cache, $props, type: "hidden", value: (_ctx$modelValue = _ctx.modelValue) === null || _ctx$modelValue === void 0 ? void 0 : _ctx$modelValue.id, name: _ctx.name - }, null, 8, SiteSelectorvue_type_template_id_72269392_hoisted_1)) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("a", { + }, null, 8, SiteSelectorvue_type_template_id_2c07efef_hoisted_1)) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("a", { ref: "selectorLink", onClick: _cache[0] || (_cache[0] = function () { return _ctx.onClickSelector && _ctx.onClickSelector.apply(_ctx, arguments); @@ -5839,7 +5839,7 @@ function SiteSelectorvue_type_template_id_72269392_render(_ctx, _cache, $props, }, null, 2), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("span", null, [(_ctx$modelValue2 = _ctx.modelValue) !== null && _ctx$modelValue2 !== void 0 && _ctx$modelValue2.name || !_ctx.placeholder ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("span", { key: 0, textContent: Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(((_ctx$modelValue3 = _ctx.modelValue) === null || _ctx$modelValue3 === void 0 ? void 0 : _ctx$modelValue3.name) || _ctx.firstSiteName) - }, null, 8, SiteSelectorvue_type_template_id_72269392_hoisted_3)) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true), !((_ctx$modelValue4 = _ctx.modelValue) !== null && _ctx$modelValue4 !== void 0 && _ctx$modelValue4.name) && _ctx.placeholder ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("span", SiteSelectorvue_type_template_id_72269392_hoisted_4, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.placeholder), 1)) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true)])], 42, SiteSelectorvue_type_template_id_72269392_hoisted_2), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["withDirectives"])(Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("div", SiteSelectorvue_type_template_id_72269392_hoisted_5, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["withDirectives"])(Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("div", SiteSelectorvue_type_template_id_72269392_hoisted_6, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["withDirectives"])(Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("input", { + }, null, 8, SiteSelectorvue_type_template_id_2c07efef_hoisted_3)) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true), !((_ctx$modelValue4 = _ctx.modelValue) !== null && _ctx$modelValue4 !== void 0 && _ctx$modelValue4.name) && _ctx.placeholder ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("span", SiteSelectorvue_type_template_id_2c07efef_hoisted_4, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.placeholder), 1)) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true)])], 42, SiteSelectorvue_type_template_id_2c07efef_hoisted_2), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["withDirectives"])(Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("div", SiteSelectorvue_type_template_id_2c07efef_hoisted_5, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["withDirectives"])(Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("div", SiteSelectorvue_type_template_id_2c07efef_hoisted_6, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["withDirectives"])(Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("input", { type: "text", onClick: _cache[2] || (_cache[2] = function ($event) { _ctx.searchTerm = ''; @@ -5852,7 +5852,7 @@ function SiteSelectorvue_type_template_id_72269392_render(_ctx, _cache, $props, tabindex: "4", class: "websiteSearch inp browser-default", placeholder: _ctx.translate('General_Search') - }, null, 8, SiteSelectorvue_type_template_id_72269392_hoisted_7), [[external_commonjs_vue_commonjs2_vue_root_Vue_["vModelText"], _ctx.searchTerm], [_directive_focus_if, {}, _ctx.shouldFocusOnSearch]]), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["withDirectives"])(Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("img", { + }, null, 8, SiteSelectorvue_type_template_id_2c07efef_hoisted_7), [[external_commonjs_vue_commonjs2_vue_root_Vue_["vModelText"], _ctx.searchTerm], [_directive_focus_if, {}, _ctx.shouldFocusOnSearch]]), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["withDirectives"])(Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("img", { title: "Clear", onClick: _cache[4] || (_cache[4] = function ($event) { _ctx.searchTerm = ''; @@ -5861,13 +5861,13 @@ function SiteSelectorvue_type_template_id_72269392_render(_ctx, _cache, $props, }), class: "reset", src: "plugins/CoreHome/images/reset_search.png" - }, null, 512), [[external_commonjs_vue_commonjs2_vue_root_Vue_["vShow"], _ctx.searchTerm]])], 512), [[external_commonjs_vue_commonjs2_vue_root_Vue_["vShow"], _ctx.autocompleteMinSites <= _ctx.sites.length || _ctx.searchTerm]]), _ctx.allSitesLocation === 'top' && _ctx.showAllSitesItem ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("div", SiteSelectorvue_type_template_id_72269392_hoisted_8, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createVNode"])(_component_AllSitesLink, { + }, null, 512), [[external_commonjs_vue_commonjs2_vue_root_Vue_["vShow"], _ctx.searchTerm]])], 512), [[external_commonjs_vue_commonjs2_vue_root_Vue_["vShow"], _ctx.autocompleteMinSites <= _ctx.sites.length || _ctx.searchTerm]]), _ctx.allSitesLocation === 'top' && _ctx.showAllSitesItem ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("div", SiteSelectorvue_type_template_id_2c07efef_hoisted_8, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createVNode"])(_component_AllSitesLink, { href: _ctx.urlAllSites, "all-sites-text": _ctx.allSitesText, onClick: _cache[5] || (_cache[5] = function ($event) { return _ctx.onAllSitesClick($event); }) - }, null, 8, ["href", "all-sites-text"])])) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("div", SiteSelectorvue_type_template_id_72269392_hoisted_9, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("ul", { + }, null, 8, ["href", "all-sites-text"])])) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("div", SiteSelectorvue_type_template_id_2c07efef_hoisted_9, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("ul", { class: "custom_select_ul_list", onClick: _cache[7] || (_cache[7] = function ($event) { return _ctx.showSitesList = false; @@ -5888,8 +5888,8 @@ function SiteSelectorvue_type_template_id_72269392_render(_ctx, _cache, $props, tabindex: "4", href: _ctx.getUrlForSiteId(site.idsite), title: site.name - }, null, 8, SiteSelectorvue_type_template_id_72269392_hoisted_11)], 8, SiteSelectorvue_type_template_id_72269392_hoisted_10)), [[external_commonjs_vue_commonjs2_vue_root_Vue_["vShow"], !(!_ctx.showSelectedSite && _ctx.activeSiteId === site.idsite)]]); - }), 128))]), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["withDirectives"])(Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("ul", SiteSelectorvue_type_template_id_72269392_hoisted_12, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("li", SiteSelectorvue_type_template_id_72269392_hoisted_13, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("a", SiteSelectorvue_type_template_id_72269392_hoisted_14, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('SitesManager_NotFound') + ' ' + _ctx.searchTerm), 1)])], 512), [[external_commonjs_vue_commonjs2_vue_root_Vue_["vShow"], !_ctx.sites.length && _ctx.searchTerm]])]), _ctx.allSitesLocation === 'bottom' && _ctx.showAllSitesItem ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("div", _hoisted_15, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createVNode"])(_component_AllSitesLink, { + }, null, 8, SiteSelectorvue_type_template_id_2c07efef_hoisted_11)], 8, SiteSelectorvue_type_template_id_2c07efef_hoisted_10)), [[external_commonjs_vue_commonjs2_vue_root_Vue_["vShow"], !(!_ctx.showSelectedSite && "".concat(_ctx.activeSiteId) === "".concat(site.idsite))]]); + }), 128))]), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["withDirectives"])(Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("ul", SiteSelectorvue_type_template_id_2c07efef_hoisted_12, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("li", SiteSelectorvue_type_template_id_2c07efef_hoisted_13, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("a", SiteSelectorvue_type_template_id_2c07efef_hoisted_14, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.translate('SitesManager_NotFound') + ' ' + _ctx.searchTerm), 1)])], 512), [[external_commonjs_vue_commonjs2_vue_root_Vue_["vShow"], !_ctx.sites.length && _ctx.searchTerm]])]), _ctx.allSitesLocation === 'bottom' && _ctx.showAllSitesItem ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("div", _hoisted_15, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createVNode"])(_component_AllSitesLink, { href: _ctx.urlAllSites, "all-sites-text": _ctx.allSitesText, onClick: _cache[8] || (_cache[8] = function ($event) { @@ -5899,7 +5899,7 @@ function SiteSelectorvue_type_template_id_72269392_render(_ctx, _cache, $props, blur: _ctx.onBlur }]]); } -// CONCATENATED MODULE: ./plugins/CoreHome/vue/src/SiteSelector/SiteSelector.vue?vue&type=template&id=72269392 +// CONCATENATED MODULE: ./plugins/CoreHome/vue/src/SiteSelector/SiteSelector.vue?vue&type=template&id=2c07efef // 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/SiteSelector/AllSitesLink.vue?vue&type=template&id=45607d28 @@ -6372,7 +6372,7 @@ function debounce(fn) { -SiteSelectorvue_type_script_lang_ts.render = SiteSelectorvue_type_template_id_72269392_render +SiteSelectorvue_type_script_lang_ts.render = SiteSelectorvue_type_template_id_2c07efef_render /* harmony default export */ var SiteSelector = (SiteSelectorvue_type_script_lang_ts); // CONCATENATED MODULE: ./plugins/CoreHome/vue/src/SiteSelector/SiteSelector.adapter.ts @@ -6468,15 +6468,17 @@ SiteSelectorvue_type_script_lang_ts.render = SiteSelectorvue_type_template_id_72 }); if (attrs.siteid && attrs.sitename) { - vm.modelValue = { + scope.value = { id: attrs.siteid, name: Matomo_Matomo.helper.htmlDecode(attrs.sitename) }; + vm.modelValue = scope.value; } else if (Matomo_Matomo.idSite) { - vm.modelValue = { + scope.value = { id: Matomo_Matomo.idSite, name: Matomo_Matomo.helper.htmlDecode(Matomo_Matomo.siteName) }; + vm.modelValue = scope.value; } // setup ng-model mapping diff --git a/plugins/CoreHome/vue/dist/CoreHome.umd.min.js b/plugins/CoreHome/vue/dist/CoreHome.umd.min.js index 46595f74a7..40d28457eb 100644 --- a/plugins/CoreHome/vue/dist/CoreHome.umd.min.js +++ b/plugins/CoreHome/vue/dist/CoreHome.umd.min.js @@ -324,7 +324,7 @@ function On(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 Bi(e,t,n,r,i,o){var l,c,s,u,d=Object(a["resolveComponent"])("AllSitesLink"),p=Object(a["resolveDirective"])("focus-if"),m=Object(a["resolveDirective"])("focus-anywhere-but-here");return Object(a["withDirectives"])((Object(a["openBlock"])(),Object(a["createElementBlock"])("div",{class:Object(a["normalizeClass"])(["siteSelector piwikSelector borderedControl",{expanded:e.showSitesList,disabled:!e.hasMultipleSites}])},[e.name?(Object(a["openBlock"])(),Object(a["createElementBlock"])("input",{key:0,type:"hidden",value:null===(l=e.modelValue)||void 0===l?void 0:l.id,name:e.name},null,8,wi)):Object(a["createCommentVNode"])("",!0),Object(a["createElementVNode"])("a",{ref:"selectorLink",onClick:t[0]||(t[0]=function(){return e.onClickSelector&&e.onClickSelector.apply(e,arguments)}),onKeydown:t[1]||(t[1]=function(t){return e.onPressEnter(t)}),href:"javascript:void(0)",class:Object(a["normalizeClass"])([{loading:e.isLoading},"title"]),tabindex:"4",title:e.selectorLinkTitle},[Object(a["createElementVNode"])("span",{class:Object(a["normalizeClass"])(["icon icon-arrow-bottom",{iconHidden:e.isLoading,collapsed:!e.showSitesList}])},null,2),Object(a["createElementVNode"])("span",null,[null!==(c=e.modelValue)&&void 0!==c&&c.name||!e.placeholder?(Object(a["openBlock"])(),Object(a["createElementBlock"])("span",{key:0,textContent:Object(a["toDisplayString"])((null===(s=e.modelValue)||void 0===s?void 0:s.name)||e.firstSiteName)},null,8,ji)):Object(a["createCommentVNode"])("",!0),null!==(u=e.modelValue)&&void 0!==u&&u.name||!e.placeholder?Object(a["createCommentVNode"])("",!0):(Object(a["openBlock"])(),Object(a["createElementBlock"])("span",ki,Object(a["toDisplayString"])(e.placeholder),1))])],42,Oi),Object(a["withDirectives"])(Object(a["createElementVNode"])("div",Si,[Object(a["withDirectives"])(Object(a["createElementVNode"])("div",Ci,[Object(a["withDirectives"])(Object(a["createElementVNode"])("input",{type:"text",onClick:t[2]||(t[2]=function(t){e.searchTerm="",e.loadInitialSites()}),"onUpdate:modelValue":t[3]||(t[3]=function(t){return e.searchTerm=t}),tabindex:"4",class:"websiteSearch inp browser-default",placeholder:e.translate("General_Search")},null,8,Ei),[[a["vModelText"],e.searchTerm],[p,{},e.shouldFocusOnSearch]]),Object(a["withDirectives"])(Object(a["createElementVNode"])("img",{title:"Clear",onClick:t[4]||(t[4]=function(t){e.searchTerm="",e.loadInitialSites()}),class:"reset",src:"plugins/CoreHome/images/reset_search.png"},null,512),[[a["vShow"],e.searchTerm]])],512),[[a["vShow"],e.autocompleteMinSites<=e.sites.length||e.searchTerm]]),"top"===e.allSitesLocation&&e.showAllSitesItem?(Object(a["openBlock"])(),Object(a["createElementBlock"])("div",Di,[Object(a["createVNode"])(d,{href:e.urlAllSites,"all-sites-text":e.allSitesText,onClick:t[5]||(t[5]=function(t){return e.onAllSitesClick(t)})},null,8,["href","all-sites-text"])])):Object(a["createCommentVNode"])("",!0),Object(a["createElementVNode"])("div",Pi,[Object(a["createElementVNode"])("ul",{class:"custom_select_ul_list",onClick:t[7]||(t[7]=function(t){return e.showSitesList=!1})},[(Object(a["openBlock"])(!0),Object(a["createElementBlock"])(a["Fragment"],null,Object(a["renderList"])(e.sites,(function(n,r){return Object(a["withDirectives"])((Object(a["openBlock"])(),Object(a["createElementBlock"])("li",{onClick:function(t){return e.switchSite(Object.assign(Object.assign({},n),{},{id:n.idsite}),t)},key:r},[Object(a["createElementVNode"])("a",{onClick:t[6]||(t[6]=function(e){return e.preventDefault()}),innerHTML:e.$sanitize(e.getMatchedSiteName(n.name)),tabindex:"4",href:e.getUrlForSiteId(n.idsite),title:n.name},null,8,Ni)],8,Vi)),[[a["vShow"],!(!e.showSelectedSite&&e.activeSiteId===n.idsite)]])})),128))]),Object(a["withDirectives"])(Object(a["createElementVNode"])("ul",Ti,[Object(a["createElementVNode"])("li",Ai,[Object(a["createElementVNode"])("a",Ii,Object(a["toDisplayString"])(e.translate("SitesManager_NotFound")+" "+e.searchTerm),1)])],512),[[a["vShow"],!e.sites.length&&e.searchTerm]])]),"bottom"===e.allSitesLocation&&e.showAllSitesItem?(Object(a["openBlock"])(),Object(a["createElementBlock"])("div",xi,[Object(a["createVNode"])(d,{href:e.urlAllSites,"all-sites-text":e.allSitesText,onClick:t[8]||(t[8]=function(t){return e.onAllSitesClick(t)})},null,8,["href","all-sites-text"])])):Object(a["createCommentVNode"])("",!0)],512),[[a["vShow"],e.showSitesList]])],2)),[[m,{blur:e.onBlur}]])}var Mi=["innerHTML","href"];function Li(e,t,n,r,i,o){var l=this;return Object(a["openBlock"])(),Object(a["createElementBlock"])("div",{onClick:t[1]||(t[1]=function(e){return l.onClick(e)}),class:"custom_select_all"},[Object(a["createElementVNode"])("a",{onClick:t[0]||(t[0]=function(e){return e.preventDefault()}),innerHTML:e.$sanitize(e.allSitesText),tabindex:"4",href:e.href},null,8,Mi)])}var Fi=Object(a["defineComponent"])({props:{href:String,allSitesText:String},emits:["click"],methods:{onClick:function(e){this.$emit("click",e)}}});Fi.render=Li;var Ri=Fi;function _i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function $i(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}function Hi(e,t,n){return t&&$i(e.prototype,t),n&&$i(e,n),e}function Ui(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e} + */function Bi(e,t,n,r,i,o){var l,c,s,u,d=Object(a["resolveComponent"])("AllSitesLink"),p=Object(a["resolveDirective"])("focus-if"),m=Object(a["resolveDirective"])("focus-anywhere-but-here");return Object(a["withDirectives"])((Object(a["openBlock"])(),Object(a["createElementBlock"])("div",{class:Object(a["normalizeClass"])(["siteSelector piwikSelector borderedControl",{expanded:e.showSitesList,disabled:!e.hasMultipleSites}])},[e.name?(Object(a["openBlock"])(),Object(a["createElementBlock"])("input",{key:0,type:"hidden",value:null===(l=e.modelValue)||void 0===l?void 0:l.id,name:e.name},null,8,wi)):Object(a["createCommentVNode"])("",!0),Object(a["createElementVNode"])("a",{ref:"selectorLink",onClick:t[0]||(t[0]=function(){return e.onClickSelector&&e.onClickSelector.apply(e,arguments)}),onKeydown:t[1]||(t[1]=function(t){return e.onPressEnter(t)}),href:"javascript:void(0)",class:Object(a["normalizeClass"])([{loading:e.isLoading},"title"]),tabindex:"4",title:e.selectorLinkTitle},[Object(a["createElementVNode"])("span",{class:Object(a["normalizeClass"])(["icon icon-arrow-bottom",{iconHidden:e.isLoading,collapsed:!e.showSitesList}])},null,2),Object(a["createElementVNode"])("span",null,[null!==(c=e.modelValue)&&void 0!==c&&c.name||!e.placeholder?(Object(a["openBlock"])(),Object(a["createElementBlock"])("span",{key:0,textContent:Object(a["toDisplayString"])((null===(s=e.modelValue)||void 0===s?void 0:s.name)||e.firstSiteName)},null,8,ji)):Object(a["createCommentVNode"])("",!0),null!==(u=e.modelValue)&&void 0!==u&&u.name||!e.placeholder?Object(a["createCommentVNode"])("",!0):(Object(a["openBlock"])(),Object(a["createElementBlock"])("span",ki,Object(a["toDisplayString"])(e.placeholder),1))])],42,Oi),Object(a["withDirectives"])(Object(a["createElementVNode"])("div",Si,[Object(a["withDirectives"])(Object(a["createElementVNode"])("div",Ci,[Object(a["withDirectives"])(Object(a["createElementVNode"])("input",{type:"text",onClick:t[2]||(t[2]=function(t){e.searchTerm="",e.loadInitialSites()}),"onUpdate:modelValue":t[3]||(t[3]=function(t){return e.searchTerm=t}),tabindex:"4",class:"websiteSearch inp browser-default",placeholder:e.translate("General_Search")},null,8,Ei),[[a["vModelText"],e.searchTerm],[p,{},e.shouldFocusOnSearch]]),Object(a["withDirectives"])(Object(a["createElementVNode"])("img",{title:"Clear",onClick:t[4]||(t[4]=function(t){e.searchTerm="",e.loadInitialSites()}),class:"reset",src:"plugins/CoreHome/images/reset_search.png"},null,512),[[a["vShow"],e.searchTerm]])],512),[[a["vShow"],e.autocompleteMinSites<=e.sites.length||e.searchTerm]]),"top"===e.allSitesLocation&&e.showAllSitesItem?(Object(a["openBlock"])(),Object(a["createElementBlock"])("div",Di,[Object(a["createVNode"])(d,{href:e.urlAllSites,"all-sites-text":e.allSitesText,onClick:t[5]||(t[5]=function(t){return e.onAllSitesClick(t)})},null,8,["href","all-sites-text"])])):Object(a["createCommentVNode"])("",!0),Object(a["createElementVNode"])("div",Pi,[Object(a["createElementVNode"])("ul",{class:"custom_select_ul_list",onClick:t[7]||(t[7]=function(t){return e.showSitesList=!1})},[(Object(a["openBlock"])(!0),Object(a["createElementBlock"])(a["Fragment"],null,Object(a["renderList"])(e.sites,(function(n,r){return Object(a["withDirectives"])((Object(a["openBlock"])(),Object(a["createElementBlock"])("li",{onClick:function(t){return e.switchSite(Object.assign(Object.assign({},n),{},{id:n.idsite}),t)},key:r},[Object(a["createElementVNode"])("a",{onClick:t[6]||(t[6]=function(e){return e.preventDefault()}),innerHTML:e.$sanitize(e.getMatchedSiteName(n.name)),tabindex:"4",href:e.getUrlForSiteId(n.idsite),title:n.name},null,8,Ni)],8,Vi)),[[a["vShow"],!(!e.showSelectedSite&&"".concat(e.activeSiteId)==="".concat(n.idsite))]])})),128))]),Object(a["withDirectives"])(Object(a["createElementVNode"])("ul",Ti,[Object(a["createElementVNode"])("li",Ai,[Object(a["createElementVNode"])("a",Ii,Object(a["toDisplayString"])(e.translate("SitesManager_NotFound")+" "+e.searchTerm),1)])],512),[[a["vShow"],!e.sites.length&&e.searchTerm]])]),"bottom"===e.allSitesLocation&&e.showAllSitesItem?(Object(a["openBlock"])(),Object(a["createElementBlock"])("div",xi,[Object(a["createVNode"])(d,{href:e.urlAllSites,"all-sites-text":e.allSitesText,onClick:t[8]||(t[8]=function(t){return e.onAllSitesClick(t)})},null,8,["href","all-sites-text"])])):Object(a["createCommentVNode"])("",!0)],512),[[a["vShow"],e.showSitesList]])],2)),[[m,{blur:e.onBlur}]])}var Mi=["innerHTML","href"];function Li(e,t,n,r,i,o){var l=this;return Object(a["openBlock"])(),Object(a["createElementBlock"])("div",{onClick:t[1]||(t[1]=function(e){return l.onClick(e)}),class:"custom_select_all"},[Object(a["createElementVNode"])("a",{onClick:t[0]||(t[0]=function(e){return e.preventDefault()}),innerHTML:e.$sanitize(e.allSitesText),tabindex:"4",href:e.href},null,8,Mi)])}var Fi=Object(a["defineComponent"])({props:{href:String,allSitesText:String},emits:["click"],methods:{onClick:function(e){this.$emit("click",e)}}});Fi.render=Li;var Ri=Fi;function _i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function $i(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}function Hi(e,t,n){return t&&$i(e.prototype,t),n&&$i(e,n),e}function Ui(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e} /*! * Matomo - free/libre analytics platform * @@ -336,7 +336,7 @@ function On(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 - */kt({component:Yi,require:"?ngModel",scope:{showSelectedSite:{angularJsBind:"="},showAllSitesItem:{angularJsBind:"="},switchSiteOnSelect:{angularJsBind:"="},onlySitesWithAdminAccess:{angularJsBind:"="},name:{angularJsBind:"@"},allSitesText:{angularJsBind:"@"},allSitesLocation:{angularJsBind:"@"},placeholder:{angularJsBind:"@"},modelValue:{default:function(e,t,n){return n.siteid&&n.sitename?{id:n.siteid,name:S.helper.htmlDecode(n.sitename)}:S.idSite?{id:S.idSite,name:S.helper.htmlDecode(S.siteName)}:void 0}}},$inject:["$timeout"],directiveName:"piwikSiteselector",events:{"update:modelValue":function(e,t,n,r,i,a,o){(e&&!t.modelValue||!e&&t.modelValue||e.id!==t.modelValue.id)&&o((function(){n.value=e,r.attr("siteid",e.id),r.trigger("change",e),a&&(a.$setViewValue(e),a.$render())}))},blur:function(e,t,n){setTimeout((function(){return n.$apply()}))}},postCreate:function(e,t,n,r,i){var o=i;t.$watch("value",(function(t){Object(a["nextTick"])((function(){t!==e.modelValue&&(e.modelValue=t)}))})),r.siteid&&r.sitename?e.modelValue={id:r.siteid,name:S.helper.htmlDecode(r.sitename)}:S.idSite&&(e.modelValue={id:S.idSite,name:S.helper.htmlDecode(S.siteName)}),o&&(o.$setViewValue(e.modelValue),o.$render=function(){Object(a["nextTick"])((function(){Object(a["nextTick"])((function(){window.angular.isString(o.$viewValue)?e.modelValue=JSON.parse(o.$viewValue):e.modelValue=o.$viewValue}))}))})}}); + */kt({component:Yi,require:"?ngModel",scope:{showSelectedSite:{angularJsBind:"="},showAllSitesItem:{angularJsBind:"="},switchSiteOnSelect:{angularJsBind:"="},onlySitesWithAdminAccess:{angularJsBind:"="},name:{angularJsBind:"@"},allSitesText:{angularJsBind:"@"},allSitesLocation:{angularJsBind:"@"},placeholder:{angularJsBind:"@"},modelValue:{default:function(e,t,n){return n.siteid&&n.sitename?{id:n.siteid,name:S.helper.htmlDecode(n.sitename)}:S.idSite?{id:S.idSite,name:S.helper.htmlDecode(S.siteName)}:void 0}}},$inject:["$timeout"],directiveName:"piwikSiteselector",events:{"update:modelValue":function(e,t,n,r,i,a,o){(e&&!t.modelValue||!e&&t.modelValue||e.id!==t.modelValue.id)&&o((function(){n.value=e,r.attr("siteid",e.id),r.trigger("change",e),a&&(a.$setViewValue(e),a.$render())}))},blur:function(e,t,n){setTimeout((function(){return n.$apply()}))}},postCreate:function(e,t,n,r,i){var o=i;t.$watch("value",(function(t){Object(a["nextTick"])((function(){t!==e.modelValue&&(e.modelValue=t)}))})),r.siteid&&r.sitename?(t.value={id:r.siteid,name:S.helper.htmlDecode(r.sitename)},e.modelValue=t.value):S.idSite&&(t.value={id:S.idSite,name:S.helper.htmlDecode(S.siteName)},e.modelValue=t.value),o&&(o.$setViewValue(e.modelValue),o.$render=function(){Object(a["nextTick"])((function(){Object(a["nextTick"])((function(){window.angular.isString(o.$viewValue)?e.modelValue=JSON.parse(o.$viewValue):e.modelValue=o.$viewValue}))}))})}}); /*! * Matomo - free/libre analytics platform * diff --git a/plugins/CoreHome/vue/src/SiteSelector/SiteSelector.adapter.ts b/plugins/CoreHome/vue/src/SiteSelector/SiteSelector.adapter.ts index a29f6c4a1f..68edc0d5ff 100644 --- a/plugins/CoreHome/vue/src/SiteSelector/SiteSelector.adapter.ts +++ b/plugins/CoreHome/vue/src/SiteSelector/SiteSelector.adapter.ts @@ -98,12 +98,14 @@ export default createAngularJsAdapter<[ITimeoutService]>({ }); if (attrs.siteid && attrs.sitename) { - vm.modelValue = { id: attrs.siteid, name: Matomo.helper.htmlDecode(attrs.sitename) }; + scope.value = { id: attrs.siteid, name: Matomo.helper.htmlDecode(attrs.sitename) }; + vm.modelValue = scope.value; } else if (Matomo.idSite) { - vm.modelValue = { + scope.value = { id: Matomo.idSite, name: Matomo.helper.htmlDecode(Matomo.siteName), }; + vm.modelValue = scope.value; } // setup ng-model mapping diff --git a/plugins/CoreHome/vue/src/SiteSelector/SiteSelector.vue b/plugins/CoreHome/vue/src/SiteSelector/SiteSelector.vue index ab537111ab..a255203521 100644 --- a/plugins/CoreHome/vue/src/SiteSelector/SiteSelector.vue +++ b/plugins/CoreHome/vue/src/SiteSelector/SiteSelector.vue @@ -80,7 +80,7 @@ > <li @click="switchSite({ ...site, id: site.idsite }, $event)" - v-show="!(!showSelectedSite && activeSiteId === site.idsite)" + v-show="!(!showSelectedSite && `${activeSiteId}` === `${site.idsite}`)" v-for="(site, index) in sites" :key="index" > diff --git a/plugins/CustomDimensions/tests/System/expected/test___API.getReportPagesMetadata.xml b/plugins/CustomDimensions/tests/System/expected/test___API.getReportPagesMetadata.xml index 6a48012830..176a710136 100644 --- a/plugins/CustomDimensions/tests/System/expected/test___API.getReportPagesMetadata.xml +++ b/plugins/CustomDimensions/tests/System/expected/test___API.getReportPagesMetadata.xml @@ -111,7 +111,7 @@ <isReport>1</isReport> </row> <row> - <name>Visits by Visit Number</name> + <name>Visits by visit number</name> <module>VisitorInterest</module> <action>getNumberOfVisitsByVisitCount</action> <order>125</order> @@ -125,7 +125,7 @@ <isReport>1</isReport> </row> <row> - <name>Visits by Days Since Last Visit</name> + <name>Visits by days since last visit</name> <module>VisitorInterest</module> <action>getNumberOfVisitsByDaysSinceLast</action> <order>130</order> @@ -1325,7 +1325,7 @@ <id>VisitTime_SubmenuTimes</id> <name>Times</name> <order>35</order> - <help><p>The Times section shows you when people are visiting your site. You can see the most popular local times your users visit at, so you can understand where your site fits into their life. Additionally, it shows the most popular server times, which can reveal demands on your technology stack.</p></help> + <help><p>The "Times" section shows when people visit your site. Popular local times helps you cater your site to their lives. The most popular server times reveals technical demand.</p></help> </subcategory> <widgets> <row> @@ -1357,7 +1357,7 @@ <isReport>1</isReport> </row> <row> - <name>Visits by Day of Week</name> + <name>Visits by day of the week</name> <module>VisitTime</module> <action>getByDayOfWeek</action> <order>125</order> diff --git a/plugins/CustomDimensions/tests/System/expected/test___API.getSegmentsMetadata.xml b/plugins/CustomDimensions/tests/System/expected/test___API.getSegmentsMetadata.xml index e31da68ba6..324d84256f 100644 --- a/plugins/CustomDimensions/tests/System/expected/test___API.getSegmentsMetadata.xml +++ b/plugins/CustomDimensions/tests/System/expected/test___API.getSegmentsMetadata.xml @@ -33,7 +33,7 @@ <row> <type>metric</type> <category>Visitors</category> - <name>Local time - minute (Start of visit)</name> + <name>Local time — minute (start of visit)</name> <segment>visitLocalMinute</segment> </row> <row> @@ -138,7 +138,7 @@ <row> <type>dimension</type> <category>Visitors</category> - <name>Local time - hour (Start of visit)</name> + <name>Local time — hour (start of visit)</name> <segment>visitLocalHour</segment> </row> <row> @@ -192,79 +192,79 @@ <row> <type>dimension</type> <category>Visitors</category> - <name>Site time - hour (Start of visit)</name> + <name>Site time — hour (start of visit)</name> <segment>visitStartServerHour</segment> </row> <row> <type>dimension</type> <category>Visitors</category> - <name>Site time - hour (Time of last action)</name> + <name>Site time — hour (time of last action)</name> <segment>visitServerHour</segment> </row> <row> <type>dimension</type> <category>Visitors</category> - <name>Time in UTC - date (Time of last action)</name> + <name>Time in UTC — date (time of last action)</name> <segment>visitEndServerDate</segment> </row> <row> <type>dimension</type> <category>Visitors</category> - <name>Time in UTC - day of month (Time of last action)</name> + <name>Time in UTC — day of month (time of last action)</name> <segment>visitEndServerDayOfMonth</segment> </row> <row> <type>dimension</type> <category>Visitors</category> - <name>Time in UTC - day of week (Time of last action)</name> + <name>Time in UTC — day of week (time of last action)</name> <segment>visitEndServerDayOfWeek</segment> </row> <row> <type>dimension</type> <category>Visitors</category> - <name>Time in UTC - day of year (Time of last action)</name> + <name>Time in UTC — day of year (time of last action)</name> <segment>visitEndServerDayOfYear</segment> </row> <row> <type>dimension</type> <category>Visitors</category> - <name>Time in UTC - minute (Start of visit)</name> + <name>Time in UTC — minute (start of visit)</name> <segment>visitStartServerMinute</segment> </row> <row> <type>dimension</type> <category>Visitors</category> - <name>Time in UTC - minute (Time of last action)</name> + <name>Time in UTC — minute (time of last action)</name> <segment>visitEndServerMinute</segment> </row> <row> <type>dimension</type> <category>Visitors</category> - <name>Time in UTC - month (Time of last action)</name> + <name>Time in UTC — month (time of last action)</name> <segment>visitEndServerMonth</segment> </row> <row> <type>dimension</type> <category>Visitors</category> - <name>Time in UTC - quarter (Time of last action)</name> + <name>Time in UTC — quarter (time of last action)</name> <segment>visitEndServerQuarter</segment> </row> <row> <type>dimension</type> <category>Visitors</category> - <name>Time in UTC - second (Time of last action)</name> + <name>Time in UTC — second (Time of last action)</name> <segment>visitEndServerSecond</segment> </row> <row> <type>dimension</type> <category>Visitors</category> - <name>Time in UTC - week of year (Time of last action)</name> + <name>Time in UTC — week of year (time of last action)</name> <segment>visitEndServerWeekOfYear</segment> </row> <row> <type>dimension</type> <category>Visitors</category> - <name>Time in UTC - year (Time of last action)</name> + <name>Time in UTC — year (time of last action)</name> <segment>visitEndServerYear</segment> </row> <row> @@ -441,13 +441,13 @@ <row> <type>dimension</type> <category>Behaviour</category> - <name>Site time - hour</name> + <name>Site time — hour</name> <segment>actionServerHour</segment> </row> <row> <type>dimension</type> <category>Behaviour</category> - <name>Time in UTC - minute</name> + <name>Time in UTC — minute</name> <segment>actionServerMinute</segment> </row> </result>
\ No newline at end of file diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_small_screen.png b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_small_screen.png index 31f26f3197..4d95521ccd 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_small_screen.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_small_screen.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c8200a233b30a708b15d95ad1266d3b02b8571858c4056f809a183cbd15b2ce6 -size 240977 +oid sha256:520a88356a74fca41d8599b36ce60a629c6a67f1a845c3a6c2e41e64ccfbb532 +size 240774 diff --git a/plugins/DevicesDetection/templates/detection.twig b/plugins/DevicesDetection/templates/detection.twig index c78dcf1284..28213e81f8 100644 --- a/plugins/DevicesDetection/templates/detection.twig +++ b/plugins/DevicesDetection/templates/detection.twig @@ -6,13 +6,15 @@ <script type="text/javascript"> + var clientHints = {}; + $(document).ready(function() { if (!navigator.userAgentData || typeof navigator.userAgentData.getHighEntropyValues !== 'function') { $('#noclienthints').css({display: 'inline-block'}); $('[name=clienthints],.usech').hide(); } else { // Initialize with low entropy values that are always available - var clientHints = { + clientHints = { brands: navigator.userAgentData.brands, platform: navigator.userAgentData.platform }; diff --git a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_Metadata_VisitTime.getVisitInformationPerServerTime__API.getProcessedReport_day.xml b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_Metadata_VisitTime.getVisitInformationPerServerTime__API.getProcessedReport_day.xml index 08b580c397..2999f23e34 100644 --- a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_Metadata_VisitTime.getVisitInformationPerServerTime__API.getProcessedReport_day.xml +++ b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_Metadata_VisitTime.getVisitInformationPerServerTime__API.getProcessedReport_day.xml @@ -8,7 +8,7 @@ <name>Visits per hour in the site's timezone</name> <module>VisitTime</module> <action>getVisitInformationPerServerTime</action> - <dimension>Site time - hour (Start of visit)</dimension> + <dimension>Site time — hour (start of visit)</dimension> <documentation>This graph shows what time it was in the <strong> site's time zone </strong> during the visits.</documentation> <metrics> <nb_visits>Visits</nb_visits> @@ -43,7 +43,7 @@ <uniqueId>VisitTime_getVisitInformationPerServerTime</uniqueId> </metadata> <columns> - <label>Site time - hour (Start of visit)</label> + <label>Site time — hour (start of visit)</label> <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> <nb_actions>Actions</nb_actions> diff --git a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_tables_and_graph__ScheduledReports.generateReport_week.original.html b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_tables_and_graph__ScheduledReports.generateReport_week.original.html index 5d5182028f..2c0fa99e4a 100644 --- a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_tables_and_graph__ScheduledReports.generateReport_week.original.html +++ b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_tables_and_graph__ScheduledReports.generateReport_week.original.html @@ -150,7 +150,7 @@ </li> <li style="font-size:15px;line-height:24px;"> <a href="#VisitTime_getByDayOfWeek" style="text-decoration:none; color: #0d0d0d;"> - Visits by Day of Week + Visits by day of the week </a> </li> <li style="font-size:15px;line-height:24px;"> @@ -265,17 +265,17 @@ </li> <li style="font-size:15px;line-height:24px;"> <a href="#VisitorInterest_getNumberOfVisitsPerVisitDuration" style="text-decoration:none; color: #0d0d0d;"> - Length of Visits + Length of visits </a> </li> <li style="font-size:15px;line-height:24px;"> <a href="#VisitorInterest_getNumberOfVisitsPerPage" style="text-decoration:none; color: #0d0d0d;"> - Pages per Visit + Pages per visit </a> </li> <li style="font-size:15px;line-height:24px;"> <a href="#VisitorInterest_getNumberOfVisitsByVisitCount" style="text-decoration:none; color: #0d0d0d;"> - Visits by Visit Number + Visits by visit number </a> </li> <li style="font-size:15px;line-height:24px;"> @@ -1961,7 +1961,7 @@ <table style="border-collapse:collapse; border:1px solid rgb(231,231,231); padding:5px;"> <thead style="background-color: #f2f2f2;"> <th style="border-bottom:1px solid rgb(231,231,231);font-size: 15px;text-align: left;font-weight:normal;padding:13px 0 13px 10px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - Local time - hour (Start of visit) + Local time — hour (start of visit) </th> <th style="border-bottom:1px solid rgb(231,231,231);font-size: 15px;text-align: left;font-weight:normal;padding:13px 0 13px 10px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif; text-align:right;"> Visits @@ -2558,7 +2558,7 @@ <table style="border-collapse:collapse; border:1px solid rgb(231,231,231); padding:5px;"> <thead style="background-color: #f2f2f2;"> <th style="border-bottom:1px solid rgb(231,231,231);font-size: 15px;text-align: left;font-weight:normal;padding:13px 0 13px 10px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - Site time - hour (Start of visit) + Site time — hour (start of visit) </th> <th style="border-bottom:1px solid rgb(231,231,231);font-size: 15px;text-align: left;font-weight:normal;padding:13px 0 13px 10px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif; text-align:right;"> Visits @@ -3140,7 +3140,7 @@ </a></p> <h2 id="VisitTime_getByDayOfWeek" style=" color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif; font-size: 24pt; font-weight:normal; margin:45px 0 30px 0;"> - Visits by Day of Week + Visits by day of the week </h2> <img alt="" @@ -4198,11 +4198,11 @@ There is no data for this report. <h2 id="VisitorInterest_getNumberOfVisitsPerVisitDuration" style=" color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif; font-size: 24pt; font-weight:normal; margin:45px 0 30px 0;"> - Length of Visits + Length of visits </h2> <img alt="" - src="data:image/png;base64,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" + src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAArwAAADICAIAAACF9KXqAAAACXBIWXMAAA7EAAAOxAGVKw4bAAAJx0lEQVR4nO3d72sceR0H8G2SYhqvrYSDhERbmsFLf4BIa/HBoaD46ATh8JlPD1R8JD4UxAfKHXL/wol4T8Q/QIoPfCTqg+ojIS2VbbmeWRqE9pqEkFrN+iC4mezu7H52dnZmdvt6PSg7uzM7n093dvad78zsnmm32w0AgGHmqi4AAJgOQgMAECI0AAAhQgMAECI0AAAhQgMAEFJeaEiSJOvOvg8NWAoAKF8tRhqazebQh6QHAKhWeaGh2Wx2ffAnSTIgLgAAtbJQ7NO9+8u/dt3z43e+NHSpTnpIp4rOPZ200Xm0K39IHgBQgoJDwz8+3n358mVn8uzZs9vb2+vr65FluwYe0pPHKSF9qCJrTgBgQoo/PHGQ0mg0Wq1W56H0CMHQT/p4DpAYAKAEtTgR8thxpIic8BifEwAoSsGHJ8aUPrMhMg4RmRMAKETxoWFpaWnAo50jFEMvs4ycqRCfEwAYU8Gh4e2vJ63t7XzLxj/7pQQAKF/BoeFbX73caFzOt+zgCynTj7rkEgDKd6bdblddAwAwBWp09QQAUGdCAwAQIjQAACFCAwAQIjQAACGnLrl0HSMAkOUkNPjpSABggJPDEyICADCAcxoAgJD+XyOdPjaxffq3JHZ2dlZXVydeFwC5/O5P/6y6hPy++eZnqy6BQbpDgx+bBpheu/v/vvPnnL8aWAcXPn32K19cqboKMnVfPdEbF9bX1wdMAlAf53YPqy5hLBcvXlxbW6u6CjKdnNPgcgkAYIDM72loOEgBAKSchAYRAQAYwCWXAECI0AAAhAgNAECI0AAAhAgNAECI0AAAhAgNAECI0AAAhAgNAECI0AAAhAgNAECI0AAAhAgNAECI0AAAhAgNAECI0AAAhAgNAECI0AAAhAgNAECI0AAAhAgNAECI0AAAhAgNAECI0AAAhAgNAECI0AAAhAgNAECI0AAAhAgNAECI0AAAhAgNAECI0AAAhAgNAECI0AAAhAgNAECI0AAAhAgNAECI0AAAhAgNAECI0AAAhAgNAECI0AAAhAgNAECI0AAAhAgNAECI0AAAhAgNAECI0AAAhAgNAECI0AAAhAgNAECI0AAAhAgNAECI0AAAhAgNAECI0AAAhAgNAECI0AAAhAgNAECI0AAAhAgNAECI0AAAhAgNAECI0AAAhAgNAECI0AAAhHSHhiRJkiSppBQAoM5OhYYkSZrNZlWlAAB1dio0SAwAQBbnNAAAIQtD53j+/Hl6cn9//8KFCxOrB5ga9x49rbqEnK5dWa66hEnZ339RdQljeXH4Ym9vL33PLG1mM9DL8NDQarXSk48ePXKmJPDuhw/2Dv5TdRU5/eDtK59bOVd1FRMxvS/KsU+ef9JqnQyBf3jn8b2P9iusZxw//+61+bkzncn7H+39+s7HFdYzjve+f/34xvDQcO3atQGTwKtpYeFhozGtn0+XL1/6/OXZHGx4tnvYaDyouor8VlZWNjc3OpOv/fFpozGtoWHzjTfm508C0P5/nzQa0xoaNjc3j284pwEACDk10tA57nB8w8UUAEDHqdAgJQAAWRyeAABChAYAIERoAABChAYAIERoAABChAYAIERoAABChAYAIERoAABChAYAIERoAABChAYAIERoAABChAYAIERoAABChAYAIERoAABChAYAIERoAABChAYAIERoAABChAYAIERoAABChAYAIERoAABChAYAIERoAABChAYAIERoAABChAYAIERoAABChAYAIERoAABChAYAIERoAABChAYAIERoAABChAYAIERoAABChAYAIERoAABChAYAIERoAABChAYAIERoAABChAYAIERoAABChAYAIERoAABChAYAIERoAABChAYAIERoAABChAYAIERoAABChAYAIERoAABChAYAIERoAABChAYAIERoAABChAYAIERoAABChAYAIERoAABChAYAIGQhPZEkSed2s9ksvRgAoL5OQkOSJOmg0DUJALziHJ4AAEKEBgAgZGH4LBne+emdo3a7wFLK9P6Pvvb6Z851Jn/7+3t/f/CvCusZx/Xk9e+8db0z+Wz38Ie/+EOF9Yxjbu7Mr372Vvqe9z74y7Pdw6rqGdO3v7H55S+sdSb/tvXkN3e2KqxnHBdf+9RPvvdm1VVMyiztAWCizrT//8GfdU7D3bt30wvcv3//+vWJb6APHz5cXV1dWlqa9IpK8PTp08PDw7W1teGzToOtra0SNoBytFqtxcXF5eXlqgspwMHBwZMnTzY2NqoupBj2ALW1tbV19erVublZGKW2B8hh+EjD7du3B0xOyOLi4qVLl86fP1/CuiZtZ2fn4ODgypUrVRdSjKOjo1u3blVdRTGWl5eXlpZWVlaqLqQAe3t7jx8/vnHjRtWFFMMeoLaOjo5u3rw5Pz9fdSEFsAfIYRbSIgBQgpORhmaz6XsaAIAspw5PCAoAQBaHJwCAkJOrJwAABsj/PQ2jGumEieOZuy4BjS8+Ib1VZd2ZteyxzswVNpW16mA76WeovJ3BNY9TVflfph6vNkdtFX43fN9Vp5s9NlJ5JbQTrLDY/VXhfeUrr2upmrxYOaoqfN87oQ2vtM+Icetvl2JjY2PAZN+Z0/OMtPiE9FaVdWfWspGnKkfWqoPt9J2nqnYG11yHLScuXu3GxkbNe0kLVlv/jvpWWM/9VdfaRy1v6FKVyFFV3fa9Waalzna7Xd5IQ1w8BPX+sTs5fVcRXO+okTzHUiPJeubgGkcKqpNuZ/DTjjoC1FXtcaedf4PPmdtI//+9f2M1atbO0Gp7Z+u9s3O78nayNvscayyzr3wL1rOpHFXla7/8DS/ff3hweLXY+usYGoJm8nc4p6Wp4KDZVLSTHgnse3vwQyUbuvZatTP+k9eqnQJNY19D3/WVNDWho6LT+AKlTa7+KQ4NU6fMcZGIcerJ2vLqbJw6y28w6y/vQiopp514tWP2VUI7lWzktXpbdRWT+z+k2KaCVU1o31v4C1TyZ0S+tVQZGvqOWMbb6Ayt1OqtNaCpSKYrs6lIPUNHlYeuovzXqPeNV8PtZICsU706Q4vpOWveVG+1dYvOOcxAC71mqaneXmo7HtBl1H1yJa9alaFh/D7TR2iKqKgAM9bU4Ngef4Yy2ynqT6JK9FabnpyuAZ6+1U5u+GRyuiqsebX5zFJTs9RLr8oDkC93KsOYf68Xrm71TE79P5DSpqtaXin13GlETrAtp5IxTUudjdJGGpqj/LBFZ87OOG3fxUsememtKuvOXn3rr7CprJdjGtsZWnPXu7Hmn8rTVe346p+ThlYY3F9VJV959WwqR1XxnVW1pqXOhm+EBACCHJ4AAEKEBgAg5H9UfEq9Y2ziHAAAAABJRU5ErkJggg==" height="200" width="700" margin="0 auto"/> @@ -4223,7 +4223,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 0-10s </td> + 0–10s </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -4231,7 +4231,7 @@ <tr style="background-color: #f2f2f2;"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 11-30s </td> + 11–30s </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -4239,7 +4239,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 31-60s </td> + 31–60s </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -4308,7 +4308,7 @@ </a></p> <h2 id="VisitorInterest_getNumberOfVisitsPerPage" style=" color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif; font-size: 24pt; font-weight:normal; margin:45px 0 30px 0;"> - Pages per Visit + Pages per visit </h2> <img alt="" @@ -4418,7 +4418,7 @@ </a></p> <h2 id="VisitorInterest_getNumberOfVisitsByVisitCount" style=" color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif; font-size: 24pt; font-weight:normal; margin:45px 0 30px 0;"> - Visits by Visit Number + Visits by visit number </h2> <img alt="" @@ -4433,7 +4433,7 @@ <table style="border-collapse:collapse; border:1px solid rgb(231,231,231); padding:5px;"> <thead style="background-color: #f2f2f2;"> <th style="border-bottom:1px solid rgb(231,231,231);font-size: 15px;text-align: left;font-weight:normal;padding:13px 0 13px 10px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - Visits by Visit Number + Visits by visit number </th> <th style="border-bottom:1px solid rgb(231,231,231);font-size: 15px;text-align: left;font-weight:normal;padding:13px 0 13px 10px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif; text-align:right;"> Visits diff --git a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_tables_only__ScheduledReports.generateReport_week.original.html b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_tables_only__ScheduledReports.generateReport_week.original.html index 2ee14b8d70..afc6f46060 100644 --- a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_tables_only__ScheduledReports.generateReport_week.original.html +++ b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_html_tables_only__ScheduledReports.generateReport_week.original.html @@ -150,7 +150,7 @@ </li> <li style="font-size:15px;line-height:24px;"> <a href="#VisitTime_getByDayOfWeek" style="text-decoration:none; color: #0d0d0d;"> - Visits by Day of Week + Visits by day of the week </a> </li> <li style="font-size:15px;line-height:24px;"> @@ -265,17 +265,17 @@ </li> <li style="font-size:15px;line-height:24px;"> <a href="#VisitorInterest_getNumberOfVisitsPerVisitDuration" style="text-decoration:none; color: #0d0d0d;"> - Length of Visits + Length of visits </a> </li> <li style="font-size:15px;line-height:24px;"> <a href="#VisitorInterest_getNumberOfVisitsPerPage" style="text-decoration:none; color: #0d0d0d;"> - Pages per Visit + Pages per visit </a> </li> <li style="font-size:15px;line-height:24px;"> <a href="#VisitorInterest_getNumberOfVisitsByVisitCount" style="text-decoration:none; color: #0d0d0d;"> - Visits by Visit Number + Visits by visit number </a> </li> <li style="font-size:15px;line-height:24px;"> @@ -1821,7 +1821,7 @@ <table style="border-collapse:collapse; border:1px solid rgb(231,231,231); padding:5px;"> <thead style="background-color: #f2f2f2;"> <th style="border-bottom:1px solid rgb(231,231,231);font-size: 15px;text-align: left;font-weight:normal;padding:13px 0 13px 10px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - Local time - hour (Start of visit) + Local time — hour (start of visit) </th> <th style="border-bottom:1px solid rgb(231,231,231);font-size: 15px;text-align: left;font-weight:normal;padding:13px 0 13px 10px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif; text-align:right;"> Visits @@ -2411,7 +2411,7 @@ <table style="border-collapse:collapse; border:1px solid rgb(231,231,231); padding:5px;"> <thead style="background-color: #f2f2f2;"> <th style="border-bottom:1px solid rgb(231,231,231);font-size: 15px;text-align: left;font-weight:normal;padding:13px 0 13px 10px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - Site time - hour (Start of visit) + Site time — hour (start of visit) </th> <th style="border-bottom:1px solid rgb(231,231,231);font-size: 15px;text-align: left;font-weight:normal;padding:13px 0 13px 10px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif; text-align:right;"> Visits @@ -2993,7 +2993,7 @@ </a></p> <h2 id="VisitTime_getByDayOfWeek" style=" color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif; font-size: 24pt; font-weight:normal; margin:45px 0 30px 0;"> - Visits by Day of Week + Visits by day of the week </h2> @@ -3981,7 +3981,7 @@ There is no data for this report. <h2 id="VisitorInterest_getNumberOfVisitsPerVisitDuration" style=" color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif; font-size: 24pt; font-weight:normal; margin:45px 0 30px 0;"> - Length of Visits + Length of visits </h2> @@ -3999,7 +3999,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 0-10s </td> + 0–10s </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -4007,7 +4007,7 @@ <tr style="background-color: #f2f2f2;"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 11-30s </td> + 11–30s </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -4015,7 +4015,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 31-60s </td> + 31–60s </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -4084,7 +4084,7 @@ </a></p> <h2 id="VisitorInterest_getNumberOfVisitsPerPage" style=" color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif; font-size: 24pt; font-weight:normal; margin:45px 0 30px 0;"> - Pages per Visit + Pages per visit </h2> @@ -4187,7 +4187,7 @@ </a></p> <h2 id="VisitorInterest_getNumberOfVisitsByVisitCount" style=" color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif; font-size: 24pt; font-weight:normal; margin:45px 0 30px 0;"> - Visits by Visit Number + Visits by visit number </h2> @@ -4195,7 +4195,7 @@ <table style="border-collapse:collapse; border:1px solid rgb(231,231,231); padding:5px;"> <thead style="background-color: #f2f2f2;"> <th style="border-bottom:1px solid rgb(231,231,231);font-size: 15px;text-align: left;font-weight:normal;padding:13px 0 13px 10px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - Visits by Visit Number + Visits by visit number </th> <th style="border-bottom:1px solid rgb(231,231,231);font-size: 15px;text-align: left;font-weight:normal;padding:13px 0 13px 10px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif; text-align:right;"> Visits diff --git a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_in_csv__ScheduledReports.generateReport_week.original.csv b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_in_csv__ScheduledReports.generateReport_week.original.csv index a9d3d6e154..d2f6773778 100644 --- a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_in_csv__ScheduledReports.generateReport_week.original.csv +++ b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_in_csv__ScheduledReports.generateReport_week.original.csv @@ -139,7 +139,7 @@ label,nb_visits,nb_actions,revenue,nb_actions_per_visit,avg_time_on_site,bounce_ 22,0,0,$0,0,00:00:00,0% 23,0,0,$0,0,00:00:00,0% -Visits by Day of Week +Visits by day of the week label,nb_visits,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate,nb_actions Monday,0,0%,0,00:00:00,0%,0 Tuesday,3,66.67%,4.3,00:30:01,0%,13 @@ -236,11 +236,11 @@ No data available Content Piece No data available -Length of Visits +Length of visits label,nb_visits -0-10s,0 -11-30s,0 -31-60s,0 +0–10s,0 +11–30s,0 +31–60s,0 1-2 min,0 2-4 min,0 4-7 min,1 @@ -249,7 +249,7 @@ label,nb_visits 15-30 min,1 30+ min,1 -Pages per Visit +Pages per visit label,nb_visits 1 page,0 2 pages,0 @@ -262,7 +262,7 @@ label,nb_visits 15-20 pages,0 21+ pages,0 -Visits by Visit Number +Visits by visit number label,nb_visits,nb_visits_percentage 1 visit,1,20% 2 visits,1,20% diff --git a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf Binary files differindex d28180fa4a..11ad614610 100644 --- a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf +++ b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf diff --git a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_in_tsv__ScheduledReports.generateReport_week.original.tsv b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_in_tsv__ScheduledReports.generateReport_week.original.tsv index 8821bda686..59cc4eab6b 100644 --- a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_in_tsv__ScheduledReports.generateReport_week.original.tsv +++ b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_in_tsv__ScheduledReports.generateReport_week.original.tsv @@ -139,7 +139,7 @@ label nb_visits nb_actions revenue nb_actions_per_visit avg_time_on_site bounce_ 22 0 0 $0 0 00:00:00 0% 23 0 0 $0 0 00:00:00 0% -Visits by Day of Week +Visits by day of the week label nb_visits conversion_rate nb_actions_per_visit avg_time_on_site bounce_rate nb_actions Monday 0 0% 0 00:00:00 0% 0 Tuesday 3 66.67% 4.3 00:30:01 0% 13 @@ -236,11 +236,11 @@ No data available Content Piece No data available -Length of Visits +Length of visits label nb_visits -0-10s 0 -11-30s 0 -31-60s 0 +0–10s 0 +11–30s 0 +31–60s 0 1-2 min 0 2-4 min 0 4-7 min 1 @@ -249,7 +249,7 @@ label nb_visits 15-30 min 1 30+ min 1 -Pages per Visit +Pages per visit label nb_visits 1 page 0 2 pages 0 @@ -262,7 +262,7 @@ label nb_visits 15-20 pages 0 21+ pages 0 -Visits by Visit Number +Visits by visit number label nb_visits nb_visits_percentage 1 visit 1 20% 2 visits 1 20% diff --git a/plugins/VisitTime/lang/en.json b/plugins/VisitTime/lang/en.json index d5dc99db8a..40c8b089c8 100644 --- a/plugins/VisitTime/lang/en.json +++ b/plugins/VisitTime/lang/en.json @@ -1,53 +1,53 @@ { "VisitTime": { "ColumnLocalTime": "Local time", - "ColumnLocalHour": "Local time - hour (Start of visit)", - "ColumnLocalMinute": "Local time - minute (Start of visit)", + "ColumnLocalHour": "Local time — hour (start of visit)", + "ColumnLocalMinute": "Local time — minute (start of visit)", "ColumnServerTime": "Server time", - "ColumnServerHour": "Server time - hour", - "ColumnSiteHour": "Site time - hour", - "ColumnVisitEndServerHour": "Server time - hour (Time of last action)", - "ColumnVisitEndSiteHour": "Site time - hour (Time of last action)", - "ColumnVisitEndServerMinute": "Server time - minute (Time of last action)", - "ColumnVisitEndUTCMinute": "Time in UTC - minute (Time of last action)", - "ColumnVisitStartServerHour": "Server time - hour (Start of visit)", - "ColumnVisitStartSiteHour": "Site time - hour (Start of visit)", - "ColumnVisitStartServerMinute": "Server time - minute (Start of visit)", - "ColumnVisitStartUTCMinute": "Time in UTC - minute (Start of visit)", - "ColumnVisitEndServerDate": "Server time - date (Time of last action)", - "ColumnVisitEndUTCDate": "Time in UTC - date (Time of last action)", - "ColumnVisitEndServerDayOfMonth": "Server time - day of month (Time of last action)", - "ColumnVisitEndUTCDayOfMonth": "Time in UTC - day of month (Time of last action)", - "ColumnVisitEndServerDayOfWeek": "Server time - day of week (Time of last action)", - "ColumnVisitEndUTCDayOfWeek": "Time in UTC - day of week (Time of last action)", - "ColumnVisitEndServerDayOfYear": "Server time - day of year (Time of last action)", - "ColumnVisitEndUTCDayOfYear": "Time in UTC - day of year (Time of last action)", - "ColumnVisitEndServerQuarter": "Server time - quarter (Time of last action)", - "ColumnVisitEndUTCQuarter": "Time in UTC - quarter (Time of last action)", - "ColumnVisitEndServerSecond": "Server time - second (Time of last action)", - "ColumnVisitEndUTCSecond": "Time in UTC - second (Time of last action)", - "ColumnVisitEndServerWeekOfYear": "Server time - week of year (Time of last action)", - "ColumnVisitEndUTCWeekOfYear": "Time in UTC - week of year (Time of last action)", - "ColumnVisitEndServerMonth": "Server time - month (Time of last action)", - "ColumnVisitEndUTCMonth": "Time in UTC - month (Time of last action)", - "ColumnVisitEndServerYear": "Server time - year (Time of last action)", - "ColumnVisitEndUTCYear": "Time in UTC - year (Time of last action)", - "ColumnServerMinute": "Server time - minute", - "ColumnUTCMinute": "Time in UTC - minute", + "ColumnServerHour": "Server time — hour", + "ColumnSiteHour": "Site time — hour", + "ColumnVisitEndServerHour": "Server time — hour (time of last action)", + "ColumnVisitEndSiteHour": "Site time — hour (time of last action)", + "ColumnVisitEndServerMinute": "Server time — minute (time of last action)", + "ColumnVisitEndUTCMinute": "Time in UTC — minute (time of last action)", + "ColumnVisitStartServerHour": "Server time — hour (start of visit)", + "ColumnVisitStartSiteHour": "Site time — hour (start of visit)", + "ColumnVisitStartServerMinute": "Server time — minute (start of visit)", + "ColumnVisitStartUTCMinute": "Time in UTC — minute (start of visit)", + "ColumnVisitEndServerDate": "Server time — date (time of last action)", + "ColumnVisitEndUTCDate": "Time in UTC — date (time of last action)", + "ColumnVisitEndServerDayOfMonth": "Server time — day of month (time of last action)", + "ColumnVisitEndUTCDayOfMonth": "Time in UTC — day of month (time of last action)", + "ColumnVisitEndServerDayOfWeek": "Server time — day of week (time of last action)", + "ColumnVisitEndUTCDayOfWeek": "Time in UTC — day of week (time of last action)", + "ColumnVisitEndServerDayOfYear": "Server time — day of year (Time of last action)", + "ColumnVisitEndUTCDayOfYear": "Time in UTC — day of year (time of last action)", + "ColumnVisitEndServerQuarter": "Server time — quarter (time of last action)", + "ColumnVisitEndUTCQuarter": "Time in UTC — quarter (time of last action)", + "ColumnVisitEndServerSecond": "Server time — second (time of last action)", + "ColumnVisitEndUTCSecond": "Time in UTC — second (Time of last action)", + "ColumnVisitEndServerWeekOfYear": "Server time — week of year (time of last action)", + "ColumnVisitEndUTCWeekOfYear": "Time in UTC — week of year (time of last action)", + "ColumnVisitEndServerMonth": "Server time — month (time of last action)", + "ColumnVisitEndUTCMonth": "Time in UTC — month (time of last action)", + "ColumnVisitEndServerYear": "Server time — year (time of last action)", + "ColumnVisitEndUTCYear": "Time in UTC — year (time of last action)", + "ColumnServerMinute": "Server time — minute", + "ColumnUTCMinute": "Time in UTC — minute", "DayOfWeek": "Day of the week", "LocalTime": "Visits per local time", "NHour": "%sh", - "PluginDescription": "Reports the local time and the server time when your visitors view your website or app.", + "PluginDescription": "Reports the local time and the server time of when your visitors view your website or app.", "ServerTime": "Visits per server time", "SiteTime": "Visits per hour in the site's timezone", "SubmenuTimes": "Times", - "VisitsByDayOfWeek": "Visits by Day of Week", + "VisitsByDayOfWeek": "Visits by day of the week", "WidgetByDayOfWeekDocumentation": "This graph shows the number of visits your website received on each day of the week.", - "WidgetLocalTime": "Visits by Local Time", + "WidgetLocalTime": "Visits by local time", "WidgetLocalTimeDocumentation": "This graph shows what time it was in the %1$s visitors' time zones %2$s during their visits.", - "WidgetServerTime": "Visits by Server Time", + "WidgetServerTime": "Visits by server time", "WidgetServerTimeDocumentation": "This graph shows what time it was in the %1$s server's time zone %2$s during the visits.", "WidgetSiteTimeDocumentation": "This graph shows what time it was in the %1$s site's time zone %2$s during the visits.", - "TimesSubcategoryHelp": "The Times section shows you when people are visiting your site. You can see the most popular local times your users visit at, so you can understand where your site fits into their life. Additionally, it shows the most popular server times, which can reveal demands on your technology stack." + "TimesSubcategoryHelp": "The \"Times\" section shows when people visit your site. Popular local times helps you cater your site to their lives. The most popular server times reveals technical demand." } -}
\ No newline at end of file +} diff --git a/plugins/VisitorInterest/lang/en.json b/plugins/VisitorInterest/lang/en.json index 010761125f..8b5332bad4 100644 --- a/plugins/VisitorInterest/lang/en.json +++ b/plugins/VisitorInterest/lang/en.json @@ -1,24 +1,24 @@ { "VisitorInterest": { - "BetweenXYMinutes": "%1$s-%2$s min", - "BetweenXYSeconds": "%1$s-%2$ss", + "BetweenXYMinutes": "%1$s–%2$s min", + "BetweenXYSeconds": "%1$s–%2$ss", "ColumnPagesPerVisit": "Pages per visit", "ColumnVisitDuration": "Visit duration", "Engagement": "Engagement", "NPages": "%s pages", "OnePage": "1 page", - "PluginDescription": "Reports about visitors interest: number of pages viewed, time spent on the Website, days since last visit, and more.", + "PluginDescription": "Visitor interest: number of pages viewed, time spent on the website, days since last visit, and more.", "VisitNum": "Visit number", "VisitsByDaysSinceLast": "Visits by days since last visit", - "visitsByVisitCount": "Visits by Visit Number", + "visitsByVisitCount": "Visits by visit number", "VisitsPerDuration": "Visits per visit duration", "VisitsPerNbOfPages": "Visits per number of pages", - "WidgetLengths": "Length of Visits", - "WidgetLengthsDocumentation": "In this report, you can see how many visits had a certain total duration. Initially, the report is shown as a tag cloud, more common durations are displayed in a larger font.", - "WidgetPages": "Pages per Visit", - "WidgetPagesDocumentation": "In this report, you can see how many visits involved a certain number of pageviews. Initially, the report is shown as a tag cloud, more common numbers of pages are displayed in a larger font.", - "WidgetVisitsByDaysSinceLast": "Visits by Days Since Last Visit", - "WidgetVisitsByDaysSinceLastDocumentation": "In this report, you can see how many visits were from visitors whose last visit was a certain number of days ago.", - "WidgetVisitsByNumDocumentation": "In this report, you can see the number of visits who were the Nth visit, ie. visitors who visited your website at least N times." + "WidgetLengths": "Length of visits", + "WidgetLengthsDocumentation": "How many visits had a certain total duration. Initially, the report is shown as a tag cloud, wherein more common durations have a larger font.", + "WidgetPages": "Pages per visit", + "WidgetPagesDocumentation": "How many visits involved a certain number of pageviews. Initially, the report is shown as a tag cloud, wherein more common numbers of pages have a larger font.", + "WidgetVisitsByDaysSinceLast": "Visits by days since last visit", + "WidgetVisitsByDaysSinceLastDocumentation": "How many visits were from returning visitors whose last visit was a certain number of days ago.", + "WidgetVisitsByNumDocumentation": "The number of visitors reaching their Nth visit. I.e. the total amount of visitors visiting your website a given amount of times or more." } -}
\ No newline at end of file +} diff --git a/plugins/WebsiteMeasurable/lang/en.json b/plugins/WebsiteMeasurable/lang/en.json index 65cee92859..655b729d00 100644 --- a/plugins/WebsiteMeasurable/lang/en.json +++ b/plugins/WebsiteMeasurable/lang/en.json @@ -2,6 +2,6 @@ "WebsiteMeasurable": { "Website": "Website", "Websites": "Websites", - "WebsiteDescription": "A website consists of web pages typically served from a single web domain." + "WebsiteDescription": "A website consists of webpages, typically served from a single domain on the web." } -}
\ No newline at end of file +} diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml index d367771a01..a035d38913 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml @@ -1,17 +1,17 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <label>0-10s</label> + <label>0–10s</label> <nb_visits>40</nb_visits> <segment>visitDuration>=0;visitDuration<=10</segment> </row> <row> - <label>11-30s</label> + <label>11–30s</label> <nb_visits>0</nb_visits> <segment>visitDuration>=11;visitDuration<=30</segment> </row> <row> - <label>31-60s</label> + <label>31–60s</label> <nb_visits>0</nb_visits> <segment>visitDuration>=31;visitDuration<=60</segment> </row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_range.xml index 5a0ee59989..34c4ba4849 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_range.xml @@ -1,17 +1,17 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <label>0-10s</label> + <label>0–10s</label> <nb_visits>50</nb_visits> <segment>visitDuration>=0;visitDuration<=10</segment> </row> <row> - <label>11-30s</label> + <label>11–30s</label> <nb_visits>0</nb_visits> <segment>visitDuration>=11;visitDuration<=30</segment> </row> <row> - <label>31-60s</label> + <label>31–60s</label> <nb_visits>2</nb_visits> <segment>visitDuration>=31;visitDuration<=60</segment> </row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__VisitorInterest.getNumberOfVisitsPerVisitDuration_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__VisitorInterest.getNumberOfVisitsPerVisitDuration_range.xml index 63a6a4ca54..effc9d7862 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__VisitorInterest.getNumberOfVisitsPerVisitDuration_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__VisitorInterest.getNumberOfVisitsPerVisitDuration_range.xml @@ -1,17 +1,17 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <label>0-10s</label> + <label>0–10s</label> <nb_visits>13</nb_visits> <segment>visitDuration>=0;visitDuration<=10</segment> </row> <row> - <label>11-30s</label> + <label>11–30s</label> <nb_visits>0</nb_visits> <segment>visitDuration>=11;visitDuration<=30</segment> </row> <row> - <label>31-60s</label> + <label>31–60s</label> <nb_visits>1</nb_visits> <segment>visitDuration>=31;visitDuration<=60</segment> </row> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric_constantRowsCountShouldKeepEmptyRows__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric_constantRowsCountShouldKeepEmptyRows__API.getProcessedReport_day.xml index 7942cf7654..16d6937ef6 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric_constantRowsCountShouldKeepEmptyRows__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric_constantRowsCountShouldKeepEmptyRows__API.getProcessedReport_day.xml @@ -8,7 +8,7 @@ <name>Visits per hour in the site's timezone</name> <module>VisitTime</module> <action>getVisitInformationPerServerTime</action> - <dimension>Site time - hour (Start of visit)</dimension> + <dimension>Site time — hour (start of visit)</dimension> <documentation>This graph shows what time it was in the <strong> site's time zone </strong> during the visits.</documentation> <metrics> <nb_visits>Visits</nb_visits> @@ -43,7 +43,7 @@ <uniqueId>VisitTime_getVisitInformationPerServerTime</uniqueId> </metadata> <columns> - <label>Site time - hour (Start of visit)</label> + <label>Site time — hour (start of visit)</label> <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> <nb_actions>Actions</nb_actions> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitorInterest.getNumberOfVisitsPerVisitDuration_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitorInterest.getNumberOfVisitsPerVisitDuration_day.xml index 748ce76d7c..58611310c0 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitorInterest.getNumberOfVisitsPerVisitDuration_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitorInterest.getNumberOfVisitsPerVisitDuration_day.xml @@ -1,17 +1,17 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <label>0-10s</label> + <label>0–10s</label> <nb_visits>1</nb_visits> <segment>visitDuration>=0;visitDuration<=10</segment> </row> <row> - <label>11-30s</label> + <label>11–30s</label> <nb_visits>0</nb_visits> <segment>visitDuration>=11;visitDuration<=30</segment> </row> <row> - <label>31-60s</label> + <label>31–60s</label> <nb_visits>0</nb_visits> <segment>visitDuration>=31;visitDuration<=60</segment> </row> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_bulk_json__API.getBulkRequest.json b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_bulk_json__API.getBulkRequest.json index 20475dd8a9..4d26a381db 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_bulk_json__API.getBulkRequest.json +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_bulk_json__API.getBulkRequest.json @@ -1 +1 @@ -[{"2010-03-06":{"nb_uniq_visitors":1,"nb_users":0,"nb_visits":2,"nb_actions":8,"nb_visits_converted":2,"bounce_count":1,"sum_visit_length":1622,"max_actions":7,"bounce_rate":"50%","nb_actions_per_visit":4,"avg_time_on_site":811},"2010-03-07":[]},{"2010-03-06":{"nb_uniq_visitors":1,"nb_users":0,"nb_visits":2,"nb_actions":8,"nb_visits_converted":2,"bounce_count":1,"sum_visit_length":1622,"max_actions":7,"bounce_rate":"50%","nb_actions_per_visit":4,"avg_time_on_site":811},"2010-03-07":[]},[{"label":"0-10s","nb_visits":"1","segment":"visitDuration>=0;visitDuration<=10"},{"label":"11-30s","nb_visits":"0","segment":"visitDuration>=11;visitDuration<=30"},{"label":"31-60s","nb_visits":"0","segment":"visitDuration>=31;visitDuration<=60"},{"label":"1-2 min","nb_visits":"0","segment":"visitDuration>=60;visitDuration<=120"},{"label":"2-4 min","nb_visits":"0","segment":"visitDuration>=120;visitDuration<=240"},{"label":"4-7 min","nb_visits":"0","segment":"visitDuration>=240;visitDuration<=420"},{"label":"7-10 min","nb_visits":"0","segment":"visitDuration>=420;visitDuration<=600"},{"label":"10-15 min","nb_visits":"0","segment":"visitDuration>=600;visitDuration<=900"},{"label":"15-30 min","nb_visits":"1","segment":"visitDuration>=900;visitDuration<=1800"},{"label":"30+ min","nb_visits":"0","segment":"visitDuration>=1801"}],{"value":"yesterday"}]
\ No newline at end of file +[{"2010-03-06":{"nb_uniq_visitors":1,"nb_users":0,"nb_visits":2,"nb_actions":8,"nb_visits_converted":2,"bounce_count":1,"sum_visit_length":1622,"max_actions":7,"bounce_rate":"50%","nb_actions_per_visit":4,"avg_time_on_site":811},"2010-03-07":[]},{"2010-03-06":{"nb_uniq_visitors":1,"nb_users":0,"nb_visits":2,"nb_actions":8,"nb_visits_converted":2,"bounce_count":1,"sum_visit_length":1622,"max_actions":7,"bounce_rate":"50%","nb_actions_per_visit":4,"avg_time_on_site":811},"2010-03-07":[]},[{"label":"0\u201310s","nb_visits":"1","segment":"visitDuration>=0;visitDuration<=10"},{"label":"11\u201330s","nb_visits":"0","segment":"visitDuration>=11;visitDuration<=30"},{"label":"31\u201360s","nb_visits":"0","segment":"visitDuration>=31;visitDuration<=60"},{"label":"1-2 min","nb_visits":"0","segment":"visitDuration>=60;visitDuration<=120"},{"label":"2-4 min","nb_visits":"0","segment":"visitDuration>=120;visitDuration<=240"},{"label":"4-7 min","nb_visits":"0","segment":"visitDuration>=240;visitDuration<=420"},{"label":"7-10 min","nb_visits":"0","segment":"visitDuration>=420;visitDuration<=600"},{"label":"10-15 min","nb_visits":"0","segment":"visitDuration>=600;visitDuration<=900"},{"label":"15-30 min","nb_visits":"1","segment":"visitDuration>=900;visitDuration<=1800"},{"label":"30+ min","nb_visits":"0","segment":"visitDuration>=1801"}],{"value":"yesterday"}]
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_bulk_xml__API.getBulkRequest.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_bulk_xml__API.getBulkRequest.xml index 258f91e9df..191359da70 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_bulk_xml__API.getBulkRequest.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_bulk_xml__API.getBulkRequest.xml @@ -36,17 +36,17 @@ </row> <row> <row> - <label>0-10s</label> + <label>0–10s</label> <nb_visits>1</nb_visits> <segment>visitDuration>=0;visitDuration<=10</segment> </row> <row> - <label>11-30s</label> + <label>11–30s</label> <nb_visits>0</nb_visits> <segment>visitDuration>=11;visitDuration<=30</segment> </row> <row> - <label>31-60s</label> + <label>31–60s</label> <nb_visits>0</nb_visits> <segment>visitDuration>=31;visitDuration<=60</segment> </row> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_showColumnsWithProcessedMetrics___API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_showColumnsWithProcessedMetrics___API.getProcessedReport_day.xml index 5f45d94cf4..637b917bba 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_showColumnsWithProcessedMetrics___API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_showColumnsWithProcessedMetrics___API.getProcessedReport_day.xml @@ -8,7 +8,7 @@ <name>Visits per hour in the site's timezone</name> <module>VisitTime</module> <action>getVisitInformationPerServerTime</action> - <dimension>Site time - hour (Start of visit)</dimension> + <dimension>Site time — hour (start of visit)</dimension> <documentation>This graph shows what time it was in the <strong> site's time zone </strong> during the visits.</documentation> <metrics> <nb_visits>Visits</nb_visits> @@ -28,7 +28,7 @@ <uniqueId>VisitTime_getVisitInformationPerServerTime</uniqueId> </metadata> <columns> - <label>Site time - hour (Start of visit)</label> + <label>Site time — hour (start of visit)</label> <nb_visits>Visits</nb_visits> <revenue>Revenue</revenue> </columns> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitorInterest.getNumberOfVisitsPerVisitDuration_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitorInterest.getNumberOfVisitsPerVisitDuration_day.xml index 748ce76d7c..58611310c0 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitorInterest.getNumberOfVisitsPerVisitDuration_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitorInterest.getNumberOfVisitsPerVisitDuration_day.xml @@ -1,17 +1,17 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <label>0-10s</label> + <label>0–10s</label> <nb_visits>1</nb_visits> <segment>visitDuration>=0;visitDuration<=10</segment> </row> <row> - <label>11-30s</label> + <label>11–30s</label> <nb_visits>0</nb_visits> <segment>visitDuration>=11;visitDuration<=30</segment> </row> <row> - <label>31-60s</label> + <label>31–60s</label> <nb_visits>0</nb_visits> <segment>visitDuration>=31;visitDuration<=60</segment> </row> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_VisitorInterest.getNumberOfVisitsByDaysSinceLast_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_VisitorInterest.getNumberOfVisitsByDaysSinceLast_firstSite_lastN__API.getProcessedReport_day.xml index 183d928bc4..589ee8c69f 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_VisitorInterest.getNumberOfVisitsByDaysSinceLast_firstSite_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_VisitorInterest.getNumberOfVisitsByDaysSinceLast_firstSite_lastN__API.getProcessedReport_day.xml @@ -9,7 +9,7 @@ <module>VisitorInterest</module> <action>getNumberOfVisitsByDaysSinceLast</action> <dimension>Days since last visit</dimension> - <documentation>In this report, you can see how many visits were from visitors whose last visit was a certain number of days ago.</documentation> + <documentation>How many visits were from returning visitors whose last visit was a certain number of days ago.</documentation> <metrics> <nb_visits>Visits</nb_visits> </metrics> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_tables_and_graph__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_tables_and_graph__ScheduledReports.generateReport_month.original.html index 6f2ab18cc8..588e8fd63d 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_tables_and_graph__ScheduledReports.generateReport_month.original.html +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_tables_and_graph__ScheduledReports.generateReport_month.original.html @@ -150,7 +150,7 @@ </li> <li style="font-size:15px;line-height:24px;"> <a href="#VisitTime_getByDayOfWeek" style="text-decoration:none; color: #0d0d0d;"> - Visits by Day of Week + Visits by day of the week </a> </li> <li style="font-size:15px;line-height:24px;"> @@ -265,17 +265,17 @@ </li> <li style="font-size:15px;line-height:24px;"> <a href="#VisitorInterest_getNumberOfVisitsPerVisitDuration" style="text-decoration:none; color: #0d0d0d;"> - Length of Visits + Length of visits </a> </li> <li style="font-size:15px;line-height:24px;"> <a href="#VisitorInterest_getNumberOfVisitsPerPage" style="text-decoration:none; color: #0d0d0d;"> - Pages per Visit + Pages per visit </a> </li> <li style="font-size:15px;line-height:24px;"> <a href="#VisitorInterest_getNumberOfVisitsByVisitCount" style="text-decoration:none; color: #0d0d0d;"> - Visits by Visit Number + Visits by visit number </a> </li> <li style="font-size:15px;line-height:24px;"> @@ -2237,7 +2237,7 @@ <table style="border-collapse:collapse; border:1px solid rgb(231,231,231); padding:5px;"> <thead style="background-color: #f2f2f2;"> <th style="border-bottom:1px solid rgb(231,231,231);font-size: 15px;text-align: left;font-weight:normal;padding:13px 0 13px 10px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - Local time - hour (Start of visit) + Local time — hour (start of visit) </th> <th style="border-bottom:1px solid rgb(231,231,231);font-size: 15px;text-align: left;font-weight:normal;padding:13px 0 13px 10px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif; text-align:right;"> Visits @@ -2834,7 +2834,7 @@ <table style="border-collapse:collapse; border:1px solid rgb(231,231,231); padding:5px;"> <thead style="background-color: #f2f2f2;"> <th style="border-bottom:1px solid rgb(231,231,231);font-size: 15px;text-align: left;font-weight:normal;padding:13px 0 13px 10px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - Site time - hour (Start of visit) + Site time — hour (start of visit) </th> <th style="border-bottom:1px solid rgb(231,231,231);font-size: 15px;text-align: left;font-weight:normal;padding:13px 0 13px 10px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif; text-align:right;"> Visits @@ -3416,7 +3416,7 @@ </a></p> <h2 id="VisitTime_getByDayOfWeek" style=" color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif; font-size: 24pt; font-weight:normal; margin:45px 0 30px 0;"> - Visits by Day of Week + Visits by day of the week </h2> <img alt="" @@ -4406,11 +4406,11 @@ There is no data for this report. <h2 id="VisitorInterest_getNumberOfVisitsPerVisitDuration" style=" color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif; font-size: 24pt; font-weight:normal; margin:45px 0 30px 0;"> - Length of Visits + Length of visits </h2> <img alt="" - src="data:image/png;base64,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" + src="data:image/png;base64,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" height="200" width="700" margin="0 auto"/> @@ -4431,7 +4431,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 0-10s </td> + 0–10s </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 3 </td> @@ -4439,7 +4439,7 @@ <tr style="background-color: #f2f2f2;"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 11-30s </td> + 11–30s </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -4447,7 +4447,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 31-60s </td> + 31–60s </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -4516,7 +4516,7 @@ </a></p> <h2 id="VisitorInterest_getNumberOfVisitsPerPage" style=" color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif; font-size: 24pt; font-weight:normal; margin:45px 0 30px 0;"> - Pages per Visit + Pages per visit </h2> <img alt="" @@ -4626,7 +4626,7 @@ </a></p> <h2 id="VisitorInterest_getNumberOfVisitsByVisitCount" style=" color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif; font-size: 24pt; font-weight:normal; margin:45px 0 30px 0;"> - Visits by Visit Number + Visits by visit number </h2> <img alt="" @@ -4641,7 +4641,7 @@ <table style="border-collapse:collapse; border:1px solid rgb(231,231,231); padding:5px;"> <thead style="background-color: #f2f2f2;"> <th style="border-bottom:1px solid rgb(231,231,231);font-size: 15px;text-align: left;font-weight:normal;padding:13px 0 13px 10px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - Visits by Visit Number + Visits by visit number </th> <th style="border-bottom:1px solid rgb(231,231,231);font-size: 15px;text-align: left;font-weight:normal;padding:13px 0 13px 10px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif; text-align:right;"> Visits diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_tables_only__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_tables_only__ScheduledReports.generateReport_month.original.html index b8dcd11ea3..e671fd13e4 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_tables_only__ScheduledReports.generateReport_month.original.html +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_tables_only__ScheduledReports.generateReport_month.original.html @@ -150,7 +150,7 @@ </li> <li style="font-size:15px;line-height:24px;"> <a href="#VisitTime_getByDayOfWeek" style="text-decoration:none; color: #0d0d0d;"> - Visits by Day of Week + Visits by day of the week </a> </li> <li style="font-size:15px;line-height:24px;"> @@ -265,17 +265,17 @@ </li> <li style="font-size:15px;line-height:24px;"> <a href="#VisitorInterest_getNumberOfVisitsPerVisitDuration" style="text-decoration:none; color: #0d0d0d;"> - Length of Visits + Length of visits </a> </li> <li style="font-size:15px;line-height:24px;"> <a href="#VisitorInterest_getNumberOfVisitsPerPage" style="text-decoration:none; color: #0d0d0d;"> - Pages per Visit + Pages per visit </a> </li> <li style="font-size:15px;line-height:24px;"> <a href="#VisitorInterest_getNumberOfVisitsByVisitCount" style="text-decoration:none; color: #0d0d0d;"> - Visits by Visit Number + Visits by visit number </a> </li> <li style="font-size:15px;line-height:24px;"> @@ -2097,7 +2097,7 @@ <table style="border-collapse:collapse; border:1px solid rgb(231,231,231); padding:5px;"> <thead style="background-color: #f2f2f2;"> <th style="border-bottom:1px solid rgb(231,231,231);font-size: 15px;text-align: left;font-weight:normal;padding:13px 0 13px 10px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - Local time - hour (Start of visit) + Local time — hour (start of visit) </th> <th style="border-bottom:1px solid rgb(231,231,231);font-size: 15px;text-align: left;font-weight:normal;padding:13px 0 13px 10px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif; text-align:right;"> Visits @@ -2687,7 +2687,7 @@ <table style="border-collapse:collapse; border:1px solid rgb(231,231,231); padding:5px;"> <thead style="background-color: #f2f2f2;"> <th style="border-bottom:1px solid rgb(231,231,231);font-size: 15px;text-align: left;font-weight:normal;padding:13px 0 13px 10px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - Site time - hour (Start of visit) + Site time — hour (start of visit) </th> <th style="border-bottom:1px solid rgb(231,231,231);font-size: 15px;text-align: left;font-weight:normal;padding:13px 0 13px 10px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif; text-align:right;"> Visits @@ -3269,7 +3269,7 @@ </a></p> <h2 id="VisitTime_getByDayOfWeek" style=" color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif; font-size: 24pt; font-weight:normal; margin:45px 0 30px 0;"> - Visits by Day of Week + Visits by day of the week </h2> @@ -4196,7 +4196,7 @@ There is no data for this report. <h2 id="VisitorInterest_getNumberOfVisitsPerVisitDuration" style=" color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif; font-size: 24pt; font-weight:normal; margin:45px 0 30px 0;"> - Length of Visits + Length of visits </h2> @@ -4214,7 +4214,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 0-10s </td> + 0–10s </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 3 </td> @@ -4222,7 +4222,7 @@ <tr style="background-color: #f2f2f2;"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 11-30s </td> + 11–30s </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -4230,7 +4230,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 31-60s </td> + 31–60s </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;font-variant-numeric: tabular-nums;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -4299,7 +4299,7 @@ </a></p> <h2 id="VisitorInterest_getNumberOfVisitsPerPage" style=" color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif; font-size: 24pt; font-weight:normal; margin:45px 0 30px 0;"> - Pages per Visit + Pages per visit </h2> @@ -4402,7 +4402,7 @@ </a></p> <h2 id="VisitorInterest_getNumberOfVisitsByVisitCount" style=" color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif; font-size: 24pt; font-weight:normal; margin:45px 0 30px 0;"> - Visits by Visit Number + Visits by visit number </h2> @@ -4410,7 +4410,7 @@ <table style="border-collapse:collapse; border:1px solid rgb(231,231,231); padding:5px;"> <thead style="background-color: #f2f2f2;"> <th style="border-bottom:1px solid rgb(231,231,231);font-size: 15px;text-align: left;font-weight:normal;padding:13px 0 13px 10px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - Visits by Visit Number + Visits by visit number </th> <th style="border-bottom:1px solid rgb(231,231,231);font-size: 15px;text-align: left;font-weight:normal;padding:13px 0 13px 10px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif; text-align:right;"> Visits diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_in_csv__ScheduledReports.generateReport_month.original.csv b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_in_csv__ScheduledReports.generateReport_month.original.csv index adb71400d4..d59a128e94 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_in_csv__ScheduledReports.generateReport_month.original.csv +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_in_csv__ScheduledReports.generateReport_month.original.csv @@ -153,7 +153,7 @@ label,nb_visits,nb_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate,rev 22,0,0,0,00:00:00,0%,$0 23,1,1,1,00:00:00,100%,$0 -Visits by Day of Week +Visits by day of the week label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate Monday,2,6,0%,3,00:07:31,50% Tuesday,2,10,0%,5,00:15:01,0% @@ -249,11 +249,11 @@ No data available Content Piece No data available -Length of Visits +Length of visits label,nb_visits -0-10s,3 -11-30s,0 -31-60s,0 +0–10s,3 +11–30s,0 +31–60s,0 1-2 min,0 2-4 min,0 4-7 min,0 @@ -262,7 +262,7 @@ label,nb_visits 15-30 min,8 30+ min,0 -Pages per Visit +Pages per visit label,nb_visits 1 page,3 2 pages,0 @@ -275,7 +275,7 @@ label,nb_visits 15-20 pages,0 21+ pages,0 -Visits by Visit Number +Visits by visit number label,nb_visits,nb_visits_percentage 1 visit,2,18% 2 visits,2,18% diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf Binary files differindex b5822da4b3..7c7cd19317 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_in_tsv__ScheduledReports.generateReport_month.original.tsv b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_in_tsv__ScheduledReports.generateReport_month.original.tsv index 1bb5cc38c3..731a0b5c7e 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_in_tsv__ScheduledReports.generateReport_month.original.tsv +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_in_tsv__ScheduledReports.generateReport_month.original.tsv @@ -153,7 +153,7 @@ label nb_visits nb_actions nb_actions_per_visit avg_time_on_site bounce_rate rev 22 0 0 0 00:00:00 0% $0 23 1 1 1 00:00:00 100% $0 -Visits by Day of Week +Visits by day of the week label nb_visits nb_actions conversion_rate nb_actions_per_visit avg_time_on_site bounce_rate Monday 2 6 0% 3 00:07:31 50% Tuesday 2 10 0% 5 00:15:01 0% @@ -249,11 +249,11 @@ No data available Content Piece No data available -Length of Visits +Length of visits label nb_visits -0-10s 3 -11-30s 0 -31-60s 0 +0–10s 3 +11–30s 0 +31–60s 0 1-2 min 0 2-4 min 0 4-7 min 0 @@ -262,7 +262,7 @@ label nb_visits 15-30 min 8 30+ min 0 -Pages per Visit +Pages per visit label nb_visits 1 page 3 2 pages 0 @@ -275,7 +275,7 @@ label nb_visits 15-20 pages 0 21+ pages 0 -Visits by Visit Number +Visits by visit number label nb_visits nb_visits_percentage 1 visit 2 18% 2 visits 2 18% diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml index f088c38a71..c72f06e5ca 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml @@ -3,7 +3,7 @@ <row> <id>website</id> <name>Website</name> - <description>A website consists of web pages typically served from a single web domain.</description> + <description>A website consists of webpages, typically served from a single domain on the web.</description> <howToSetupUrl>?module=CoreAdminHome&action=trackingCodeGenerator</howToSetupUrl> <settings> <row> diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryReports.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryReports.xml index 99e01d349a..da1e4a2b27 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryReports.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryReports.xml @@ -196,8 +196,8 @@ <documentation>This report shows which exact language code the visitor's browsers is set to. (e.g. "German - Austria (de-at)")</documentation> </row> <row> - <name>Length of Visits (Actions)</name> - <documentation>In this report, you can see how many visits had a certain total duration. Initially, the report is shown as a tag cloud, more common durations are displayed in a larger font.<br />Please note, that you can view the report in other ways than as a tag cloud. Use the controls at the bottom of the report to do so.</documentation> + <name>Length of visits (Actions)</name> + <documentation>How many visits had a certain total duration. Initially, the report is shown as a tag cloud, wherein more common durations have a larger font.<br />Please note, that you can view the report in other ways than as a tag cloud. Use the controls at the bottom of the report to do so.</documentation> </row> <row> <name>Main metrics (API)</name> @@ -234,8 +234,8 @@ <onlineGuideUrl>https://matomo.org/docs/site-search/</onlineGuideUrl> </row> <row> - <name>Pages per Visit (Actions)</name> - <documentation>In this report, you can see how many visits involved a certain number of pageviews. Initially, the report is shown as a tag cloud, more common numbers of pages are displayed in a larger font.<br />Please note, that you can view the report in other ways than as a tag cloud. Use the controls at the bottom of the report to do so.</documentation> + <name>Pages per visit (Actions)</name> + <documentation>How many visits involved a certain number of pageviews. Initially, the report is shown as a tag cloud, wherein more common numbers of pages have a larger font.<br />Please note, that you can view the report in other ways than as a tag cloud. Use the controls at the bottom of the report to do so.</documentation> </row> <row> <name>Performance overview (Actions)</name> @@ -303,16 +303,16 @@ <documentation>This report provides a very general overview of how your visitors behave.</documentation> </row> <row> - <name>Visits by Day of Week (Visitors)</name> + <name>Visits by day of the week (Visitors)</name> <documentation>This graph shows the number of visits your website received on each day of the week.</documentation> </row> <row> - <name>Visits by Visit Number (Actions)</name> - <documentation>In this report, you can see the number of visits who were the Nth visit, ie. visitors who visited your website at least N times.<br />Please note, that you can view the report in other ways than as a tag cloud. Use the controls at the bottom of the report to do so.</documentation> + <name>Visits by days since last visit (Actions)</name> + <documentation>How many visits were from returning visitors whose last visit was a certain number of days ago.</documentation> </row> <row> - <name>Visits by days since last visit (Actions)</name> - <documentation>In this report, you can see how many visits were from visitors whose last visit was a certain number of days ago.</documentation> + <name>Visits by visit number (Actions)</name> + <documentation>The number of visitors reaching their Nth visit. I.e. the total amount of visitors visiting your website a given amount of times or more.<br />Please note, that you can view the report in other ways than as a tag cloud. Use the controls at the bottom of the report to do so.</documentation> </row> <row> <name>Visits per hour in the site's timezone (Visitors)</name> diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml index 5f6f71d13e..3b3eaaa715 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml @@ -767,7 +767,7 @@ <name>Visits per local time</name> <module>VisitTime</module> <action>getVisitInformationPerLocalTime</action> - <dimension>Local time - hour (Start of visit)</dimension> + <dimension>Local time — hour (start of visit)</dimension> <documentation>This graph shows what time it was in the <strong> visitors' time zones </strong> during their visits.</documentation> <metrics> <nb_visits>Visits</nb_visits> @@ -794,7 +794,7 @@ <constantRowsCount>1</constantRowsCount> <relatedReports> <row> - <name>Visits by Day of Week</name> + <name>Visits by day of the week</name> <module>VisitTime</module> <action>getByDayOfWeek</action> </row> @@ -808,7 +808,7 @@ <name>Visits per hour in the site's timezone</name> <module>VisitTime</module> <action>getVisitInformationPerServerTime</action> - <dimension>Site time - hour (Start of visit)</dimension> + <dimension>Site time — hour (start of visit)</dimension> <documentation>This graph shows what time it was in the <strong> site's time zone </strong> during the visits.</documentation> <metrics> <nb_visits>Visits</nb_visits> @@ -845,7 +845,7 @@ <row> <category>Visitors</category> <subcategory>Times</subcategory> - <name>Visits by Day of Week</name> + <name>Visits by day of the week</name> <module>VisitTime</module> <action>getByDayOfWeek</action> <dimension>Day of the week</dimension> @@ -1580,11 +1580,11 @@ <row> <category>Actions</category> <subcategory>Engagement</subcategory> - <name>Length of Visits</name> + <name>Length of visits</name> <module>VisitorInterest</module> <action>getNumberOfVisitsPerVisitDuration</action> <dimension>Visit duration</dimension> - <documentation>In this report, you can see how many visits had a certain total duration. Initially, the report is shown as a tag cloud, more common durations are displayed in a larger font.<br />Please note, that you can view the report in other ways than as a tag cloud. Use the controls at the bottom of the report to do so.</documentation> + <documentation>How many visits had a certain total duration. Initially, the report is shown as a tag cloud, wherein more common durations have a larger font.<br />Please note, that you can view the report in other ways than as a tag cloud. Use the controls at the bottom of the report to do so.</documentation> <metrics> <nb_visits>Visits</nb_visits> </metrics> @@ -1598,11 +1598,11 @@ <row> <category>Actions</category> <subcategory>Engagement</subcategory> - <name>Pages per Visit</name> + <name>Pages per visit</name> <module>VisitorInterest</module> <action>getNumberOfVisitsPerPage</action> <dimension>Pages per visit</dimension> - <documentation>In this report, you can see how many visits involved a certain number of pageviews. Initially, the report is shown as a tag cloud, more common numbers of pages are displayed in a larger font.<br />Please note, that you can view the report in other ways than as a tag cloud. Use the controls at the bottom of the report to do so.</documentation> + <documentation>How many visits involved a certain number of pageviews. Initially, the report is shown as a tag cloud, wherein more common numbers of pages have a larger font.<br />Please note, that you can view the report in other ways than as a tag cloud. Use the controls at the bottom of the report to do so.</documentation> <metrics> <nb_visits>Visits</nb_visits> </metrics> @@ -1616,11 +1616,11 @@ <row> <category>Actions</category> <subcategory>Engagement</subcategory> - <name>Visits by Visit Number</name> + <name>Visits by visit number</name> <module>VisitorInterest</module> <action>getNumberOfVisitsByVisitCount</action> - <dimension>Visits by Visit Number</dimension> - <documentation>In this report, you can see the number of visits who were the Nth visit, ie. visitors who visited your website at least N times.<br />Please note, that you can view the report in other ways than as a tag cloud. Use the controls at the bottom of the report to do so.</documentation> + <dimension>Visits by visit number</dimension> + <documentation>The number of visitors reaching their Nth visit. I.e. the total amount of visitors visiting your website a given amount of times or more.<br />Please note, that you can view the report in other ways than as a tag cloud. Use the controls at the bottom of the report to do so.</documentation> <metrics> <nb_visits>Visits</nb_visits> </metrics> @@ -1641,7 +1641,7 @@ <module>VisitorInterest</module> <action>getNumberOfVisitsByDaysSinceLast</action> <dimension>Days since last visit</dimension> - <documentation>In this report, you can see how many visits were from visitors whose last visit was a certain number of days ago.</documentation> + <documentation>How many visits were from returning visitors whose last visit was a certain number of days ago.</documentation> <metrics> <nb_visits>Visits</nb_visits> </metrics> diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportPagesMetadata.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportPagesMetadata.xml index 5f77407349..1adc347ff9 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportPagesMetadata.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportPagesMetadata.xml @@ -45,7 +45,7 @@ <isReport>1</isReport> </row> <row> - <name>Visits by Visit Number</name> + <name>Visits by visit number</name> <module>VisitorInterest</module> <action>getNumberOfVisitsByVisitCount</action> <order>125</order> @@ -59,7 +59,7 @@ <isReport>1</isReport> </row> <row> - <name>Visits by Days Since Last Visit</name> + <name>Visits by days since last visit</name> <module>VisitorInterest</module> <action>getNumberOfVisitsByDaysSinceLast</action> <order>130</order> @@ -1160,7 +1160,7 @@ <id>VisitTime_SubmenuTimes</id> <name>Times</name> <order>35</order> - <help><p>The Times section shows you when people are visiting your site. You can see the most popular local times your users visit at, so you can understand where your site fits into their life. Additionally, it shows the most popular server times, which can reveal demands on your technology stack.</p></help> + <help><p>The "Times" section shows when people visit your site. Popular local times helps you cater your site to their lives. The most popular server times reveals technical demand.</p></help> </subcategory> <widgets> <row> @@ -1192,7 +1192,7 @@ <isReport>1</isReport> </row> <row> - <name>Visits by Day of Week</name> + <name>Visits by day of the week</name> <module>VisitTime</module> <action>getByDayOfWeek</action> <order>125</order> diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml index 20f216c73c..75d1c0a56c 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml @@ -34,7 +34,7 @@ <row> <type>metric</type> <category>Visitors</category> - <name>Local time - minute (Start of visit)</name> + <name>Local time — minute (start of visit)</name> <segment>visitLocalMinute</segment> <acceptedValues>0, 1, 2, 3, ..., 67, 57, 58, 59</acceptedValues> </row> @@ -151,7 +151,7 @@ <row> <type>dimension</type> <category>Visitors</category> - <name>Local time - hour (Start of visit)</name> + <name>Local time — hour (start of visit)</name> <segment>visitLocalHour</segment> <acceptedValues>0, 1, 2, 3, ..., 20, 21, 22, 23</acceptedValues> </row> @@ -193,91 +193,91 @@ <row> <type>dimension</type> <category>Visitors</category> - <name>Site time - hour (Start of visit)</name> + <name>Site time — hour (start of visit)</name> <segment>visitStartServerHour</segment> <acceptedValues>0, 1, 2, 3, ..., 20, 21, 22, 23</acceptedValues> </row> <row> <type>dimension</type> <category>Visitors</category> - <name>Site time - hour (Time of last action)</name> + <name>Site time — hour (time of last action)</name> <segment>visitServerHour</segment> <acceptedValues>0, 1, 2, 3, ..., 20, 21, 22, 23</acceptedValues> </row> <row> <type>dimension</type> <category>Visitors</category> - <name>Time in UTC - date (Time of last action)</name> + <name>Time in UTC — date (time of last action)</name> <segment>visitEndServerDate</segment> <acceptedValues>2018-12-31, 2018-03-20, ...</acceptedValues> </row> <row> <type>dimension</type> <category>Visitors</category> - <name>Time in UTC - day of month (Time of last action)</name> + <name>Time in UTC — day of month (time of last action)</name> <segment>visitEndServerDayOfMonth</segment> <acceptedValues>0, 1, 2, 3, ..., 29, 30, 31</acceptedValues> </row> <row> <type>dimension</type> <category>Visitors</category> - <name>Time in UTC - day of week (Time of last action)</name> + <name>Time in UTC — day of week (time of last action)</name> <segment>visitEndServerDayOfWeek</segment> <acceptedValues>1, 2, 3, 4, 5, 6, 7</acceptedValues> </row> <row> <type>dimension</type> <category>Visitors</category> - <name>Time in UTC - day of year (Time of last action)</name> + <name>Time in UTC — day of year (time of last action)</name> <segment>visitEndServerDayOfYear</segment> <acceptedValues>1, 2, 3, 4, ..., 365, 366</acceptedValues> </row> <row> <type>dimension</type> <category>Visitors</category> - <name>Time in UTC - minute (Start of visit)</name> + <name>Time in UTC — minute (start of visit)</name> <segment>visitStartServerMinute</segment> <acceptedValues>0, 1, 2, 3, ..., 56, 57, 58, 59</acceptedValues> </row> <row> <type>dimension</type> <category>Visitors</category> - <name>Time in UTC - minute (Time of last action)</name> + <name>Time in UTC — minute (time of last action)</name> <segment>visitEndServerMinute</segment> <acceptedValues>0, 1, 2, 3, ..., 56, 57, 58, 59</acceptedValues> </row> <row> <type>dimension</type> <category>Visitors</category> - <name>Time in UTC - month (Time of last action)</name> + <name>Time in UTC — month (time of last action)</name> <segment>visitEndServerMonth</segment> <acceptedValues>1, 2, 3, ..., 11, 12</acceptedValues> </row> <row> <type>dimension</type> <category>Visitors</category> - <name>Time in UTC - quarter (Time of last action)</name> + <name>Time in UTC — quarter (time of last action)</name> <segment>visitEndServerQuarter</segment> <acceptedValues>1, 2, 3, 4</acceptedValues> </row> <row> <type>dimension</type> <category>Visitors</category> - <name>Time in UTC - second (Time of last action)</name> + <name>Time in UTC — second (Time of last action)</name> <segment>visitEndServerSecond</segment> <acceptedValues>0, 1, 2, 3, ..., 58, 59</acceptedValues> </row> <row> <type>dimension</type> <category>Visitors</category> - <name>Time in UTC - week of year (Time of last action)</name> + <name>Time in UTC — week of year (time of last action)</name> <segment>visitEndServerWeekOfYear</segment> <acceptedValues>1, 2, 3, 4, ..., 51, 52, 53</acceptedValues> </row> <row> <type>dimension</type> <category>Visitors</category> - <name>Time in UTC - year (Time of last action)</name> + <name>Time in UTC — year (time of last action)</name> <segment>visitEndServerYear</segment> <acceptedValues>2016, 2017, 2018, ..., 9998, 9999</acceptedValues> </row> @@ -684,13 +684,13 @@ <row> <type>dimension</type> <category>Behaviour</category> - <name>Site time - hour</name> + <name>Site time — hour</name> <segment>actionServerHour</segment> </row> <row> <type>dimension</type> <category>Behaviour</category> - <name>Time in UTC - minute</name> + <name>Time in UTC — minute</name> <segment>actionServerMinute</segment> <acceptedValues>0, 1, 2, 3, ..., 56, 57, 58, 59</acceptedValues> </row> diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml index 2f9e40d62e..ad14bbbc0c 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml @@ -769,7 +769,7 @@ <isReport>1</isReport> </row> <row> - <name>Visits by Day of Week</name> + <name>Visits by day of the week</name> <category> <id>General_Visitors</id> <name>Visitors</name> @@ -781,7 +781,7 @@ <id>VisitTime_SubmenuTimes</id> <name>Times</name> <order>35</order> - <help><p>The Times section shows you when people are visiting your site. You can see the most popular local times your users visit at, so you can understand where your site fits into their life. Additionally, it shows the most popular server times, which can reveal demands on your technology stack.</p></help> + <help><p>The "Times" section shows when people visit your site. Popular local times helps you cater your site to their lives. The most popular server times reveals technical demand.</p></help> </subcategory> <module>VisitTime</module> <action>getByDayOfWeek</action> @@ -808,7 +808,7 @@ <id>VisitTime_SubmenuTimes</id> <name>Times</name> <order>35</order> - <help><p>The Times section shows you when people are visiting your site. You can see the most popular local times your users visit at, so you can understand where your site fits into their life. Additionally, it shows the most popular server times, which can reveal demands on your technology stack.</p></help> + <help><p>The "Times" section shows when people visit your site. Popular local times helps you cater your site to their lives. The most popular server times reveals technical demand.</p></help> </subcategory> <module>VisitTime</module> <action>getVisitInformationPerLocalTime</action> @@ -835,7 +835,7 @@ <id>VisitTime_SubmenuTimes</id> <name>Times</name> <order>35</order> - <help><p>The Times section shows you when people are visiting your site. You can see the most popular local times your users visit at, so you can understand where your site fits into their life. Additionally, it shows the most popular server times, which can reveal demands on your technology stack.</p></help> + <help><p>The "Times" section shows when people visit your site. Popular local times helps you cater your site to their lives. The most popular server times reveals technical demand.</p></help> </subcategory> <module>VisitTime</module> <action>getVisitInformationPerServerTime</action> @@ -1614,7 +1614,7 @@ <isReport>1</isReport> </row> <row> - <name>Visits by Days Since Last Visit</name> + <name>Visits by days since last visit</name> <category> <id>General_Actions</id> <name>Behaviour</name> @@ -1641,7 +1641,7 @@ <isReport>1</isReport> </row> <row> - <name>Visits by Visit Number</name> + <name>Visits by visit number</name> <category> <id>General_Actions</id> <name>Behaviour</name> diff --git a/tests/UI/expected-screenshots/Menus_mobile_top.png b/tests/UI/expected-screenshots/Menus_mobile_top.png index d805ea9e7b..daca13a9c4 100644 --- a/tests/UI/expected-screenshots/Menus_mobile_top.png +++ b/tests/UI/expected-screenshots/Menus_mobile_top.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3934ce1630db57efd1094686bf0776b21ebe87789040b58e6fcbbfa363c28734 -size 176190 +oid sha256:5447a4a96d8770fded893806c37895ef21926efc3bbceb744326f72de58b0523 +size 176031 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png index 20f709eddd..913bf0ae52 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2390c83b9eb3890b110078585097d7f0ce50dff1347e3d627cb5a1f1f1079d8e -size 1097506 +oid sha256:975d8c4b98913328903e4190557ee8f55603dd3f1c4c25dc1a1c1f8b5a52d68c +size 1094718 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins_no_internet.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins_no_internet.png index ca3f9621ea..702ef02b27 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins_no_internet.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins_no_internet.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b4eec846d22ab3fce767845c622bb3e5d618a753a72396563ba4f2aa896a605f -size 1099155 +oid sha256:473402d68038b231fcbce274c904412c9353466acc5fd3373619249d4acce19b +size 1096391 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_visitor_generator.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_visitor_generator.png index 21b26c41e2..4a8596bbcb 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_visitor_generator.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_visitor_generator.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a3b3520fc7bbfaf44073c811780e855fdfd3a5047ae608fc33e28d543aafb807 -size 84546 +oid sha256:ba02cdf4651aa52b3b278f301e502d8aae8e61ad026dec8b32af328890816644 +size 83223 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard4.png b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard4.png index 79b0e9c5d3..bab84c33c6 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:b103ba590eb56e0b539d91c6e711228d184ed07d8df3f6454324a94312960579 -size 364567 +oid sha256:0df56a8ab9d4322b1cf84d9b497402ed62f95ce1e603ea1e9718d6abf53a3005 +size 362993 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard5_mobile.png b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard5_mobile.png index 7b571d1805..e097aed5e9 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard5_mobile.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard5_mobile.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0449f3e15348d9b2d13988a4b3aac47d223a53cf55f667a50f7c59879bcf4e61 -size 28964 +oid sha256:f70ad0192147205e670211faef1b0ee1549175764c476ba35624394c45baf01c +size 28835 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_email_reports_editor.png b/tests/UI/expected-screenshots/UIIntegrationTest_email_reports_editor.png index 53a1483f68..c9cdf19994 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_email_reports_editor.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_email_reports_editor.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fca1c222e32c5f1218690b6658c65354a5d7eaaaa5da31fbdcfa2adc35d63ea9 -size 482378 +oid sha256:7bac96e9f928b5e9263e1c96c05a96ff076186c50aa6046313a7e675ddc10448 +size 482563 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_period_select_date_range_click.png b/tests/UI/expected-screenshots/UIIntegrationTest_period_select_date_range_click.png index f7ef13acd7..bdfa2153ea 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_period_select_date_range_click.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_period_select_date_range_click.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8df592d8eab989ba953b692a4a6c0214a9afeb619cdc1203aa0ce120bd4b58e1 -size 81763 +oid sha256:d04ce8e7c2b1017f3aed672f4fd76d39d2f08ad9d337a03990cc9155f480b050 +size 81977 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_engagement.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_engagement.png index f9b8b994f5..2d6b3772ad 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:685e945bda0d027c5a717f600d7f893f28563dc885336acb2130e111ab1e7d89 -size 166119 +oid sha256:fc118e390966c687cbbaa61c9fea73b8629403e4873a9bdd954f01795ff1dde2 +size 164567 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_times.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_times.png index b33a31a9b7..c6e4b28045 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_times.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_times.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:953e1b47024bf275d21d2b6afe046a51fa1a0666b9867e14bf476c0d6d34ba48 -size 25489 +oid sha256:c7f6c5029d9ce97261ef02b435c8f19cd7a7d78668b7db959a64a7be3d81c449 +size 25727 |
