diff --git a/core/Common.php b/core/Common.php index 6088f83be93a16a4b3fbb488608d31ba1003d705..68eaf4d3fc270c6f4de36da58f634782407bba65 100644 --- a/core/Common.php +++ b/core/Common.php @@ -752,7 +752,7 @@ class Common * * @see core/DataFiles/Countries.php * - * @return array Array of 3 letter continent codes + * @return array Array of 3 letter continent codes * * @deprecated Use Piwik\Intl\Data\Provider\RegionDataProvider instead. * @see \Piwik\Intl\Data\Provider\RegionDataProvider::getContinentList() @@ -770,7 +770,7 @@ class Common * @see core/DataFiles/Countries.php * * @param bool $includeInternalCodes - * @return array Array of (2 letter ISO codes => 3 letter continent code) + * @return array Array of (2 letter ISO codes => 3 letter continent code) * * @deprecated Use Piwik\Intl\Data\Provider\RegionDataProvider instead. * @see \Piwik\Intl\Data\Provider\RegionDataProvider::getCountryList() @@ -1275,8 +1275,11 @@ class Common */ protected static function checkValidLanguagesIsSet($validLanguages) { + /** @var LanguageDataProvider $dataProvider */ + $dataProvider = StaticContainer::get('Piwik\Intl\Data\Provider\LanguageDataProvider'); + if (empty($validLanguages)) { - $validLanguages = array_keys(Common::getLanguagesList()); + $validLanguages = array_keys($dataProvider->getLanguageList()); return $validLanguages; } return $validLanguages; diff --git a/plugins/LanguagesManager/Test/Integration/LanguagesManagerTest.php b/plugins/LanguagesManager/Test/Integration/LanguagesManagerTest.php index cb48cd52111a0385a1235678cd26534650f28b1d..1573d4ec37e9065053f3f7badb6f3a1f24589415 100755 --- a/plugins/LanguagesManager/Test/Integration/LanguagesManagerTest.php +++ b/plugins/LanguagesManager/Test/Integration/LanguagesManagerTest.php @@ -8,7 +8,6 @@ namespace Piwik\Plugins\LanguagesManager\Test\Integration; -use Piwik\Common; use Piwik\Container\StaticContainer; use Piwik\Intl\Data\Provider\LanguageDataProvider; use Piwik\Plugins\LanguagesManager\API; @@ -173,9 +172,12 @@ class LanguagesManagerTest extends \PHPUnit_Framework_TestCase * * @group Plugins */ - function testGetLanguagesList() + public function testGetLanguagesList() { - $languages = Common::getLanguagesList(); + /** @var LanguageDataProvider $languageDataProvider */ + $languageDataProvider = StaticContainer::get('Piwik\Intl\Data\Provider\LanguageDataProvider'); + + $languages = $languageDataProvider->getLanguageList(); $this->assertTrue(count($languages) > 0); foreach ($languages as $langCode => $langs) { $this->assertTrue(strlen($langCode) == 2, "$langCode length = 2"); diff --git a/plugins/LanguagesManager/TranslationWriter/Validate/CoreTranslations.php b/plugins/LanguagesManager/TranslationWriter/Validate/CoreTranslations.php index 8499f578502e4d13abd992e53f2d2d1254f6e901..5da73db3f10d7f17cae47f096e26978cfe5639f0 100644 --- a/plugins/LanguagesManager/TranslationWriter/Validate/CoreTranslations.php +++ b/plugins/LanguagesManager/TranslationWriter/Validate/CoreTranslations.php @@ -9,8 +9,8 @@ namespace Piwik\Plugins\LanguagesManager\TranslationWriter\Validate; -use Piwik\Common; use Piwik\Container\StaticContainer; +use Piwik\Intl\Data\Provider\LanguageDataProvider; use Piwik\Intl\Data\Provider\RegionDataProvider; class CoreTranslations extends ValidateAbstract @@ -75,10 +75,12 @@ class CoreTranslations extends ValidateAbstract return false; } + /** @var LanguageDataProvider $languageDataProvider */ + $languageDataProvider = StaticContainer::get('Piwik\Intl\Data\Provider\LanguageDataProvider'); /** @var RegionDataProvider $regionDataProvider */ $regionDataProvider = StaticContainer::get('Piwik\Intl\Data\Provider\RegionDataProvider'); - $allLanguages = Common::getLanguagesList(); + $allLanguages = $languageDataProvider->getLanguageList(); $allCountries = $regionDataProvider->getCountryList(); if (!preg_match('/^([a-z]{2})_([A-Z]{2})\.UTF-8$/', $translations['General']['Locale'], $matches)) {