diff options
author | Stefan Giehl <stefan@matomo.org> | 2022-07-08 10:32:25 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-07-08 10:32:25 +0300 |
commit | 7c4f4ae4d7ce652d2f63e4ac2d877bb9c14ec700 (patch) | |
tree | be542d3b41a47b0200132266dafb5910416628e5 /tests/PHPUnit/System | |
parent | a0ec25efb4943d78e525b2183948c6f8fb526a71 (diff) |
Translation source string improvements (#19472)
* UserLanguage plugin language reworked (#19470)
* UserCountryMap plugin language reworked (#19477)
* UserId plugin language reworked (#19475)
* fix
* update tests
Co-authored-by: Allan Nordhøy <epost@anotheragency.no>
Diffstat (limited to 'tests/PHPUnit/System')
10 files changed, 27 insertions, 23 deletions
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 588e8fd63d..cc80c644ef 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 @@ -70,7 +70,7 @@ </li> <li style="font-size:15px;line-height:24px;"> <a href="#UserLanguage_getLanguage" style="text-decoration:none; color: #0d0d0d;"> - Browser language + Web-browser language </a> </li> <li style="font-size:15px;line-height:24px;"> @@ -828,7 +828,7 @@ </a></p> <h2 id="UserLanguage_getLanguage" 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;"> - Browser language + Web-browser language </h2> <img alt="" 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 e671fd13e4..ea4440f084 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 @@ -70,7 +70,7 @@ </li> <li style="font-size:15px;line-height:24px;"> <a href="#UserLanguage_getLanguage" style="text-decoration:none; color: #0d0d0d;"> - Browser language + Web-browser language </a> </li> <li style="font-size:15px;line-height:24px;"> @@ -793,7 +793,7 @@ </a></p> <h2 id="UserLanguage_getLanguage" 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;"> - Browser language + Web-browser language </h2> 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 d59a128e94..3ec1f6e27c 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 @@ -21,7 +21,7 @@ Region label,nb_visits,nb_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate,revenue Unknown,11,43,3.9,00:10:55,27%,$0 -Browser language +Web-browser language label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate Unknown,8,40,0%,5,00:15:01,0% French,3,3,0%,1,00:00:00,100% 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 7c7cd19317..950130a644 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 731a0b5c7e..ad0149296c 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 @@ -21,7 +21,7 @@ Region label nb_visits nb_actions nb_actions_per_visit avg_time_on_site bounce_rate revenue Unknown 11 43 3.9 00:10:55 27% $0 -Browser language +Web-browser language label nb_visits nb_actions conversion_rate nb_actions_per_visit avg_time_on_site bounce_rate Unknown 8 40 0% 5 00:15:01 0% French 3 3 0% 1 00:00:00 100% diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryReports.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryReports.xml index da1e4a2b27..4d2d8f54fe 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryReports.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryReports.xml @@ -25,10 +25,6 @@ <documentation>This report shows your visitors' browsers broken down into browser engines. <br /> The most important information for web developers is what kind of rendering engine their visitors are using. The labels contain the names of the engines followed by the most common browser using that engine in brackets.</documentation> </row> <row> - <name>Browser language (Visitors)</name> - <documentation>This report shows which language the visitor's browsers are using. (e.g. "English")</documentation> - </row> - <row> <name>Browser version (Visitors)</name> <documentation>This report contains information about what kind of browser your visitors were using. Each browser version is listed separately.</documentation> </row> @@ -193,7 +189,7 @@ </row> <row> <name>Language code (Visitors)</name> - <documentation>This report shows which exact language code the visitor's browsers is set to. (e.g. "German - Austria (de-at)")</documentation> + <documentation>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> @@ -295,7 +291,7 @@ </row> <row> <name>User IDs (Visitors)</name> - <documentation>This report shows visits and other general metrics for every individual User ID.</documentation> + <documentation>Shows visits and other general metrics for every individual User ID.</documentation> <onlineGuideUrl>https://matomo.org/docs/user-id/</onlineGuideUrl> </row> <row> @@ -328,6 +324,10 @@ <onlineGuideUrl>https://matomo.org/docs/tracking-goals-web-analytics/</onlineGuideUrl> </row> <row> + <name>Web-browser language (Visitors)</name> + <documentation>Shows which language the visitor's browsers are using. (e.g. "French")</documentation> + </row> + <row> <name>Websites (Referrers)</name> <documentation>In this table, you can see which websites referred visitors to your site. <br /> By clicking on a row in the table, you can see which URLs the links to your website were on.</documentation> </row> 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 3b3eaaa715..95e95937da 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml @@ -217,11 +217,11 @@ <row> <category>Visitors</category> <subcategory>Locations</subcategory> - <name>Browser language</name> + <name>Web-browser language</name> <module>UserLanguage</module> <action>getLanguage</action> <dimension>Language</dimension> - <documentation>This report shows which language the visitor's browsers are using. (e.g. "English")</documentation> + <documentation>Shows which language the visitor's browsers are using. (e.g. "French")</documentation> <metrics> <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> @@ -300,7 +300,7 @@ <module>UserLanguage</module> <action>getLanguageCode</action> <dimension>Language</dimension> - <documentation>This report shows which exact language code the visitor's browsers is set to. (e.g. "German - Austria (de-at)")</documentation> + <documentation>Shows which exact language code the visitor's browsers is set to. (e.g. "German — Austria (de-at)")</documentation> <metrics> <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> @@ -325,7 +325,7 @@ </processedMetrics> <relatedReports> <row> - <name>Browser language</name> + <name>Web-browser language</name> <module>UserLanguage</module> <action>getLanguage</action> </row> @@ -890,7 +890,7 @@ <module>UserId</module> <action>getUsers</action> <dimension>UserId</dimension> - <documentation>This report shows visits and other general metrics for every individual User ID.</documentation> + <documentation>Shows visits and other general metrics for every individual User ID.</documentation> <onlineGuideUrl>https://matomo.org/docs/user-id/</onlineGuideUrl> <metrics> <label>Label</label> diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportPagesMetadata.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportPagesMetadata.xml index 1adc347ff9..7eb7fdf267 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportPagesMetadata.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportPagesMetadata.xml @@ -1104,7 +1104,7 @@ <isReport>1</isReport> </row> <row> - <name>Browser language</name> + <name>Web-browser language</name> <module>UserLanguage</module> <action>getLanguage</action> <order>108</order> @@ -1220,7 +1220,7 @@ <id>UserCountryMap_RealTimeMap</id> <name>Real-time Map</name> <order>9</order> - <help><p>The Real-time Map shows the location of visitors on your site within the last 30 minutes. Large orange bubbles represent more recent visits, while smaller grey bubbles represent older visits. This data refreshes every five seconds, and new visitors appear with a flashing effect.</p></help> + <help><p>Shows the location of website visitors the last 30 minutes, and flashes for new ones. Recent visits are shown as large orange bubbles, and older ones as smaller gray ones. It refreshes every five seconds.</p></help> </subcategory> <widgets> <row> @@ -1315,7 +1315,7 @@ <id>UserId_UserReportTitle</id> <name>User IDs</name> <order>40</order> - <help><p>The User IDs report shows visits associated with all of your registered and logged in users. You can use this section to understand website usage by specific users and identify who your most and least active users are.</p><p><a target="_blank" rel="noopener noreferrer" href="https://matomo.org/docs/user-id/?mtm_campaign=App_Help&mtm_source=Matomo_App&mtm_keyword=UserGuides"><span class="icon-info"></span> Learn more</a></p></help> + <help><p>The user ID report shows visits associated with all your registered and logged in users. Understand website usage by its specific users and find out who your most and least active users are.</p><p><a target="_blank" rel="noopener noreferrer" href="https://matomo.org/docs/user-id/?mtm_campaign=App_Help&mtm_source=Matomo_App&mtm_keyword=UserGuides"><span class="icon-info"></span> Learn more</a></p></help> </subcategory> <widgets> <row> diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml index ad14bbbc0c..3cae2121df 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml @@ -272,7 +272,7 @@ <id>UserCountryMap_RealTimeMap</id> <name>Real-time Map</name> <order>9</order> - <help><p>The Real-time Map shows the location of visitors on your site within the last 30 minutes. Large orange bubbles represent more recent visits, while smaller grey bubbles represent older visits. This data refreshes every five seconds, and new visitors appear with a flashing effect.</p></help> + <help><p>Shows the location of website visitors the last 30 minutes, and flashes for new ones. Recent visits are shown as large orange bubbles, and older ones as smaller gray ones. It refreshes every five seconds.</p></help> </subcategory> <module>UserCountryMap</module> <action>realtimeMap</action> @@ -418,7 +418,7 @@ <isReport>1</isReport> </row> <row> - <name>Browser language</name> + <name>Web-browser language</name> <category> <id>General_Visitors</id> <name>Visitors</name> @@ -862,7 +862,7 @@ <id>UserId_UserReportTitle</id> <name>User IDs</name> <order>40</order> - <help><p>The User IDs report shows visits associated with all of your registered and logged in users. You can use this section to understand website usage by specific users and identify who your most and least active users are.</p><p><a target="_blank" rel="noopener noreferrer" href="https://matomo.org/docs/user-id/?mtm_campaign=App_Help&mtm_source=Matomo_App&mtm_keyword=UserGuides"><span class="icon-info"></span> Learn more</a></p></help> + <help><p>The user ID report shows visits associated with all your registered and logged in users. Understand website usage by its specific users and find out who your most and least active users are.</p><p><a target="_blank" rel="noopener noreferrer" href="https://matomo.org/docs/user-id/?mtm_campaign=App_Help&mtm_source=Matomo_App&mtm_keyword=UserGuides"><span class="icon-info"></span> Learn more</a></p></help> </subcategory> <module>UserId</module> <action>getUsers</action> diff --git a/tests/PHPUnit/System/expected/test_reportLimitingdimension_2_rankingQuery__CustomDimensions.getCustomDimension_day.xml b/tests/PHPUnit/System/expected/test_reportLimitingdimension_2_rankingQuery__CustomDimensions.getCustomDimension_day.xml index 32ab8d4f1c..ecd14db85a 100644 --- a/tests/PHPUnit/System/expected/test_reportLimitingdimension_2_rankingQuery__CustomDimensions.getCustomDimension_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimitingdimension_2_rankingQuery__CustomDimensions.getCustomDimension_day.xml @@ -205,6 +205,8 @@ <avg_time_on_dimension>0</avg_time_on_dimension> + + </row> <row> @@ -245,6 +247,8 @@ <avg_time_on_dimension>0</avg_time_on_dimension> + + </row> </subtable> </row> |