diff options
| author | Altamash Shaikh <altu9594@gmail.com> | 2022-03-24 13:51:07 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-24 13:51:07 +0300 |
| commit | 738333d186a5587413a388ecca7d8aafff1d570f (patch) | |
| tree | e6ef2fb6cd091a9258f3aa736c9abbb91aff7165 /plugins | |
| parent | 1a3d0de2d7a7b287de0acc04df7c586fe9f6a53d (diff) | |
Started renaming dimensions and segments with Server time to Site Time/Time in UTC (#18956)
* Started renaming dimensions and segments with Server time to Site Time/Time in UTC
* Fixed test cases
* Fixed testcases
* Updated testcases
* fix test cases
* Updated test cases
* Reverted segment name update change
* Removed unwanted test case files created due to segment name change
* Updated test cases
* Revert adding unneeded test files
* Updated translation key name from Site to UTC
* update submodules
Co-authored-by: sgiehl <stefan@matomo.org>
Diffstat (limited to 'plugins')
31 files changed, 76 insertions, 59 deletions
diff --git a/plugins/CoreHome/Columns/ServerMinute.php b/plugins/CoreHome/Columns/ServerMinute.php index 8f2c761d3f..ec1128351f 100644 --- a/plugins/CoreHome/Columns/ServerMinute.php +++ b/plugins/CoreHome/Columns/ServerMinute.php @@ -16,7 +16,7 @@ class ServerMinute extends ActionDimension protected $columnName = 'server_time'; protected $segmentName = 'actionServerMinute'; protected $sqlSegment = 'MINUTE(log_link_visit_action.server_time)'; - protected $nameSingular = 'VisitTime_ColumnServerMinute'; + protected $nameSingular = 'VisitTime_ColumnUTCMinute'; protected $type = self::TYPE_DATETIME; protected $acceptValues = '0, 1, 2, 3, ..., 56, 57, 58, 59'; diff --git a/plugins/CoreHome/Columns/ServerTime.php b/plugins/CoreHome/Columns/ServerTime.php index d2005f11fa..9c41d89db5 100644 --- a/plugins/CoreHome/Columns/ServerTime.php +++ b/plugins/CoreHome/Columns/ServerTime.php @@ -23,7 +23,7 @@ class ServerTime extends ActionDimension protected $columnType = 'DATETIME NOT NULL'; protected $segmentName = 'actionServerHour'; protected $sqlSegment = 'HOUR(log_link_visit_action.server_time)'; - protected $nameSingular = 'VisitTime_ColumnServerHour'; + protected $nameSingular = 'VisitTime_ColumnSiteHour'; protected $type = self::TYPE_DATETIME; public function __construct() diff --git a/plugins/CoreHome/Columns/VisitFirstActionMinute.php b/plugins/CoreHome/Columns/VisitFirstActionMinute.php index 1db6e914f4..47e2d0ff66 100644 --- a/plugins/CoreHome/Columns/VisitFirstActionMinute.php +++ b/plugins/CoreHome/Columns/VisitFirstActionMinute.php @@ -23,7 +23,7 @@ class VisitFirstActionMinute extends VisitDimension protected $sqlSegment = 'MINUTE(log_visit.visit_first_action_time)'; protected $segmentName = 'visitStartServerMinute'; protected $acceptValues = '0, 1, 2, 3, ..., 56, 57, 58, 59'; - protected $nameSingular = 'VisitTime_ColumnVisitStartServerMinute'; + protected $nameSingular = 'VisitTime_ColumnVisitStartUTCMinute'; public function __construct() { diff --git a/plugins/CoreHome/Columns/VisitFirstActionTime.php b/plugins/CoreHome/Columns/VisitFirstActionTime.php index 5f76c50763..56ee0231ed 100644 --- a/plugins/CoreHome/Columns/VisitFirstActionTime.php +++ b/plugins/CoreHome/Columns/VisitFirstActionTime.php @@ -26,7 +26,7 @@ class VisitFirstActionTime extends VisitDimension protected $sqlSegment = 'HOUR(log_visit.visit_first_action_time)'; protected $segmentName = 'visitStartServerHour'; protected $acceptValues = '0, 1, 2, 3, ..., 20, 21, 22, 23'; - protected $nameSingular = 'VisitTime_ColumnVisitStartServerHour'; + protected $nameSingular = 'VisitTime_ColumnVisitStartSiteHour'; public function __construct() { diff --git a/plugins/CoreHome/Columns/VisitLastActionDate.php b/plugins/CoreHome/Columns/VisitLastActionDate.php index 6b2fd67563..9f0d1cdaf9 100644 --- a/plugins/CoreHome/Columns/VisitLastActionDate.php +++ b/plugins/CoreHome/Columns/VisitLastActionDate.php @@ -19,7 +19,7 @@ class VisitLastActionDate extends VisitDimension protected $columnName = 'visit_last_action_time'; protected $type = self::TYPE_DATETIME; protected $segmentName = 'visitEndServerDate'; - protected $nameSingular = 'VisitTime_ColumnVisitEndServerDate'; + protected $nameSingular = 'VisitTime_ColumnVisitEndUTCDate'; protected $sqlSegment = 'DATE(log_visit.visit_last_action_time)'; protected $acceptValues = '2018-12-31, 2018-03-20, ...'; diff --git a/plugins/CoreHome/Columns/VisitLastActionDayOfMonth.php b/plugins/CoreHome/Columns/VisitLastActionDayOfMonth.php index e3ef6bd8a1..c263c17cf3 100644 --- a/plugins/CoreHome/Columns/VisitLastActionDayOfMonth.php +++ b/plugins/CoreHome/Columns/VisitLastActionDayOfMonth.php @@ -18,7 +18,7 @@ class VisitLastActionDayOfMonth extends VisitDimension protected $columnName = 'visit_last_action_time'; protected $type = self::TYPE_DATETIME; protected $segmentName = 'visitEndServerDayOfMonth'; - protected $nameSingular = 'VisitTime_ColumnVisitEndServerDayOfMonth'; + protected $nameSingular = 'VisitTime_ColumnVisitEndUTCDayOfMonth'; protected $sqlSegment = 'DAYOFMONTH(log_visit.visit_last_action_time)'; protected $acceptValues = '0, 1, 2, 3, ..., 29, 30, 31'; diff --git a/plugins/CoreHome/Columns/VisitLastActionDayOfWeek.php b/plugins/CoreHome/Columns/VisitLastActionDayOfWeek.php index 81c5df338e..9bd42bdc0d 100644 --- a/plugins/CoreHome/Columns/VisitLastActionDayOfWeek.php +++ b/plugins/CoreHome/Columns/VisitLastActionDayOfWeek.php @@ -20,7 +20,7 @@ class VisitLastActionDayOfWeek extends VisitDimension protected $columnName = 'visit_last_action_time'; protected $type = self::TYPE_DATETIME; protected $segmentName = 'visitEndServerDayOfWeek'; - protected $nameSingular = 'VisitTime_ColumnVisitEndServerDayOfWeek'; + protected $nameSingular = 'VisitTime_ColumnVisitEndUTCDayOfWeek'; protected $sqlSegment = 'DAYOFWEEK(log_visit.visit_last_action_time)'; protected $acceptValues = '1, 2, 3, 4, 5, 6, 7'; diff --git a/plugins/CoreHome/Columns/VisitLastActionDayOfYear.php b/plugins/CoreHome/Columns/VisitLastActionDayOfYear.php index b00cea3c08..5e3449851f 100644 --- a/plugins/CoreHome/Columns/VisitLastActionDayOfYear.php +++ b/plugins/CoreHome/Columns/VisitLastActionDayOfYear.php @@ -18,7 +18,7 @@ class VisitLastActionDayOfYear extends VisitDimension protected $columnName = 'visit_last_action_time'; protected $type = self::TYPE_DATETIME; protected $segmentName = 'visitEndServerDayOfYear'; - protected $nameSingular = 'VisitTime_ColumnVisitEndServerDayOfYear'; + protected $nameSingular = 'VisitTime_ColumnVisitEndUTCDayOfYear'; protected $sqlSegment = 'DAYOFYEAR(log_visit.visit_last_action_time)'; protected $acceptValues = '1, 2, 3, 4, ..., 365, 366'; diff --git a/plugins/CoreHome/Columns/VisitLastActionMinute.php b/plugins/CoreHome/Columns/VisitLastActionMinute.php index b3b50fbd52..a465916cbd 100644 --- a/plugins/CoreHome/Columns/VisitLastActionMinute.php +++ b/plugins/CoreHome/Columns/VisitLastActionMinute.php @@ -25,7 +25,7 @@ class VisitLastActionMinute extends VisitDimension protected $columnName = 'visit_last_action_time'; protected $type = self::TYPE_DATETIME; protected $segmentName = 'visitEndServerMinute'; - protected $nameSingular = 'VisitTime_ColumnVisitEndServerMinute'; + protected $nameSingular = 'VisitTime_ColumnVisitEndUTCMinute'; protected $sqlSegment = 'MINUTE(log_visit.visit_last_action_time)'; protected $acceptValues = '0, 1, 2, 3, ..., 56, 57, 58, 59'; diff --git a/plugins/CoreHome/Columns/VisitLastActionMonth.php b/plugins/CoreHome/Columns/VisitLastActionMonth.php index 92094685e2..369d8bf776 100644 --- a/plugins/CoreHome/Columns/VisitLastActionMonth.php +++ b/plugins/CoreHome/Columns/VisitLastActionMonth.php @@ -20,7 +20,7 @@ class VisitLastActionMonth extends VisitDimension protected $columnName = 'visit_last_action_time'; protected $type = self::TYPE_DATETIME; protected $segmentName = 'visitEndServerMonth'; - protected $nameSingular = 'VisitTime_ColumnVisitEndServerMonth'; + protected $nameSingular = 'VisitTime_ColumnVisitEndUTCMonth'; protected $sqlSegment = 'MONTH(log_visit.visit_last_action_time)'; protected $acceptValues = '1, 2, 3, ..., 11, 12'; diff --git a/plugins/CoreHome/Columns/VisitLastActionQuarter.php b/plugins/CoreHome/Columns/VisitLastActionQuarter.php index f55daec3e7..1966169456 100644 --- a/plugins/CoreHome/Columns/VisitLastActionQuarter.php +++ b/plugins/CoreHome/Columns/VisitLastActionQuarter.php @@ -18,7 +18,7 @@ class VisitLastActionQuarter extends VisitDimension protected $columnName = 'visit_last_action_time'; protected $type = self::TYPE_DATETIME; protected $segmentName = 'visitEndServerQuarter'; - protected $nameSingular = 'VisitTime_ColumnVisitEndServerQuarter'; + protected $nameSingular = 'VisitTime_ColumnVisitEndUTCQuarter'; protected $sqlSegment = 'QUARTER(log_visit.visit_last_action_time)'; protected $acceptValues = '1, 2, 3, 4'; diff --git a/plugins/CoreHome/Columns/VisitLastActionSecond.php b/plugins/CoreHome/Columns/VisitLastActionSecond.php index 34dd1552bd..2915898832 100644 --- a/plugins/CoreHome/Columns/VisitLastActionSecond.php +++ b/plugins/CoreHome/Columns/VisitLastActionSecond.php @@ -18,7 +18,7 @@ class VisitLastActionSecond extends VisitDimension protected $columnName = 'visit_last_action_time'; protected $type = self::TYPE_DATETIME; protected $segmentName = 'visitEndServerSecond'; - protected $nameSingular = 'VisitTime_ColumnVisitEndServerSecond'; + protected $nameSingular = 'VisitTime_ColumnVisitEndUTCSecond'; protected $sqlSegment = 'SECOND(log_visit.visit_last_action_time)'; protected $acceptValues = '0, 1, 2, 3, ..., 58, 59'; diff --git a/plugins/CoreHome/Columns/VisitLastActionTime.php b/plugins/CoreHome/Columns/VisitLastActionTime.php index 2ec021f68f..f40643f99c 100644 --- a/plugins/CoreHome/Columns/VisitLastActionTime.php +++ b/plugins/CoreHome/Columns/VisitLastActionTime.php @@ -32,7 +32,7 @@ class VisitLastActionTime extends VisitDimension { protected $columnName = 'visit_last_action_time'; protected $type = self::TYPE_DATETIME; - protected $nameSingular = 'VisitTime_ColumnVisitEndServerHour'; + protected $nameSingular = 'VisitTime_ColumnVisitEndSiteHour'; protected $sqlSegment = 'HOUR(log_visit.visit_last_action_time)'; protected $segmentName = 'visitServerHour'; protected $acceptValues = '0, 1, 2, 3, ..., 20, 21, 22, 23'; diff --git a/plugins/CoreHome/Columns/VisitLastActionWeekOfYear.php b/plugins/CoreHome/Columns/VisitLastActionWeekOfYear.php index 2f3db58d97..44c21a067f 100644 --- a/plugins/CoreHome/Columns/VisitLastActionWeekOfYear.php +++ b/plugins/CoreHome/Columns/VisitLastActionWeekOfYear.php @@ -18,7 +18,7 @@ class VisitLastActionWeekOfYear extends VisitDimension protected $columnName = 'visit_last_action_time'; protected $type = self::TYPE_DATETIME; protected $segmentName = 'visitEndServerWeekOfYear'; - protected $nameSingular = 'VisitTime_ColumnVisitEndServerWeekOfYear'; + protected $nameSingular = 'VisitTime_ColumnVisitEndUTCWeekOfYear'; protected $sqlSegment = 'WEEKOFYEAR(log_visit.visit_last_action_time)'; protected $acceptValues = '1, 2, 3, 4, ..., 51, 52, 53'; diff --git a/plugins/CoreHome/Columns/VisitLastActionYear.php b/plugins/CoreHome/Columns/VisitLastActionYear.php index ffc3d2929e..18d05db6e8 100644 --- a/plugins/CoreHome/Columns/VisitLastActionYear.php +++ b/plugins/CoreHome/Columns/VisitLastActionYear.php @@ -18,7 +18,7 @@ class VisitLastActionYear extends VisitDimension protected $columnName = 'visit_last_action_time'; protected $type = self::TYPE_DATETIME; protected $segmentName = 'visitEndServerYear'; - protected $nameSingular = 'VisitTime_ColumnVisitEndServerYear'; + protected $nameSingular = 'VisitTime_ColumnVisitEndUTCYear'; protected $sqlSegment = 'YEAR(log_visit.visit_last_action_time)'; protected $acceptValues = '2016, 2017, 2018, ..., 9998, 9999'; diff --git a/plugins/CustomAlerts b/plugins/CustomAlerts -Subproject 9f64178fc555b97286af2853012b45b1d5fd2cc +Subproject 804f3aa6b96ddfbb040a9f9d8d685fb77bee12f diff --git a/plugins/CustomDimensions/tests/System/expected/test___API.getReportPagesMetadata.xml b/plugins/CustomDimensions/tests/System/expected/test___API.getReportPagesMetadata.xml index 1d297bc968..6a48012830 100644 --- a/plugins/CustomDimensions/tests/System/expected/test___API.getReportPagesMetadata.xml +++ b/plugins/CustomDimensions/tests/System/expected/test___API.getReportPagesMetadata.xml @@ -1343,7 +1343,7 @@ <isReport>1</isReport> </row> <row> - <name>Visits per server time</name> + <name>Visits per hour in the site's timezone</name> <module>VisitTime</module> <action>getVisitInformationPerServerTime</action> <order>120</order> diff --git a/plugins/CustomDimensions/tests/System/expected/test___API.getSegmentsMetadata.xml b/plugins/CustomDimensions/tests/System/expected/test___API.getSegmentsMetadata.xml index 778af8970b..e31da68ba6 100644 --- a/plugins/CustomDimensions/tests/System/expected/test___API.getSegmentsMetadata.xml +++ b/plugins/CustomDimensions/tests/System/expected/test___API.getSegmentsMetadata.xml @@ -192,79 +192,79 @@ <row> <type>dimension</type> <category>Visitors</category> - <name>Server time - date (Time of last action)</name> - <segment>visitEndServerDate</segment> + <name>Site time - hour (Start of visit)</name> + <segment>visitStartServerHour</segment> </row> <row> <type>dimension</type> <category>Visitors</category> - <name>Server time - day of month (Time of last action)</name> - <segment>visitEndServerDayOfMonth</segment> + <name>Site time - hour (Time of last action)</name> + <segment>visitServerHour</segment> </row> <row> <type>dimension</type> <category>Visitors</category> - <name>Server time - day of week (Time of last action)</name> - <segment>visitEndServerDayOfWeek</segment> + <name>Time in UTC - date (Time of last action)</name> + <segment>visitEndServerDate</segment> </row> <row> <type>dimension</type> <category>Visitors</category> - <name>Server time - day of year (Time of last action)</name> - <segment>visitEndServerDayOfYear</segment> + <name>Time in UTC - day of month (Time of last action)</name> + <segment>visitEndServerDayOfMonth</segment> </row> <row> <type>dimension</type> <category>Visitors</category> - <name>Server time - hour (Start of visit)</name> - <segment>visitStartServerHour</segment> + <name>Time in UTC - day of week (Time of last action)</name> + <segment>visitEndServerDayOfWeek</segment> </row> <row> <type>dimension</type> <category>Visitors</category> - <name>Server time - hour (Time of last action)</name> - <segment>visitServerHour</segment> + <name>Time in UTC - day of year (Time of last action)</name> + <segment>visitEndServerDayOfYear</segment> </row> <row> <type>dimension</type> <category>Visitors</category> - <name>Server time - 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>Server time - 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>Server time - 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>Server time - 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>Server time - 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>Server time - 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>Server time - 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>Server time - hour</name> + <name>Site time - hour</name> <segment>actionServerHour</segment> </row> <row> <type>dimension</type> <category>Behaviour</category> - <name>Server time - minute</name> + <name>Time in UTC - minute</name> <segment>actionServerMinute</segment> </row> </result>
\ No newline at end of file diff --git a/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_goals_overview.png b/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_goals_overview.png index be466a85b1..6fae6b0ffe 100644 --- a/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_goals_overview.png +++ b/plugins/CustomDimensions/tests/UI/expected-screenshots/CustomDimensions_report_goals_overview.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:15c6c5af646a424e97757aa4e0603f3b52ed5406cabc3709e4eab557b702a80d -size 70955 +oid sha256:9015c37c98508302f99f6dcba7fd762073fc98ce389891fb5fb38e474cfb8229 +size 73004 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 3dfafacaae..08b580c397 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 @@ -5,11 +5,11 @@ <metadata> <category>Visitors</category> <subcategory>Times</subcategory> - <name>Visits per server time</name> + <name>Visits per hour in the site's timezone</name> <module>VisitTime</module> <action>getVisitInformationPerServerTime</action> - <dimension>Server time - hour (Start of visit)</dimension> - <documentation>This graph shows what time it was in the <strong> server's time zone </strong> during the visits.</documentation> + <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> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> @@ -43,7 +43,7 @@ <uniqueId>VisitTime_getVisitInformationPerServerTime</uniqueId> </metadata> <columns> - <label>Server 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 607a1a85cc..5d5182028f 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 @@ -145,7 +145,7 @@ </li> <li style="font-size:15px;line-height:24px;"> <a href="#VisitTime_getVisitInformationPerServerTime" style="text-decoration:none; color: #0d0d0d;"> - Visits per server time + Visits per hour in the site's timezone </a> </li> <li style="font-size:15px;line-height:24px;"> @@ -2543,7 +2543,7 @@ </a></p> <h2 id="VisitTime_getVisitInformationPerServerTime" 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 per server time + Visits per hour in the site's timezone </h2> <img alt="" @@ -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;"> - Server 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 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 0891bb587f..2ee14b8d70 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 @@ -145,7 +145,7 @@ </li> <li style="font-size:15px;line-height:24px;"> <a href="#VisitTime_getVisitInformationPerServerTime" style="text-decoration:none; color: #0d0d0d;"> - Visits per server time + Visits per hour in the site's timezone </a> </li> <li style="font-size:15px;line-height:24px;"> @@ -2403,7 +2403,7 @@ </a></p> <h2 id="VisitTime_getVisitInformationPerServerTime" 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 per server time + Visits per hour in the site's timezone </h2> @@ -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;"> - Server 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 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 bb894a6f45..a9d3d6e154 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 @@ -112,7 +112,7 @@ label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site 22,0,0,0%,0,00:00:00,0% 23,0,0,0%,0,00:00:00,0% -Visits per server time +Visits per hour in the site's timezone label,nb_visits,nb_actions,revenue,nb_actions_per_visit,avg_time_on_site,bounce_rate 00,1,4,$10,4,00:12:01,0% 01,1,6,$0,6,01:06:01,0% 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 b787e2fc06..d28180fa4a 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 4fc441e353..8821bda686 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 @@ -112,7 +112,7 @@ label nb_visits nb_actions conversion_rate nb_actions_per_visit avg_time_on_site 22 0 0 0% 0 00:00:00 0% 23 0 0 0% 0 00:00:00 0% -Visits per server time +Visits per hour in the site's timezone label nb_visits nb_actions revenue nb_actions_per_visit avg_time_on_site bounce_rate 00 1 4 $10 4 00:12:01 0% 01 1 6 $0 6 01:06:01 0% diff --git a/plugins/Goals/tests/UI/expected-screenshots/GoalsPages_individual_goal.png b/plugins/Goals/tests/UI/expected-screenshots/GoalsPages_individual_goal.png index 6cb1f10071..afe451f5df 100644 --- a/plugins/Goals/tests/UI/expected-screenshots/GoalsPages_individual_goal.png +++ b/plugins/Goals/tests/UI/expected-screenshots/GoalsPages_individual_goal.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4d5f0bb76708545cb504070c6b4cd6568f87122fce3997297a27cdffb8f86e44 -size 198169 +oid sha256:0ac52a11e25e786fcf4d15067f1732b8ecac7058876ea79e72ed57874cc94974 +size 200161 diff --git a/plugins/Goals/tests/UI/expected-screenshots/GoalsPages_individual_goal_updated.png b/plugins/Goals/tests/UI/expected-screenshots/GoalsPages_individual_goal_updated.png index 49fa2bf91e..d4e72bb065 100644 --- a/plugins/Goals/tests/UI/expected-screenshots/GoalsPages_individual_goal_updated.png +++ b/plugins/Goals/tests/UI/expected-screenshots/GoalsPages_individual_goal_updated.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5dc6b5d99fdb21dda605a06d9a170e65c053eb3e50b28f6c33f6bd9d48922940 -size 199016 +oid sha256:72e576d64c1732bdf480747a17f92511b57588c643ed5dce1217daf618fc202f +size 201041 diff --git a/plugins/Goals/tests/UI/expected-screenshots/GoalsPages_overview.png b/plugins/Goals/tests/UI/expected-screenshots/GoalsPages_overview.png index 500b46f795..3bb51b9f70 100644 --- a/plugins/Goals/tests/UI/expected-screenshots/GoalsPages_overview.png +++ b/plugins/Goals/tests/UI/expected-screenshots/GoalsPages_overview.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d67025f70426ce81442c1fd0fc4ed2da51d0209fb4882863dc2b21009efa2d46 -size 163865 +oid sha256:601a598d35e2914b002510549c090229ee8d676b996531debcb42f2c1180f476 +size 165909 diff --git a/plugins/MarketingCampaignsReporting b/plugins/MarketingCampaignsReporting -Subproject f926dd8397c6d008b180825fd956ab54d107e29 +Subproject 031006264cde967432e65512a387b963aac89cb diff --git a/plugins/VisitTime/Reports/GetVisitInformationPerServerTime.php b/plugins/VisitTime/Reports/GetVisitInformationPerServerTime.php index 33bb4aa017..85cca6163c 100644 --- a/plugins/VisitTime/Reports/GetVisitInformationPerServerTime.php +++ b/plugins/VisitTime/Reports/GetVisitInformationPerServerTime.php @@ -22,8 +22,8 @@ class GetVisitInformationPerServerTime extends Base { parent::init(); $this->dimension = new VisitFirstActionTime(); - $this->name = Piwik::translate('VisitTime_ServerTime'); - $this->documentation = Piwik::translate('VisitTime_WidgetServerTimeDocumentation', array('<strong>', '</strong>')); + $this->name = Piwik::translate('VisitTime_SiteTime'); + $this->documentation = Piwik::translate('VisitTime_WidgetSiteTimeDocumentation', array('<strong>', '</strong>')); $this->constantRowsCount = true; $this->hasGoalMetrics = true; $this->order = 20; diff --git a/plugins/VisitTime/lang/en.json b/plugins/VisitTime/lang/en.json index c81aa794ee..d5dc99db8a 100644 --- a/plugins/VisitTime/lang/en.json +++ b/plugins/VisitTime/lang/en.json @@ -5,25 +5,41 @@ "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", "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.", "ServerTime": "Visits per server time", + "SiteTime": "Visits per hour in the site's timezone", "SubmenuTimes": "Times", "VisitsByDayOfWeek": "Visits by Day of Week", "WidgetByDayOfWeekDocumentation": "This graph shows the number of visits your website received on each day of the week.", @@ -31,6 +47,7 @@ "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", "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." } }
\ No newline at end of file |
