Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/Metrics.php4
-rw-r--r--core/RankingQuery.php2
-rw-r--r--plugins/Events/Events.php2
3 files changed, 4 insertions, 4 deletions
diff --git a/core/Metrics.php b/core/Metrics.php
index c96670b938..e102ec4601 100644
--- a/core/Metrics.php
+++ b/core/Metrics.php
@@ -242,8 +242,6 @@ class Metrics
'exit_rate' => 'General_ColumnExitRate',
);
- $translations = array_map(array('\\Piwik\\Piwik','translate'), $translations);
-
$dailySum = ' (' . Piwik::translate('General_DailySum') . ')';
$afterEntry = ' ' . Piwik::translate('General_AfterEntry');
@@ -262,6 +260,8 @@ class Metrics
*/
Piwik::postEvent('Metrics.getDefaultMetricTranslations', array(&$translations));
+ $translations = array_map(array('\\Piwik\\Piwik','translate'), $translations);
+
return $translations;
}
diff --git a/core/RankingQuery.php b/core/RankingQuery.php
index 6ccc680b6a..de05ab39aa 100644
--- a/core/RankingQuery.php
+++ b/core/RankingQuery.php
@@ -13,7 +13,7 @@ use Exception;
/**
* The ranking query class wraps an arbitrary SQL query with more SQL that limits
- * the number of results while aggregating the rest in an a new "Others" row. It als
+ * the number of results while aggregating the rest in an a new "Others" row. It also
* allows for some more fancy things that can be configured via method calls of this
* class. The advanced use cases are explained in the doc comments of the methods.
*
diff --git a/plugins/Events/Events.php b/plugins/Events/Events.php
index f27511fd70..dde5adf5ee 100644
--- a/plugins/Events/Events.php
+++ b/plugins/Events/Events.php
@@ -67,7 +67,7 @@ class Events extends \Piwik\Plugin
$segments[] = array(
'type' => 'metric',
'category' => Piwik::translate('General_Visit'),
- 'name' => 'Events_NbEvents',
+ 'name' => 'Events_TotalEvents',
'segment' => 'events',
'sqlSegment' => 'log_visit.visit_total_events',
'acceptedValues' => 'To select all visits who triggered an Event, use: &segment=events>0',