Don't hardcode plugins directory (#14043)

* do not hard code plugins directory

* remove method that is not needed for now

* use plugins directory in more places

4 files changed, 12 insertions, 10 deletions

diff --git a/plugins/LanguagesManager/API.php b/plugins/LanguagesManager/API.php
index 9801841def..60b77aca6a 100644
--- a/plugins/LanguagesManager/API.php
+++ b/plugins/LanguagesManager/API.php
@@ -97,7 +97,7 @@ class API extends \Piwik\Plugin\API
         $englishTranslation = json_decode($data, true);
 
         // merge with plugin translations if any
-        $pluginFiles = glob(sprintf('%s/plugins/*/lang/en.json', PIWIK_INCLUDE_PATH));
+        $pluginFiles = glob(sprintf('%s*/lang/en.json', Manager::getPluginsDirectory()));
         foreach ($pluginFiles as $file) {
 
             preg_match('/\/plugins\/([^\/]+)\/lang/i', $file, $matches);
@@ -117,7 +117,7 @@ class API extends \Piwik\Plugin\API
             $translations = json_decode($data, true);
 
             // merge with plugin translations if any
-            $pluginFiles = glob(sprintf('%s/plugins/*/lang/%s.json', PIWIK_INCLUDE_PATH, $filename));
+            $pluginFiles = glob(sprintf('%s*/lang/%s.json', Manager::getPluginsDirectory(), $filename));
             foreach ($pluginFiles as $file) {
 
                 preg_match('/\/plugins\/([^\/]+)\/lang/i', $file, $matches);
@@ -223,7 +223,7 @@ class API extends \Piwik\Plugin\API
             return false;
         }
 
-        $languageFile = PIWIK_INCLUDE_PATH . "/plugins/$pluginName/lang/$languageCode.json";
+        $languageFile = Manager::getPluginsDirectory() . "$pluginName/lang/$languageCode.json";
 
         if (!file_exists($languageFile)) {
             return false;
diff --git a/plugins/LanguagesManager/Commands/PluginsWithTranslations.php b/plugins/LanguagesManager/Commands/PluginsWithTranslations.php
index 69132ab2e9..62d13cda70 100644
--- a/plugins/LanguagesManager/Commands/PluginsWithTranslations.php
+++ b/plugins/LanguagesManager/Commands/PluginsWithTranslations.php
@@ -9,6 +9,7 @@
 
 namespace Piwik\Plugins\LanguagesManager\Commands;
 
+use Piwik\Plugin\Manager;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
@@ -26,9 +27,9 @@ class PluginsWithTranslations extends TranslationBase
     {
         $output->writeln("Following plugins contain their own translation files:");
 
-        $pluginFiles = glob(sprintf('%s/plugins/*/lang/en.json', PIWIK_INCLUDE_PATH));
+        $pluginFiles = glob(sprintf('%s*/lang/en.json', Manager::getPluginsDirectory()));
         $pluginFiles = array_map(function($elem){
-            return str_replace(array(sprintf('%s/plugins/', PIWIK_INCLUDE_PATH), '/lang/en.json'), '', $elem);
+            return str_replace(array(Manager::getPluginsDirectory(), '/lang/en.json'), '', $elem);
         }, $pluginFiles);
 
         $output->writeln(join("\n", $pluginFiles));
diff --git a/plugins/LanguagesManager/Commands/Update.php b/plugins/LanguagesManager/Commands/Update.php
index cfe0472b31..4e79b8383b 100644
--- a/plugins/LanguagesManager/Commands/Update.php
+++ b/plugins/LanguagesManager/Commands/Update.php
@@ -158,9 +158,9 @@ class Update extends TranslationBase
             return $pluginsWithTranslations;
         }
 
-        $pluginsWithTranslations = glob(sprintf('%s/plugins/*/lang/en.json', PIWIK_INCLUDE_PATH));
+        $pluginsWithTranslations = glob(sprintf('%s*/lang/en.json', Manager::getPluginsDirectory()));
         $pluginsWithTranslations = array_map(function ($elem) {
-            return str_replace(array(sprintf('%s/plugins/', PIWIK_INCLUDE_PATH), '/lang/en.json'), '', $elem);
+            return str_replace(array(Manager::getPluginsDirectory(), '/lang/en.json'), '', $elem);
         }, $pluginsWithTranslations);
 
         return $pluginsWithTranslations;
@@ -189,9 +189,9 @@ class Update extends TranslationBase
 
         $pluginsNotInCore = array_merge($submodulePlugins, $newPlugins);
 
-        $pluginsWithTranslations = glob(sprintf('%s/plugins/*/lang/en.json', PIWIK_INCLUDE_PATH));
+        $pluginsWithTranslations = glob(sprintf('%s*/lang/en.json', Manager::getPluginsDirectory()));
         $pluginsWithTranslations = array_map(function ($elem) {
-            return str_replace(array(sprintf('%s/plugins/', PIWIK_INCLUDE_PATH), '/lang/en.json'), '', $elem);
+            return str_replace(array(Manager::getPluginsDirectory(), '/lang/en.json'), '', $elem);
         }, $pluginsWithTranslations);
 
         $pluginsInCore = array_diff($pluginsWithTranslations, $pluginsNotInCore);
diff --git a/plugins/LanguagesManager/TranslationWriter/Writer.php b/plugins/LanguagesManager/TranslationWriter/Writer.php
index 6095f5a982..8dc2260cdb 100644
--- a/plugins/LanguagesManager/TranslationWriter/Writer.php
+++ b/plugins/LanguagesManager/TranslationWriter/Writer.php
@@ -12,6 +12,7 @@ use Exception;
 use Piwik\Container\StaticContainer;
 use Piwik\Filesystem;
 use Piwik\Piwik;
+use Piwik\Plugin\Manager;
 use Piwik\Plugins\LanguagesManager\TranslationWriter\Filter\FilterAbstract;
 use Piwik\Plugins\LanguagesManager\TranslationWriter\Validate\ValidateAbstract;
 
@@ -201,7 +202,7 @@ class Writer
             if ($base == 'tmp') {
                 return sprintf('%s/plugins/%s/lang/%s.json', StaticContainer::get('path.tmp'), $this->pluginName, $lang);
             } else {
-                return sprintf('%s/plugins/%s/lang/%s.json', PIWIK_INCLUDE_PATH, $this->pluginName, $lang);
+                return sprintf('%s%s/lang/%s.json', Manager::getPluginsDirectory(), $this->pluginName, $lang);
             }
         }