diff options
35 files changed, 88 insertions, 76 deletions
diff --git a/plugins/CoreAdminHome/lang/en.json b/plugins/CoreAdminHome/lang/en.json index 380e0a42cb..6bb367846f 100644 --- a/plugins/CoreAdminHome/lang/en.json +++ b/plugins/CoreAdminHome/lang/en.json @@ -48,7 +48,7 @@ "JSTracking_CodeNoteBeforeClosingHeadEmail": "Make sure this code is embedded within a script element on every page of your website. We recommend pasting it immediately before the closing head tag.", "JSTracking_CrossDomain": "By default, the visitor ID that identifies a unique visitor is stored in the browser's first party cookies which can only be accessed by pages on the same domain. Enabling cross domain linking lets you track all the actions and pageviews of a specific visitor into the same visit even when they view pages on several domains. Whenever a user clicks on a link to one of your website's alias URLs, it will append a URL parameter pk_vid forwarding the Visitor ID.", "JSTracking_CrossDomain_NeedsMultipleDomains": "Note: To use cross domain linking, you must specify more than one domain name (URLs) for your website.", - "JSTracking_CustomCampaignQueryParam": "Use custom query parameter names for the campaign name & keyword", + "JSTracking_CustomCampaignQueryParam": "Use custom query parameter names for the campaign name and keyword", "JSTracking_CustomCampaignQueryParamDesc": "Note: %1$sMatomo will automatically detect Google Analytics parameters.%2$s", "JSTracking_DisableCookies": "Disable all tracking cookies", "JSTracking_DisableCookiesDesc": "Disables all first party cookies. Existing Matomo cookies for this website will be deleted on the next pageview.", diff --git a/plugins/CoreHome/lang/en.json b/plugins/CoreHome/lang/en.json index 805be8faca..9cd8b40d70 100644 --- a/plugins/CoreHome/lang/en.json +++ b/plugins/CoreHome/lang/en.json @@ -106,8 +106,8 @@ "RowLimit": "Row limit", "CustomLimit": "Custom limit", "ExportFormat": "Export format", - "ExportTooltip": "Note: To use the generated export URL, you will need to specify an app token auth. You can configure these tokens in Admin -> Security -> Token Auths.", - "ExportTooltipWithLink": "Note: To use the generated export URL, you will need to specify an app token auth. You can configure these tokens in %1$s[Admin -> Security -> Auths Tokens]%2$s. Replace %3$s in the Export URL by your Auth token. Warning: Never share the URL with the real token with anyone else.", + "ExportTooltip": "Note: To use the generated export URL, you will need to specify an app token auth. You can configure these tokens in Admin → Security → Token Auths.", + "ExportTooltipWithLink": "Note: To use the generated export URL, you will need to specify an app token auth. You can configure these tokens in %1$s[Admin → Security → Auths Tokens]%2$s. Replace %3$s in the Export URL by your Auth token. Warning: Never share the URL with the real token with anyone else.", "ExpandSubtables": "Expand subtables", "StandardReport": "Standard report", "FlattenReport": "Flatten report", @@ -118,7 +118,7 @@ "Profilable": "Profilable", "SearchOnMatomo": "Search '%1$s' on Matomo.org", "TechDeprecationWarning": "Starting in version Matomo %1$s, Matomo will be ending support for %2$s. For more information %3$ssee our blog post.%4$s", - "ReportingCategoryHelpPrefix": "How does the \"%1$s > %2$s\" reporting page help me?", + "ReportingCategoryHelpPrefix": "How does the \"%1$s → %2$s\" reporting page help me?", "VisitorsCategoryHelp1": "The Visitors pages tell you things about who your visitors are. Things like where your visitors came from, what devices and browsers they're using and when they generally visit your website. Understand, in the aggregate, who your audience is, and look for outliers to see how your audience could grow.", "VisitorsCategoryHelp2": "In addition to general information about your visitors, you can also use the %1$sVisits Log%2$s to see what occurred in every individual visit.", "VisitorsOverviewHelp": "The Visitors Overview helps you understand the popularity of your site. It does this by providing charts that show how many visits your site is receiving over a selected period and the average level of engagement for key features, such as searches and downloads.", diff --git a/plugins/CoreHome/templates/_menu.twig b/plugins/CoreHome/templates/_menu.twig index 4e9129881a..b1bbc548a1 100644 --- a/plugins/CoreHome/templates/_menu.twig +++ b/plugins/CoreHome/templates/_menu.twig @@ -36,7 +36,7 @@ href="index.php?{{ urlParameters._url|urlRewriteWithParameters|slice(1) }}" {% endif %}> {% if urlParameters._icon is defined and urlParameters._icon %}<span class="icon {{ urlParameters._icon|e('html_attr') }}" style="margin-right: 5px;"></span>{% endif %} - {{ name|translate }} + {{ name|translate|rawSafeDecoded }} </a> </li> {% endif %} diff --git a/plugins/CoreHome/vue/dist/CoreHome.umd.js b/plugins/CoreHome/vue/dist/CoreHome.umd.js index e9fc732167..00569363a9 100644 --- a/plugins/CoreHome/vue/dist/CoreHome.umd.js +++ b/plugins/CoreHome/vue/dist/CoreHome.umd.js @@ -3949,45 +3949,46 @@ EnrichedHeadlinevue_type_script_lang_ts.render = EnrichedHeadlinevue_type_templa directiveName: 'piwikEnrichedHeadline', transclude: true })); -// CONCATENATED MODULE: ./node_modules/@vue/cli-plugin-babel/node_modules/cache-loader/dist/cjs.js??ref--12-0!./node_modules/@vue/cli-plugin-babel/node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib!./node_modules/@vue/cli-service/node_modules/vue-loader-v16/dist/templateLoader.js??ref--6!./node_modules/@vue/cli-service/node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/@vue/cli-service/node_modules/vue-loader-v16/dist??ref--0-1!./plugins/CoreHome/vue/src/ContentBlock/ContentBlock.vue?vue&type=template&id=3f4d113e +// CONCATENATED MODULE: ./node_modules/@vue/cli-plugin-babel/node_modules/cache-loader/dist/cjs.js??ref--12-0!./node_modules/@vue/cli-plugin-babel/node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib!./node_modules/@vue/cli-service/node_modules/vue-loader-v16/dist/templateLoader.js??ref--6!./node_modules/@vue/cli-service/node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/@vue/cli-service/node_modules/vue-loader-v16/dist??ref--0-1!./plugins/CoreHome/vue/src/ContentBlock/ContentBlock.vue?vue&type=template&id=bb18e396 -var ContentBlockvue_type_template_id_3f4d113e_hoisted_1 = { +var ContentBlockvue_type_template_id_bb18e396_hoisted_1 = { class: "card", ref: "root" }; -var ContentBlockvue_type_template_id_3f4d113e_hoisted_2 = { +var ContentBlockvue_type_template_id_bb18e396_hoisted_2 = { class: "card-content" }; -var ContentBlockvue_type_template_id_3f4d113e_hoisted_3 = { +var ContentBlockvue_type_template_id_bb18e396_hoisted_3 = { key: 0, class: "card-title" }; -var ContentBlockvue_type_template_id_3f4d113e_hoisted_4 = { +var ContentBlockvue_type_template_id_bb18e396_hoisted_4 = { key: 1, class: "card-title" }; -var ContentBlockvue_type_template_id_3f4d113e_hoisted_5 = { +var ContentBlockvue_type_template_id_bb18e396_hoisted_5 = { ref: "content" }; -function ContentBlockvue_type_template_id_3f4d113e_render(_ctx, _cache, $props, $setup, $data, $options) { +function ContentBlockvue_type_template_id_bb18e396_render(_ctx, _cache, $props, $setup, $data, $options) { var _component_EnrichedHeadline = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["resolveComponent"])("EnrichedHeadline"); - return Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("div", ContentBlockvue_type_template_id_3f4d113e_hoisted_1, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("div", ContentBlockvue_type_template_id_3f4d113e_hoisted_2, [_ctx.contentTitle && !_ctx.actualFeature && !_ctx.helpUrl && !_ctx.actualHelpText ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("h2", ContentBlockvue_type_template_id_3f4d113e_hoisted_3, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.contentTitle), 1)) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true), _ctx.contentTitle && (_ctx.actualFeature || _ctx.helpUrl || _ctx.actualHelpText) ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("h2", ContentBlockvue_type_template_id_3f4d113e_hoisted_4, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createVNode"])(_component_EnrichedHeadline, { + return Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("div", ContentBlockvue_type_template_id_bb18e396_hoisted_1, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("div", ContentBlockvue_type_template_id_bb18e396_hoisted_2, [_ctx.contentTitle && !_ctx.actualFeature && !_ctx.helpUrl && !_ctx.actualHelpText ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("h2", ContentBlockvue_type_template_id_bb18e396_hoisted_3, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.decode(_ctx.contentTitle)), 1)) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true), _ctx.contentTitle && (_ctx.actualFeature || _ctx.helpUrl || _ctx.actualHelpText) ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("h2", ContentBlockvue_type_template_id_bb18e396_hoisted_4, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createVNode"])(_component_EnrichedHeadline, { "feature-name": _ctx.actualFeature, "help-url": _ctx.helpUrl, "inline-help": _ctx.actualHelpText }, { default: Object(external_commonjs_vue_commonjs2_vue_root_Vue_["withCtx"])(function () { - return [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createTextVNode"])(Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.contentTitle), 1)]; + return [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createTextVNode"])(Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toDisplayString"])(_ctx.decode(_ctx.contentTitle)), 1)]; }), _: 1 - }, 8, ["feature-name", "help-url", "inline-help"])])) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("div", ContentBlockvue_type_template_id_3f4d113e_hoisted_5, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["renderSlot"])(_ctx.$slots, "default")], 512)])], 512); + }, 8, ["feature-name", "help-url", "inline-help"])])) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("div", ContentBlockvue_type_template_id_bb18e396_hoisted_5, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["renderSlot"])(_ctx.$slots, "default")], 512)])], 512); } -// CONCATENATED MODULE: ./plugins/CoreHome/vue/src/ContentBlock/ContentBlock.vue?vue&type=template&id=3f4d113e +// CONCATENATED MODULE: ./plugins/CoreHome/vue/src/ContentBlock/ContentBlock.vue?vue&type=template&id=bb18e396 // CONCATENATED MODULE: ./node_modules/@vue/cli-plugin-typescript/node_modules/cache-loader/dist/cjs.js??ref--14-0!./node_modules/babel-loader/lib!./node_modules/@vue/cli-plugin-typescript/node_modules/ts-loader??ref--14-2!./node_modules/@vue/cli-service/node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/@vue/cli-service/node_modules/vue-loader-v16/dist??ref--0-1!./plugins/CoreHome/vue/src/ContentBlock/ContentBlock.vue?vue&type=script&lang=ts + var adminContent = null; var ContentBlockvue_type_script_lang_ts_window = window, ContentBlockvue_type_script_lang_ts_$ = ContentBlockvue_type_script_lang_ts_window.$; @@ -4065,6 +4066,11 @@ var ContentBlockvue_type_script_lang_ts_window = window, root.style.marginTop = '0'; } } + }, + methods: { + decode: function decode(s) { + return Matomo_Matomo.helper.htmlDecode(s); + } } })); // CONCATENATED MODULE: ./plugins/CoreHome/vue/src/ContentBlock/ContentBlock.vue?vue&type=script&lang=ts @@ -4073,7 +4079,7 @@ var ContentBlockvue_type_script_lang_ts_window = window, -ContentBlockvue_type_script_lang_ts.render = ContentBlockvue_type_template_id_3f4d113e_render +ContentBlockvue_type_script_lang_ts.render = ContentBlockvue_type_template_id_bb18e396_render /* harmony default export */ var ContentBlock = (ContentBlockvue_type_script_lang_ts); // CONCATENATED MODULE: ./plugins/CoreHome/vue/src/ContentBlock/ContentBlock.adapter.ts diff --git a/plugins/CoreHome/vue/dist/CoreHome.umd.min.js b/plugins/CoreHome/vue/dist/CoreHome.umd.min.js index 68c6222e2e..de0ae18fce 100644 --- a/plugins/CoreHome/vue/dist/CoreHome.umd.min.js +++ b/plugins/CoreHome/vue/dist/CoreHome.umd.min.js @@ -270,7 +270,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 Qn(e,t,n,r,i,o){var l=Object(a["resolveComponent"])("EnrichedHeadline");return Object(a["openBlock"])(),Object(a["createElementBlock"])("div",Wn,[Object(a["createElementVNode"])("div",Jn,[!e.contentTitle||e.actualFeature||e.helpUrl||e.actualHelpText?Object(a["createCommentVNode"])("",!0):(Object(a["openBlock"])(),Object(a["createElementBlock"])("h2",Gn,Object(a["toDisplayString"])(e.contentTitle),1)),e.contentTitle&&(e.actualFeature||e.helpUrl||e.actualHelpText)?(Object(a["openBlock"])(),Object(a["createElementBlock"])("h2",zn,[Object(a["createVNode"])(l,{"feature-name":e.actualFeature,"help-url":e.helpUrl,"inline-help":e.actualHelpText},{default:Object(a["withCtx"])((function(){return[Object(a["createTextVNode"])(Object(a["toDisplayString"])(e.contentTitle),1)]})),_:1},8,["feature-name","help-url","inline-help"])])):Object(a["createCommentVNode"])("",!0),Object(a["createElementVNode"])("div",Yn,[Object(a["renderSlot"])(e.$slots,"default")],512)])],512)}var Kn=null,Xn=window,Zn=Xn.$,er=Object(a["defineComponent"])({props:{contentTitle:String,feature:String,helpUrl:String,helpText:String,anchor:String},components:{EnrichedHeadline:qn},data:function(){return{actualFeature:this.feature,actualHelpText:this.helpText}},watch:{feature:function(e){this.actualFeature=e},helpText:function(e){this.actualHelpText=e}},mounted:function(){var e=this,t=this.$refs.root,n=this.$refs.content;if(this.anchor&&t&&t.parentElement){var r=document.createElement("a");r.id=this.anchor,Zn(t.parentElement).prepend(r)}setTimeout((function(){var t=n.querySelector(".contentHelp");t&&(e.actualHelpText=t.innerHTML,t.remove())}),0),this.actualFeature&&"true"===this.actualFeature&&(this.actualFeature=this.contentTitle),null===Kn&&(Kn=document.querySelector("#content.admin"));var i=null;if(Kn&&(i=Kn.offsetTop),i||0===i){var a=t.closest("[piwik-widget-loader]"),o=a?a.offsetTop:t.offsetTop;o-i<17&&(t.style.marginTop="0")}}});er.render=Qn;var tr=er; + */function Qn(e,t,n,r,i,o){var l=Object(a["resolveComponent"])("EnrichedHeadline");return Object(a["openBlock"])(),Object(a["createElementBlock"])("div",Wn,[Object(a["createElementVNode"])("div",Jn,[!e.contentTitle||e.actualFeature||e.helpUrl||e.actualHelpText?Object(a["createCommentVNode"])("",!0):(Object(a["openBlock"])(),Object(a["createElementBlock"])("h2",Gn,Object(a["toDisplayString"])(e.decode(e.contentTitle)),1)),e.contentTitle&&(e.actualFeature||e.helpUrl||e.actualHelpText)?(Object(a["openBlock"])(),Object(a["createElementBlock"])("h2",zn,[Object(a["createVNode"])(l,{"feature-name":e.actualFeature,"help-url":e.helpUrl,"inline-help":e.actualHelpText},{default:Object(a["withCtx"])((function(){return[Object(a["createTextVNode"])(Object(a["toDisplayString"])(e.decode(e.contentTitle)),1)]})),_:1},8,["feature-name","help-url","inline-help"])])):Object(a["createCommentVNode"])("",!0),Object(a["createElementVNode"])("div",Yn,[Object(a["renderSlot"])(e.$slots,"default")],512)])],512)}var Kn=null,Xn=window,Zn=Xn.$,er=Object(a["defineComponent"])({props:{contentTitle:String,feature:String,helpUrl:String,helpText:String,anchor:String},components:{EnrichedHeadline:qn},data:function(){return{actualFeature:this.feature,actualHelpText:this.helpText}},watch:{feature:function(e){this.actualFeature=e},helpText:function(e){this.actualHelpText=e}},mounted:function(){var e=this,t=this.$refs.root,n=this.$refs.content;if(this.anchor&&t&&t.parentElement){var r=document.createElement("a");r.id=this.anchor,Zn(t.parentElement).prepend(r)}setTimeout((function(){var t=n.querySelector(".contentHelp");t&&(e.actualHelpText=t.innerHTML,t.remove())}),0),this.actualFeature&&"true"===this.actualFeature&&(this.actualFeature=this.contentTitle),null===Kn&&(Kn=document.querySelector("#content.admin"));var i=null;if(Kn&&(i=Kn.offsetTop),i||0===i){var a=t.closest("[piwik-widget-loader]"),o=a?a.offsetTop:t.offsetTop;o-i<17&&(t.style.marginTop="0")}},methods:{decode:function(e){return S.helper.htmlDecode(e)}}});er.render=Qn;var tr=er; /*! * Matomo - free/libre analytics platform * diff --git a/plugins/CoreHome/vue/src/ContentBlock/ContentBlock.vue b/plugins/CoreHome/vue/src/ContentBlock/ContentBlock.vue index 6bee7fab95..83ca3df273 100644 --- a/plugins/CoreHome/vue/src/ContentBlock/ContentBlock.vue +++ b/plugins/CoreHome/vue/src/ContentBlock/ContentBlock.vue @@ -10,7 +10,7 @@ <h2 v-if="contentTitle && !actualFeature && !helpUrl && !actualHelpText" class="card-title" - >{{ contentTitle }}</h2> + >{{ decode(contentTitle) }}</h2> <h2 v-if="contentTitle && (actualFeature || helpUrl || actualHelpText)" class="card-title" @@ -20,7 +20,7 @@ :help-url="helpUrl" :inline-help="actualHelpText" > - {{ contentTitle }} + {{ decode(contentTitle) }} </EnrichedHeadline> </h2> <div ref="content"> @@ -33,6 +33,7 @@ <script lang="ts"> import { defineComponent } from 'vue'; import EnrichedHeadline from '../EnrichedHeadline/EnrichedHeadline.vue'; +import Matomo from '../Matomo/Matomo'; let adminContent: HTMLElement|null = null; @@ -110,5 +111,10 @@ export default defineComponent({ } } }, + methods: { + decode(s: string) { + return Matomo.helper.htmlDecode(s); + }, + }, }); </script> diff --git a/plugins/CorePluginsAdmin/lang/en.json b/plugins/CorePluginsAdmin/lang/en.json index 677915c15e..8c715491f0 100644 --- a/plugins/CorePluginsAdmin/lang/en.json +++ b/plugins/CorePluginsAdmin/lang/en.json @@ -56,7 +56,7 @@ "SuccessfullyActicated": "You have successfully activated <strong>%s<\/strong>.", "TeaserExtendPiwik": "Extend Matomo with Plugins and Themes", "TeaserExtendPiwikByPlugin": "Extend Matomo by %1$sinstalling plugins from the Marketplace%2$s or %3$supload a plugin in .zip format%4$s.", - "TeaserExtendPiwikByTheme": "Enjoy another look & feel by %1$sinstalling a new theme%2$s.", + "TeaserExtendPiwikByTheme": "Enjoy another look and feel by %1$sinstalling a new theme%2$s.", "InstallingNewPluginViaMarketplaceOrUpload": "You may automatically install plugins from the Marketplace or %1$supload a plugin%2$s in .zip format.", "TagManagerNowAvailableTitle": "Matomo Tag Manager is now available", "TagManagerNowAvailableSubtitle": "Manage all your tags easily through one platform to get the insights you want, the opportunities are endless!", diff --git a/plugins/CoreUpdater/lang/en.json b/plugins/CoreUpdater/lang/en.json index b831ea4a33..2adc17408b 100644 --- a/plugins/CoreUpdater/lang/en.json +++ b/plugins/CoreUpdater/lang/en.json @@ -65,7 +65,7 @@ "ThankYouUpdatePiwik": "Thank you for using Matomo and keeping it up to date!", "PostUpdateMessage": "Matomo will always be free to download and use, but it needs your continued support to grow and improve.", "PostUpdateSupport": "If you need help using Matomo, you can get support from its creators:", - "ServicesSupport": "Services & Support", + "ServicesSupport": "Services and support", "CloudHosting": "Cloud hosting", "Updating": "Updating", "UpdateUsingHttpsFailed": "Downloading the latest Matomo version over secure HTTPS connection did not succeed, because of the following error:", diff --git a/plugins/Diagnostics/templates/configfile.twig b/plugins/Diagnostics/templates/configfile.twig index f2e9adba9b..583fc1949a 100644 --- a/plugins/Diagnostics/templates/configfile.twig +++ b/plugins/Diagnostics/templates/configfile.twig @@ -42,7 +42,7 @@ {{ _self.humanReadableValue(configEntry.value) }} </td> <td class="description"> - {{ configEntry.description }} + {{ configEntry.description|raw }} {% if (configEntry.isCustomValue or configEntry.value is null) and configEntry.defaultValue is not null %} {% if configEntry.description %}<br />{% endif %} diff --git a/plugins/Feedback/tests/UI/FeedbackForm_spec.js b/plugins/Feedback/tests/UI/FeedbackForm_spec.js index 1b727bb0c7..a715e01f63 100644 --- a/plugins/Feedback/tests/UI/FeedbackForm_spec.js +++ b/plugins/Feedback/tests/UI/FeedbackForm_spec.js @@ -12,10 +12,10 @@ describe("FeedbackForm", function () { await page.goto("?idSite=1&period=year&date=2012-08-09&module=Feedback&action=index"); await page.evaluate(function () { - $('.enrichedHeadline .title').each(function () { - if ($(this).text().indexOf("Matomo") !== -1) { - var replace = $(this).text().replace(/Matomo\s*\d+\.\d+(\.\d+)?([\-a-z]*\d+)?/g, 'Matomo'); - $(this).text(replace); + $('.enrichedHeadline').each(function () { + if ($(this).html().indexOf("Matomo") !== -1) { + var replace = $(this).html().replace(/Matomo\s*\d+\.\d+(\.\d+)?([\-a-z]*\d+)?/g, 'Matomo'); + $(this).html(replace); } }); }); @@ -23,4 +23,4 @@ describe("FeedbackForm", function () { var pageWrap = await page.$('.pageWrap'); expect(await pageWrap.screenshot()).to.matchImage('show'); }); -});
\ No newline at end of file +}); diff --git a/plugins/Goals/lang/en.json b/plugins/Goals/lang/en.json index c888438a02..f182d6bd3b 100644 --- a/plugins/Goals/lang/en.json +++ b/plugins/Goals/lang/en.json @@ -55,7 +55,7 @@ "DocumentationRevenueGeneratedByProductSales": "Product sales. Excludes tax, shipping and discount", "Download": "Download a file", "Ecommerce": "Ecommerce", - "EcommerceAndGoalsMenu": "Ecommerce & Goals", + "EcommerceAndGoalsMenu": "Ecommerce & Goals", "EcommerceLog": "Ecommerce Log", "EcommerceOrder": "Ecommerce order", "EcommerceOverview": "Ecommerce Overview", diff --git a/plugins/Insights/lang/en.json b/plugins/Insights/lang/en.json index edab7e7fdc..326245112b 100644 --- a/plugins/Insights/lang/en.json +++ b/plugins/Insights/lang/en.json @@ -8,7 +8,7 @@ "DayComparedToPreviousWeek": "same day in the previous week", "DayComparedToPreviousYear": "same day in the previous year", "Filter": "Filter", - "FilterIncreaserAndDecreaser": "Increaser & decreaser", + "FilterIncreaserAndDecreaser": "Increaser & decreaser", "FilterOnlyDecreaser": "Only decreaser", "FilterOnlyDisappeared": "Only disappeared", "FilterOnlyIncreaser": "Only increaser", diff --git a/plugins/Insights/templates/insightControls.twig b/plugins/Insights/templates/insightControls.twig index 6c73c6fea8..47ab665dc7 100644 --- a/plugins/Insights/templates/insightControls.twig +++ b/plugins/Insights/templates/insightControls.twig @@ -46,7 +46,7 @@ <div class="col s12 m6 l4 input-field"> <select size="1" name="showIncreaseOrDecrease" title="Show increaser and/or decreaser"> - <option value="both" {% if properties.limit_increaser and properties.limit_decreaser %}selected{%endif%}>{{ 'Insights_FilterIncreaserAndDecreaser'|translate }}</option> + <option value="both" {% if properties.limit_increaser and properties.limit_decreaser %}selected{%endif%}>{{ 'Insights_FilterIncreaserAndDecreaser'|translate|raw }}</option> <option value="increase" {% if properties.limit_increaser and not properties.limit_decreaser %}selected{%endif%}>{{ 'Insights_FilterOnlyIncreaser'|translate }}</option> <option value="decrease" {% if not properties.limit_increaser and properties.limit_decreaser %}selected{%endif%}>{{ 'Insights_FilterOnlyDecreaser'|translate }}</option> </select> diff --git a/plugins/Installation/lang/en.json b/plugins/Installation/lang/en.json index 353745e027..7514f121f5 100644 --- a/plugins/Installation/lang/en.json +++ b/plugins/Installation/lang/en.json @@ -35,7 +35,7 @@ "JSTracking_Intro": "To track your web traffic with Matomo you need to make sure some extra code is added to each of your webpages.", "LargePiwikInstances": "Help for users with high-traffic websites", "Legend": "Legend", - "LoadDataInfileRecommended": "You should fix this problem if your Matomo server tracks high-traffic websites (e.g. > 100,000 pages per month).", + "LoadDataInfileRecommended": "You should fix this problem if your Matomo server tracks high-traffic websites (e.g. over 100,000 pages per month).", "LoadDataInfileUnavailableHelp": "Hint: Using %1$s by updating your PHP and MySQL software and ensuring your database user has the %2$s privilege speeds up Matomo's archiving process a lot.", "NfsFilesystemWarning": "Your server is using an NFS filesystem.", "NfsFilesystemWarningSuffixAdmin": "This means Matomo will be extremely slow when using file-based sessions.", @@ -89,7 +89,7 @@ "SystemCheckFilterHelp": "You need to configure and rebuild PHP with \"filter\" support (don't use --disable-filter).", "SystemCheckFunctions": "Required functions", "SystemCheckShellExecHelp": "It is recommended to turn on this PHP built-in function. %1$sRead this to learn more.%2$s", - "SystemCheckGDFreeType": "GD > 2.x + FreeType (graphics)", + "SystemCheckGDFreeType": "GD > 2.x + FreeType (graphics)", "SystemCheckGDHelp": "The sparklines (small graphs) and image graphs (in the Matomo mobile app and email reports) will not work.", "SystemCheckGlobHelp": "This built-in function has been turned off on your host. Matomo will attempt to emulate the function, but may encounter further security restrictions. Functionality may be impacted.", "SystemCheckGzcompressHelp": "You need to turn on the zlib extension and gzcompress function.", diff --git a/plugins/Installation/templates/_systemCheckSection.twig b/plugins/Installation/templates/_systemCheckSection.twig index 1fe5d0b3e5..4fc564bf50 100644 --- a/plugins/Installation/templates/_systemCheckSection.twig +++ b/plugins/Installation/templates/_systemCheckSection.twig @@ -15,7 +15,7 @@ {% set informational = constant('Piwik\\Plugins\\Diagnostics\\Diagnostic\\DiagnosticResult::STATUS_INFORMATIONAL') %} {%- for result in results %} -#### {{ result.label }}: +#### {{ result.label|rawSafeDecoded }}: {% for item in result.items -%} {%- if item.status == error -%} ⚠ Error: {{ item.comment|anonymiseSystemInfo|striptags('<br><p><strong><code>') }}{% elseif item.status == warning %} ⚠ Warning: {{ item.comment|anonymiseSystemInfo|striptags('<br><p><strong><code>') }}{% elseif item.status == informational %} {{ item.comment|anonymiseSystemInfo|striptags('<br><p><strong><code>') }}{% else %} ✔ {{ item.comment|anonymiseSystemInfo|striptags('<br><p><strong><code>') }}{% endif -%} {%- endfor %} @@ -70,7 +70,7 @@ {% for result in results %} <tr> - <td>{{ result.label }}</td> + <td>{{ result.label|rawSafeDecoded }}</td> <td> {% for item in result.items %} diff --git a/plugins/IntranetMeasurable/tests/UI/expected-screenshots/IntranetMeasurable_intranet_create.png b/plugins/IntranetMeasurable/tests/UI/expected-screenshots/IntranetMeasurable_intranet_create.png index 4971fe5e84..4adbc5a1dd 100644 --- a/plugins/IntranetMeasurable/tests/UI/expected-screenshots/IntranetMeasurable_intranet_create.png +++ b/plugins/IntranetMeasurable/tests/UI/expected-screenshots/IntranetMeasurable_intranet_create.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d1a6974d8cae7d5cb793967740aa2631941febb01142050bf611ac2d1aebe6de -size 352084 +oid sha256:ee58986df1afbbfbd4ddc52394b78765c3368d30b7d81e84ff62c4283e53d17b +size 351698 diff --git a/plugins/LoginLdap b/plugins/LoginLdap -Subproject d55286bf582435c823171c3107252e9ac2857ca +Subproject bd9750d4d385d07ba9bd4ecd5d313fddd773369 diff --git a/plugins/MobileMessaging/lang/en.json b/plugins/MobileMessaging/lang/en.json index b5a2a4f13d..0a2ba8e627 100644 --- a/plugins/MobileMessaging/lang/en.json +++ b/plugins/MobileMessaging/lang/en.json @@ -41,8 +41,8 @@ "SMS_Content_Too_Long": "[too long]", "Available_Credits": "Available credits: %1$s", "TopLinkTooltip": "Get Web Analytics Reports delivered to your email inbox or your mobile phone.", - "TopMenu": "Email & SMS Reports", + "TopMenu": "Email & SMS Reports", "UserKey": "Userkey", - "VerificationText": "Code is %1$s. To validate your phone number and receive Matomo SMS reports please copy this code in the form accessible via Matomo > %2$s > %3$s." + "VerificationText": "Code is %1$s. To validate your phone number and receive Matomo SMS reports please copy this code in the form accessible via Matomo → %2$s → %3$s." } }
\ No newline at end of file diff --git a/plugins/MultiSites/lang/en.json b/plugins/MultiSites/lang/en.json index dd2973a766..770ef0b81c 100644 --- a/plugins/MultiSites/lang/en.json +++ b/plugins/MultiSites/lang/en.json @@ -7,7 +7,7 @@ "SingleWebsitesDashboardDocumentation": "This report gives you an informational overview for a specific website, containing the most general metrics about your visitors.", "AllWebsitesDashboardDocumentation": "This report gives you an informational overview for each of your websites, containing the most general metrics about your visitors.", "EvolutionComparisonIncomplete": "The currently selected time period is %1$s complete.", - "EvolutionComparisonProportional": "When the previous period was also %1$s complete, there would have been an estimated %2$s %3$s\n (out of a total of %4$s %3$s in the previous period).", + "EvolutionComparisonProportional": "When the previous period was also %1$s complete, there would have been an estimated %2$s %3$s\n(out of a total of %4$s %3$s in the previous period).", "EvolutionComparisonDay": "%1$s %2$s this day compared to %3$s %2$s in the previous partial period (%4$s) Evolution: %5$s", "EvolutionComparisonWeek": "%1$s %2$s this week compared to %3$s %2$s in the previous partial period (%4$s) Evolution: %5$s", "EvolutionComparisonMonth": "%1$s %2$s this month compared to %3$s %2$s in the previous partial period (%4$s) Evolution: %5$s", diff --git a/plugins/PrivacyManager/lang/en.json b/plugins/PrivacyManager/lang/en.json index 067bda31bf..daf4542b99 100644 --- a/plugins/PrivacyManager/lang/en.json +++ b/plugins/PrivacyManager/lang/en.json @@ -37,7 +37,7 @@ "UnsetVisitColumnsHelp": "This action cannot be undone. A list of database columns in scope visit that you want to unset. Each value for that column will be set to its default value. Please note that if the same column exists in scope 'conversion', then this column will be deleted as well", "UnsetActionColumns": "Unset action columns", "UnsetActionColumnsHelp": "This action cannot be undone. A list of database columns in scope action that you want to unset. Each value for that column will be set to its default value.", - "AwarenessDocumentation": "Awareness & documentation", + "AwarenessDocumentation": "Awareness & documentation", "AwarenessDocumentationIntro": "Inform your users clearly and transparently, and make your colleagues aware of the data being collected and how it is used:", "AwarenessDocumentationDesc1": "Inform your visitors through a clear privacy notice whenever you’re collecting personal data.", "AwarenessDocumentationDesc2": "Inform your users in your privacy policy about what data you collect and how the data is used.", @@ -52,7 +52,7 @@ "ReportsRemovedAfter": "all aggregated reports are deleted after %1$s.", "ReportsNeverRemoved": "aggregated reports are <strong>never<\/strong> deleted.", "DBPurged": "DB purged.", - "DeleteBothConfirm": "You are about to enable both raw data deletion & report data deletion. This will permanently remove your ability to view old analytics data. Are you sure you want to do this?", + "DeleteBothConfirm": "You are about to enable both raw data deletion and report data deletion. This will permanently remove your ability to view old analytics data. Are you sure you want to do this?", "DeleteDataDescription": "You can configure Matomo to regularly delete old raw data and\/or aggregated reports to keep your database small or to meet privacy regulations such as GDPR.", "DeleteDataInterval": "Delete old data every", "DeleteOldVisitorLogs": "Delete old visitor logs", @@ -190,14 +190,14 @@ "ImprintUrlDescription": "A link to your Imprint page.", "PrivacyPolicyUrl": "Privacy Policy URL", "PrivacyPolicyUrlDescription": "A link to your Privacy Policy page.", - "TermsAndConditionUrl": "Terms & Conditions URL", - "TermsAndConditionUrlDescription": "A link to your Terms & Conditions page.", + "TermsAndConditionUrl": "Terms & Conditions URL", + "TermsAndConditionUrlDescription": "A link to your Terms & Conditions page.", "PrivacyPolicyUrlDescriptionSuffix": "If you set this, it will be displayed at the bottom of the login page and on pages that the '%1$s' user can access.", "ShowInEmbeddedWidgets": "Show in embedded widgets", - "ShowInEmbeddedWidgetsDescription": "If checked, a link to your Privacy Policy and your Terms & Conditions will be displayed at the bottom of embedded widgets.", + "ShowInEmbeddedWidgetsDescription": "If checked, a link to your Privacy Policy and your Terms & Conditions will be displayed at the bottom of embedded widgets.", "Imprint": "Imprint", "PrivacyPolicy": "Privacy Policy", - "TermsAndConditions": "Terms & Conditions", + "TermsAndConditions": "Terms & Conditions", "VisitsSuccessfullyExported": "Visits were successfully exported", "VisitsSuccessfullyDeleted": "Visits were successfully deleted", "LastAction": "Last action", diff --git a/plugins/PrivacyManager/templates/footerLinks.twig b/plugins/PrivacyManager/templates/footerLinks.twig index 5754e4f97f..41a17328b7 100644 --- a/plugins/PrivacyManager/templates/footerLinks.twig +++ b/plugins/PrivacyManager/templates/footerLinks.twig @@ -3,5 +3,5 @@ {% if imprintUrl|default('') is not empty and (privacyPolicyUrl|default('') is not empty or termsAndCondition|default('') is not empty) %}|{% endif %} {% if privacyPolicyUrl|default('') is not empty %}<a target="_blank" rel="noreferrer noopener" href="{{ privacyPolicyUrl|safelink|e('html_attr') }}">{{ 'PrivacyManager_PrivacyPolicy'|translate }}</a>{% endif %} {% if privacyPolicyUrl|default('') is not empty and termsAndCondition|default('') is not empty %}|{% endif %} - {% if termsAndCondition|default('') is not empty %}<a target="_blank" rel="noreferrer noopener" href="{{ termsAndCondition|safelink|e('html_attr') }}">{{ 'PrivacyManager_TermsAndConditions'|translate }}</a>{% endif %} + {% if termsAndCondition|default('') is not empty %}<a target="_blank" rel="noreferrer noopener" href="{{ termsAndCondition|safelink|e('html_attr') }}">{{ 'PrivacyManager_TermsAndConditions'|translate|rawSafeDecoded }}</a>{% endif %} </div> diff --git a/plugins/ProfessionalServices/lang/en.json b/plugins/ProfessionalServices/lang/en.json index 5b56bbfe0f..b13c41a54e 100644 --- a/plugins/ProfessionalServices/lang/en.json +++ b/plugins/ProfessionalServices/lang/en.json @@ -1,5 +1,5 @@ { "ProfessionalServices": { - "WidgetPremiumServicesForPiwik": "Premium Features & Services for Matomo" + "WidgetPremiumServicesForPiwik": "Premium Features & Services for Matomo" } }
\ No newline at end of file diff --git a/plugins/Referrers/lang/en.json b/plugins/Referrers/lang/en.json index b2ff338534..e1589bc286 100644 --- a/plugins/Referrers/lang/en.json +++ b/plugins/Referrers/lang/en.json @@ -66,7 +66,7 @@ "Socials": "Social Networks", "SocialsReportDocumentation": "This report shows which social networks led visitors to your website.<br />By clicking on a row in the table, you can see from which social network pages visitors came to your website.", "SocialsSubcategoryHelp": "In this table, you can see which websites referred visitors to your site.", - "SubmenuSearchEngines": "Search Engines & Keywords", + "SubmenuSearchEngines": "Search Engines & Keywords", "SubmenuWebsitesOnly": "Websites", "Type": "Channel Type", "TypeCampaigns": "%s from campaigns", diff --git a/plugins/SegmentEditor/lang/en.json b/plugins/SegmentEditor/lang/en.json index 363e128ec8..32fdd0783a 100644 --- a/plugins/SegmentEditor/lang/en.json +++ b/plugins/SegmentEditor/lang/en.json @@ -12,12 +12,12 @@ "CurrentlySelectedSegment": "Currently selected segment: %s", "DataAvailableAtLaterDate": "Your segmented analytics reports will be available later. We apologize for the inconvenience.", "DefaultAllVisits": "All visits", - "DragDropCondition": "Drag & Drop condition", + "DragDropCondition": "Drag & Drop condition", "HideMessageInFuture": "Hide this message in the future", "LoadingSegmentedDataMayTakeSomeTime": "Processing segmented visitor data may take a few minutes...", "OperatorAND": "AND", "OperatorOR": "OR", - "SaveAndApply": "Save & Apply", + "SaveAndApply": "Save & Apply", "SegmentDisplayedAllWebsites": "all websites", "SegmentDisplayedThisWebsiteOnly": "this website only", "SegmentIsDisplayedForWebsite": "and processed for", @@ -51,7 +51,7 @@ "CustomUnprocessedSegmentApiError3": "(Alternatively, you can create a new segment programmatically using the SegmentEditor.add API method).", "CustomUnprocessedSegmentApiError4": "Once created the segment in the editor (or via API), this error message will disappear and within a few hours you will see your segmented report data, after the segment data has been pre-processed. (If it does not, there may be a problem.)", "CustomUnprocessedSegmentApiError5": "Please note that you can test whether your segment will work without having to wait for it to be processed by using the Live.getLastVisitsDetails API.", - "CustomUnprocessedSegmentApiError6": "When using this API method, you will see which users and actions were matched by your &segment= parameter.", + "CustomUnprocessedSegmentApiError6": "When using this API method, you will see which users and actions were matched by your &segment= parameter.", "CustomUnprocessedSegmentNoData": "To see data for this segment, you must create this segment manually in the Segment Editor, then wait a couple hours for preprocessing to complete.", "AddThisToMatomo": "Add this segment to Matomo", "ThisSegmentIsCompared": "This segment is currently compared.", diff --git a/plugins/SegmentEditor/templates/_segmentSelector.twig b/plugins/SegmentEditor/templates/_segmentSelector.twig index 11e7ce8e04..93b6e2af38 100644 --- a/plugins/SegmentEditor/templates/_segmentSelector.twig +++ b/plugins/SegmentEditor/templates/_segmentSelector.twig @@ -78,7 +78,7 @@ {% if isVisitorLogEnabled %} <a class="btn-flat testSegment">{{ 'SegmentEditor_Test'|translate }}</a> {% endif %} - <button class="btn saveAndApply">{{ 'SegmentEditor_SaveAndApply'|translate }}</button> + <button class="btn saveAndApply">{{ 'SegmentEditor_SaveAndApply'|translate|raw }}</button> </div> </div> </div> diff --git a/plugins/SitesManager/lang/en.json b/plugins/SitesManager/lang/en.json index 5f41ac8a58..05528567ac 100644 --- a/plugins/SitesManager/lang/en.json +++ b/plugins/SitesManager/lang/en.json @@ -2,8 +2,8 @@ "SitesManager": { "AddSite": "Add a new website", "AddMeasurable": "Add a new measurable", - "AdvancedTimezoneSupportNotFound": "Advanced timezones support was not found in your PHP (supported in PHP>=5.2). You can still choose a manual UTC offset.", - "AliasUrlHelp": "It is recommended, but not required, to specify the various URLs, one per line, that your visitors use to access this website. Alias URLs for a website will not appear in the Referrers > Websites report. Note that it is not necessary to specify the URLs with and without 'www' as Matomo automatically considers both.", + "AdvancedTimezoneSupportNotFound": "Advanced timezones support was not found in your PHP (supported in PHP>=5.2). You can still choose a manual UTC offset.", + "AliasUrlHelp": "It is recommended, but not required, to specify the various URLs, one per line, that your visitors use to access this website. Alias URLs for a website will not appear in the Referrers → Websites report. Note that it is not necessary to specify the URLs with and without 'www' as Matomo automatically considers both.", "ChangingYourTimezoneWillOnlyAffectDataForward": "Changing your time zone will only affect data going forward, and will not be applied retroactively.", "Currency": "Currency", "CurrencySymbolWillBeUsedForGoals": "The Currency symbol will be displayed next to Goals revenues.", @@ -65,7 +65,7 @@ "NotFound": "No websites found for", "NoWebsites": "You don't have any website to administrate.", "OnlyOneSiteAtTime": "You can only edit one website at a time. Please Save or Cancel your current modifications to the website %s.", - "PiwikOffersEcommerceAnalytics": "Matomo allows for advanced Ecommerce Analytics tracking & reporting. Learn more about %1$s Ecommerce Analytics%2$s.", + "PiwikOffersEcommerceAnalytics": "Matomo allows for advanced Ecommerce Analytics tracking and reporting. Learn more about %1$s Ecommerce Analytics%2$s.", "PiwikWillAutomaticallyExcludeCommonSessionParameters": "Matomo will automatically exclude the common session parameters (%s).", "PluginDescription": "Websites management lets you add a new website and edit existing websites.", "SearchCategoryDesc": "Matomo can also track the Search category for each internal site search keyword.", diff --git a/plugins/SitesManager/tests/System/expected/test_SitesManager__SitesManager.getSiteSettings.xml b/plugins/SitesManager/tests/System/expected/test_SitesManager__SitesManager.getSiteSettings.xml index ec126b4734..3a5ed76ddc 100644 --- a/plugins/SitesManager/tests/System/expected/test_SitesManager__SitesManager.getSiteSettings.xml +++ b/plugins/SitesManager/tests/System/expected/test_SitesManager__SitesManager.getSiteSettings.xml @@ -22,7 +22,7 @@ https://www.example.org/</placeholder> </uiControlAttributes> <availableValues /> <description /> - <inlineHelp>It is recommended, but not required, to specify the various URLs, one per line, that your visitors use to access this website. Alias URLs for a website will not appear in the Referrers > Websites report. Note that it is not necessary to specify the URLs with and without 'www' as Matomo automatically considers both.</inlineHelp> + <inlineHelp>It is recommended, but not required, to specify the various URLs, one per line, that your visitors use to access this website. Alias URLs for a website will not appear in the Referrers → Websites report. Note that it is not necessary to specify the URLs with and without 'www' as Matomo automatically considers both.</inlineHelp> <templateFile /> <introduction /> <condition /> @@ -242,7 +242,7 @@ https://www.example.org/</placeholder> <row>Ecommerce enabled</row> </availableValues> <description /> - <inlineHelp>When enabled, the "Goals" report will have a new "Ecommerce" section.<br />Matomo allows for advanced Ecommerce Analytics tracking & reporting. Learn more about <a href='https://matomo.org/docs/ecommerce-analytics/' target='_blank'> Ecommerce Analytics</a>.</inlineHelp> + <inlineHelp>When enabled, the "Goals" report will have a new "Ecommerce" section.<br />Matomo allows for advanced Ecommerce Analytics tracking and reporting. Learn more about <a href='https://matomo.org/docs/ecommerce-analytics/' target='_blank'> Ecommerce Analytics</a>.</inlineHelp> <templateFile /> <introduction /> <condition /> diff --git a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_site_edit_url.png b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_site_edit_url.png index 411f71682c..a7cd08cb50 100644 --- a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_site_edit_url.png +++ b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_site_edit_url.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:842fa540739ba6eb056bb155455eb1735ef3554f05d4300fcdcb30944d755fdf -size 380304 +oid sha256:7374c11a6513c3b934932ad4468f0aabaeda7735b617ea5c0d4c6133342d7277 +size 380007 diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml index bdd0dd09db..8c2d7ce7cb 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml @@ -27,7 +27,7 @@ https://www.example.org/</placeholder> </uiControlAttributes> <availableValues /> <description /> - <inlineHelp>It is recommended, but not required, to specify the various URLs, one per line, that your visitors use to access this website. Alias URLs for a website will not appear in the Referrers > Websites report. Note that it is not necessary to specify the URLs with and without 'www' as Matomo automatically considers both.</inlineHelp> + <inlineHelp>It is recommended, but not required, to specify the various URLs, one per line, that your visitors use to access this website. Alias URLs for a website will not appear in the Referrers → Websites report. Note that it is not necessary to specify the URLs with and without 'www' as Matomo automatically considers both.</inlineHelp> <templateFile /> <introduction /> <condition /> @@ -245,7 +245,7 @@ https://www.example.org/</placeholder> <row>Ecommerce enabled</row> </availableValues> <description /> - <inlineHelp>When enabled, the "Goals" report will have a new "Ecommerce" section.<br />Matomo allows for advanced Ecommerce Analytics tracking & reporting. Learn more about <a href='https://matomo.org/docs/ecommerce-analytics/' target='_blank'> Ecommerce Analytics</a>.</inlineHelp> + <inlineHelp>When enabled, the "Goals" report will have a new "Ecommerce" section.<br />Matomo allows for advanced Ecommerce Analytics tracking and reporting. Learn more about <a href='https://matomo.org/docs/ecommerce-analytics/' target='_blank'> Ecommerce Analytics</a>.</inlineHelp> <templateFile /> <introduction /> <condition /> @@ -347,7 +347,7 @@ https://www.example.org/</placeholder> </uiControlAttributes> <availableValues /> <description /> - <inlineHelp>It is recommended, but not required, to specify the various URLs, one per line, that your visitors use to access this website. Alias URLs for a website will not appear in the Referrers > Websites report. Note that it is not necessary to specify the URLs with and without 'www' as Matomo automatically considers both.</inlineHelp> + <inlineHelp>It is recommended, but not required, to specify the various URLs, one per line, that your visitors use to access this website. Alias URLs for a website will not appear in the Referrers → Websites report. Note that it is not necessary to specify the URLs with and without 'www' as Matomo automatically considers both.</inlineHelp> <templateFile /> <introduction /> <condition /> @@ -565,7 +565,7 @@ https://www.example.org/</placeholder> <row>Ecommerce enabled</row> </availableValues> <description /> - <inlineHelp>When enabled, the "Goals" report will have a new "Ecommerce" section.<br />Matomo allows for advanced Ecommerce Analytics tracking & reporting. Learn more about <a href='https://matomo.org/docs/ecommerce-analytics/' target='_blank'> Ecommerce Analytics</a>.</inlineHelp> + <inlineHelp>When enabled, the "Goals" report will have a new "Ecommerce" section.<br />Matomo allows for advanced Ecommerce Analytics tracking and reporting. Learn more about <a href='https://matomo.org/docs/ecommerce-analytics/' target='_blank'> Ecommerce Analytics</a>.</inlineHelp> <templateFile /> <introduction /> <condition /> diff --git a/tests/UI/expected-screenshots/MeasurableManager_add_measurable_view.png b/tests/UI/expected-screenshots/MeasurableManager_add_measurable_view.png index 7900ac673d..5e8d43eccd 100644 --- a/tests/UI/expected-screenshots/MeasurableManager_add_measurable_view.png +++ b/tests/UI/expected-screenshots/MeasurableManager_add_measurable_view.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f410432470a8cacf09dcf3b1ecdbd6e95dc4a6d5d5b46ec6175107613d333d9f -size 536031 +oid sha256:1a20318980da9d6c9f7e56353b9e73328d6d62f86261e9638be0e3f064a18186 +size 535762 diff --git a/tests/UI/expected-screenshots/OneClickUpdate_update_success.png b/tests/UI/expected-screenshots/OneClickUpdate_update_success.png index 6c5607f5af..bad7670d9b 100644 --- a/tests/UI/expected-screenshots/OneClickUpdate_update_success.png +++ b/tests/UI/expected-screenshots/OneClickUpdate_update_success.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5de9ddc99af708b5314651e54fcae22f9222f939577ae7f4148d50b8f48c6087 -size 73714 +oid sha256:d12443ea4ac5a07bc26d9c928a2955bde3aeebcc0a3b703150065105923071ea +size 73818 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png index a7fe494209..77ed610ea2 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c21000b35f17b1990557090297b7817cc13f0b29e8e2dcbd1e0b966bdede9337 -size 5236295 +oid sha256:401f41770fa2444a1860498e6796e59a05712f466e234bdac194ea150332f650 +size 5220373 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_themes.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_themes.png index 5d3c794ecf..19b9f9db80 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_themes.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_themes.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cac88819a84a83aff3f3a0f440ca5a3e4a267dacdd4d57f917dc6844bf2fab77 -size 79035 +oid sha256:972e8994cb5c2e251dd3654caf7acccb972ef5c1ab28093c96157845bb3fdad7 +size 78617 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_category_help.png b/tests/UI/expected-screenshots/UIIntegrationTest_category_help.png index c14b7687c3..d592e5d40f 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_category_help.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_category_help.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:94f990c894251eca9bcba9ae84f23d1a06120305730a69daea3ff7465f4d9970 -size 131900 +oid sha256:36771298b82dba4ded35ae4451deeed41a7fb6557512367e4037aa90e322d909 +size 131621 diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_export_options_2.png b/tests/UI/expected-screenshots/ViewDataTableTest_export_options_2.png index 34c18e8e0c..b60d3efac0 100644 --- a/tests/UI/expected-screenshots/ViewDataTableTest_export_options_2.png +++ b/tests/UI/expected-screenshots/ViewDataTableTest_export_options_2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:55ee36f394e4b137c7357c77fe405aa9f524f6491a9bd5082cab2ca70269c3f6 -size 76536 +oid sha256:09c7bad0199703a3f5a9fa2a8e83f5aebd489aafaed70812613faf31bf8d0562 +size 76516 |
