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:
authorLukas Winkler <git@lw1.at>2021-08-30 13:00:26 +0300
committerGitHub <noreply@github.com>2021-08-30 13:00:26 +0300
commit2f6e2497180e31ad096b245469acd5ba60ed5f65 (patch)
tree9c69290c064811d2a7135eb5ad24b54425571371 /plugins
parent5d4925d6cde7a71ebeafeddf47357f9455dc9647 (diff)
use list of supported languages from config (#17930)
* use list of supported languages from config * remove dev from list * correct list of languages
Diffstat (limited to 'plugins')
-rw-r--r--plugins/LanguagesManager/API.php13
1 files changed, 8 insertions, 5 deletions
diff --git a/plugins/LanguagesManager/API.php b/plugins/LanguagesManager/API.php
index 5bc5628bbe..fa80210065 100644
--- a/plugins/LanguagesManager/API.php
+++ b/plugins/LanguagesManager/API.php
@@ -9,13 +9,13 @@
*/
namespace Piwik\Plugins\LanguagesManager;
-use Piwik\Db;
+use Piwik\Cache as PiwikCache;
+use Piwik\Config;
use Piwik\Development;
use Piwik\Filesystem;
use Piwik\Piwik;
-use Piwik\Cache as PiwikCache;
-use Piwik\Plugin\Manager as PluginManager;
use Piwik\Plugin\Manager;
+use Piwik\Plugin\Manager as PluginManager;
use Piwik\Translation\Loader\DevelopmentLoader;
/**
@@ -62,13 +62,16 @@ class API extends \Piwik\Plugin\API
$languagesPath = _glob($path . "*.json");
$pathLength = strlen($path);
- $languages = array();
+ $filesystemLanguages = array();
if ($languagesPath) {
foreach ($languagesPath as $language) {
- $languages[] = substr($language, $pathLength, -strlen('.json'));
+ $filesystemLanguages[] = substr($language, $pathLength, -strlen('.json'));
}
}
+ $configLanguages = Config::getInstance()->Languages["Languages"];
+
+ $languages = array_intersect($filesystemLanguages, $configLanguages);
$this->enableDevelopmentLanguageInDevEnvironment($languages);
/**