Merge branch 'master' into move_language_report

Conflicts:
	plugins/UserLanguage/Archiver.php

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()) {