do not translate the plugin description when loading the information

it might get translated using the default language otherwise or cached incorrect as the metadata is cached without the language
matomo-org · Jun 8, 2015 · cd1bb24 · cd1bb24
1 parent 6dbaf98
commit cd1bb24
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/core/Plugin/MetadataLoader.php b/core/Plugin/MetadataLoader.php
@@ -66,7 +66,7 @@ private function getDefaultPluginInformation()
     {
         $descriptionKey = $this->pluginName . '_PluginDescription';
         return array(
-            'description'      => Piwik::translate($descriptionKey),
+            'description'      => $descriptionKey,
             'homepage'         => 'http://piwik.org/',
             'authors'          => array(array('name' => 'Piwik', 'homepage'  => 'http://piwik.org/')),
             'license'          => 'GPL v3+',

diff --git a/plugins/CorePluginsAdmin/Controller.php b/plugins/CorePluginsAdmin/Controller.php
@@ -312,6 +312,10 @@ protected function getPluginsInfo($themesOnly = false)
 
             $plugin['isCorePlugin'] = $pluginManager->isPluginBundledWithCore($pluginName);
 
+            if (!empty($plugin['info']['description'])) {
+                $plugin['info']['description'] = $this->translator->translate($plugin['info']['description']);
+            }
+
             if (!isset($plugin['info'])) {
 
                 $suffix = $this->translator->translate('CorePluginsAdmin_PluginNotWorkingAlternative');