diff options
author | sgiehl <stefan@piwik.org> | 2015-02-03 00:29:10 +0300 |
---|---|---|
committer | sgiehl <stefan@piwik.org> | 2015-02-03 00:29:10 +0300 |
commit | 211c34f5c11efd17b2e06c91f93e408ceca430da (patch) | |
tree | 9c1d6b0e3d6500976f7085e3c5a113a943bd5940 /plugins/UserLanguage | |
parent | 8b5ee0af07ba6e708075734805b3647f217dd938 (diff) | |
parent | dee7a0c3f32d557f2d7ff338badbf38bf9a38ddb (diff) |
Merge branch 'master' into move_language_report
Conflicts:
plugins/UserLanguage/Archiver.php
Diffstat (limited to 'plugins/UserLanguage')
-rw-r--r-- | plugins/UserLanguage/Archiver.php | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/plugins/UserLanguage/Archiver.php b/plugins/UserLanguage/Archiver.php index 0fd4a63b7d..14fd369eec 100644 --- a/plugins/UserLanguage/Archiver.php +++ b/plugins/UserLanguage/Archiver.php @@ -10,8 +10,10 @@ namespace Piwik\Plugins\UserLanguage; use Piwik\Common; +use Piwik\Container\StaticContainer; use Piwik\DataArray; use Piwik\DataTable; +use Piwik\Intl\Data\Provider\RegionDataProvider; use Piwik\Metrics; require_once PIWIK_INCLUDE_PATH . '/plugins/UserLanguage/functions.php'; @@ -49,8 +51,11 @@ class Archiver extends \Piwik\Plugin\Archiver protected function aggregateByLanguage() { + /** @var RegionDataProvider $regionDataProvider */ + $regionDataProvider = StaticContainer::get('Piwik\Intl\Data\Provider\RegionDataProvider'); + $query = $this->getLogAggregator()->queryVisitsByDimension(array("label" => self::LANGUAGE_DIMENSION)); - $countryCodes = Common::getCountriesList($includeInternalCodes = true); + $countryCodes = $regionDataProvider->getCountryList($includeInternalCodes = true); $metricsByLanguage = new DataArray(); while ($row = $query->fetch()) { |