diff options
| author | Thomas Steur <thomas.steur@gmail.com> | 2016-04-06 06:29:18 +0300 |
|---|---|---|
| committer | Thomas Steur <thomas.steur@gmail.com> | 2016-04-06 06:29:18 +0300 |
| commit | 3eb0cf055146c0b77b592cf9ef4bf2eb2e2f1ca3 (patch) | |
| tree | 99817781db0a0626fa4d14f96697f6e04e66f983 /plugins/VisitFrequency | |
| parent | 1854f5c456a76af807431d52bcb19ad207ba658e (diff) | |
| parent | 0f38083969261b95a00c59f1f5596d35365506cd (diff) | |
Merge branch 'master' into 3.0-m03
Conflicts:
core/Version.php
core/WidgetsList.php
plugins/CustomDimensions
plugins/Goals/templates/getGoalReportView.twig
plugins/Goals/templates/getOverviewView.twig
tests/UI/expected-ui-screenshots
Diffstat (limited to 'plugins/VisitFrequency')
| -rw-r--r-- | plugins/VisitFrequency/Controller.php | 1 | ||||
| -rw-r--r-- | plugins/VisitFrequency/lang/fi.json | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/plugins/VisitFrequency/Controller.php b/plugins/VisitFrequency/Controller.php index 8e6af9cffd..855d1286de 100644 --- a/plugins/VisitFrequency/Controller.php +++ b/plugins/VisitFrequency/Controller.php @@ -68,6 +68,7 @@ class Controller extends \Piwik\Plugin\Controller ); $period = Common::getRequestVar('period', false); + if ($period == 'day') { // add number of unique (returning) visitors for period=day $selectableColumns = array_merge( diff --git a/plugins/VisitFrequency/lang/fi.json b/plugins/VisitFrequency/lang/fi.json index b46c8115d6..4bee78edcc 100644 --- a/plugins/VisitFrequency/lang/fi.json +++ b/plugins/VisitFrequency/lang/fi.json @@ -10,6 +10,8 @@ "ColumnReturningVisits": "Palaavat käynnit", "ColumnSumVisitLengthReturning": "Palaavien käyttäjien aika yhteensä (sekunteja)", "ColumnUniqueReturningVisitors": "Yksilölliset palaavat kävijät", + "ColumnReturningUsers": "Palaavat käyttäjät", + "PluginDescription": "Raportoi metriikat ensimmäisen kerran kävijöistä ja palaavista vierailijoista", "ReturnActions": "%s toimintoa palaavilta käyttäjiltä", "ReturnAverageVisitDuration": "%s keskimääräinen käynnin pituus palaaville kävijöille", "ReturnAvgActions": "%s toimintoa \/ palaava käynti", |