From 2f6e2497180e31ad096b245469acd5ba60ed5f65 Mon Sep 17 00:00:00 2001
From: Lukas Winkler <git@lw1.at>
Date: Mon, 30 Aug 2021 12:00:26 +0200
Subject: use list of supported languages from config (#17930)

* use list of supported languages from config

* remove dev from list

* correct list of languages
---
 config/global.ini.php            | 58 ++++++++++++++++++++++++++++++++++++++++
 plugins/LanguagesManager/API.php | 13 +++++----
 2 files changed, 66 insertions(+), 5 deletions(-)

diff --git a/config/global.ini.php b/config/global.ini.php
index 885ba64fa4..8a353e6861 100755
--- a/config/global.ini.php
+++ b/config/global.ini.php
@@ -1067,6 +1067,64 @@ port = ; Proxy port: the port that the proxy server listens to. There is no stan
 username = ; Proxy username: optional; if specified, password is mandatory
 password = ; Proxy password: optional; if specified, username is mandatory
 
+[Languages]
+Languages[] = am
+Languages[] = ar
+Languages[] = be
+Languages[] = bg
+Languages[] = bn
+Languages[] = bs
+Languages[] = ca
+Languages[] = cs
+Languages[] = cy
+Languages[] = da
+Languages[] = de
+Languages[] = el
+Languages[] = en
+Languages[] = eo
+Languages[] = es
+Languages[] = es-ar
+Languages[] = et
+Languages[] = eu
+Languages[] = fa
+Languages[] = fi
+Languages[] = fr
+Languages[] = gl
+Languages[] = he
+Languages[] = hi
+Languages[] = hr
+Languages[] = hu
+Languages[] = id
+Languages[] = is
+Languages[] = it
+Languages[] = ja
+Languages[] = ka
+Languages[] = ko
+Languages[] = lt
+Languages[] = lv
+Languages[] = nb
+Languages[] = nl
+Languages[] = nn
+Languages[] = pl
+Languages[] = pt
+Languages[] = pt-br
+Languages[] = ro
+Languages[] = ru
+Languages[] = sk
+Languages[] = sl
+Languages[] = sq
+Languages[] = sr
+Languages[] = sv
+Languages[] = ta
+Languages[] = te
+Languages[] = th
+Languages[] = tl
+Languages[] = tr
+Languages[] = uk
+Languages[] = vi
+Languages[] = zh-cn
+Languages[] = zh-tw
+
 [Plugins]
 ; list of plugins (in order they will be loaded) that are activated by default in the Matomo platform
 Plugins[] = CorePluginsAdmin
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);
 
         /**
-- 
cgit v1.2.3