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:
authorThomas Steur <tsteur@users.noreply.github.com>2017-10-03 23:22:01 +0300
committerGitHub <noreply@github.com>2017-10-03 23:22:01 +0300
commit9af4e95aa976f3a6533e95b776b5298f73e5f916 (patch)
treed612cd4d32019e9e52ce1398b8bf214ec06a8e0f /plugins/UserLanguage
parent359c3ec875b554c7b71a933b26d18cdde0bb8f4e (diff)
Better segment editor and fixes (#12040)
* column tweak * fix install * more tweaks * rename column to dimension * various fixes * added new control expandable select * starting to refactor segment selector * make segment editor work again * use translation keys * defined some metrics * set types * simplify * simplify * fix join generator * add possibility to use custom join table names when using query builder and it uses an inner query * fix bug in query selector when selecting same field name from different tables twice * more metadata * more tweaks * improve selector * add possibility to use custom entity names * also processed archived metrics * generate sql filter, suggested values callback, and accept values automatically for columns with enums * several tweaks * focus search field when opening it * various tweaks * added missing method * format and fix more metadata * more fixes * better definition * define custom filter * fix definition * fix various tests * fix more tests * fix bug in logquery builder * fix referrerurl segment was missing * fix some tests * fix more tests * add group * refactor for better definition * fix a bug in log query builder when similar columns are used in archiver * add goal metrics * various fixes * make datatable row more flexible * various fixes and visualization enhancements * simply segment editor and make it smaller * remove trailing comma * various fixes and added new dimension * fix formatting of returning customer * added missing primary key * fixes * various fixes and improvements * make sure to update segment definition when selecting a value from auto complete list * various fixes and more metrics * more metrics * more dimensions and fixes * fix some tests * fix some integration tests * update submodule * fix some system tests * fix ui tests * trigger new test run * fix more ui tests * fix system tests * update submodule * fix categories * sort segments by category for more consistency * add custom variables * some translations and fixes * add minute segment * more segments * added plurals * added some docs * fix test * fix tests * fix tests * added suggested values * fix some tests * various fixes * fix more tests * allow to select segments on any site * make sure to include file * added doc block * fix some system tests * fix most system tests * fix ui test * fix system test * adjust examples * added more tests and docs * no metrics for these dimensions * added developer changelog and made some classes public api * some fixes for entity names * add possibility to set format metrics in test * more consistency in defining the name * get idsites only if provided * fix integration tests * added another segment for visit start hour and visit start minute * more clear name for segment * use old segment name to not break bc * various fixes * more test fixes * fix no suggested values for new segment * add event value * for boolean dimensions only sum metric * update available widgets when updating reporting menu * Add new segments in developer changelog + typo * fix system tests * fix screenshot test
Diffstat (limited to 'plugins/UserLanguage')
-rw-r--r--plugins/UserLanguage/Columns/Language.php21
1 files changed, 9 insertions, 12 deletions
diff --git a/plugins/UserLanguage/Columns/Language.php b/plugins/UserLanguage/Columns/Language.php
index fa665ed998..6d6ab2861b 100644
--- a/plugins/UserLanguage/Columns/Language.php
+++ b/plugins/UserLanguage/Columns/Language.php
@@ -9,7 +9,7 @@
namespace Piwik\Plugins\UserLanguage\Columns;
use Piwik\Common;
-use Piwik\Piwik;
+use Piwik\Metrics\Formatter;
use Piwik\Plugin\Dimension\VisitDimension;
use Piwik\Tracker\Action;
use Piwik\Tracker\Request;
@@ -19,10 +19,16 @@ class Language extends VisitDimension
{
protected $columnName = 'location_browser_lang';
protected $columnType = 'VARCHAR(20) NULL';
+ protected $category = 'UserCountry_VisitLocation';
+ protected $nameSingular = 'General_Language';
+ protected $namePlural = 'General_Languages';
+ protected $segmentName = 'languageCode';
+ protected $acceptValues = 'de, fr, en-gb, zh-cn, etc.';
+ protected $type = self::TYPE_TEXT;
- public function getName()
+ public function formatValue($value, $idSite, Formatter $formatter)
{
- return Piwik::translate('General_Language');
+ return \Piwik\Plugins\UserLanguage\languageTranslateWithCode($value);
}
/**
@@ -52,13 +58,4 @@ class Language extends VisitDimension
return $languageCode;
}
- protected function configureSegments()
- {
- $segment = new \Piwik\Plugin\Segment();
- $segment->setCategory('Visit Location');
- $segment->setSegment('languageCode');
- $segment->setName('General_Language');
- $segment->setAcceptedValues('de, fr, en-gb, zh-cn, etc.');
- $this->addSegment($segment);
- }
}