Refactored the way translations are loaded

Translations are now lazily loaded instead of being explicitely loaded by other components (e.g. the front controller, the plugin manager, etc...). Now other parties only configure "directories" where the translator can find translations. That makes the translator decoupled from the rest of Piwik.

1 files changed, 6 insertions, 0 deletions

diff --git a/core/Container/ContainerFactory.php b/core/Container/ContainerFactory.php
index f0414452b7..bf3b157ba8 100644
--- a/core/Container/ContainerFactory.php
+++ b/core/Container/ContainerFactory.php
@@ -12,6 +12,7 @@ use DI\Container;
 use DI\ContainerBuilder;
 use Doctrine\Common\Cache\ArrayCache;
 use Piwik\Config;
+use Piwik\Development;
 
 /**
  * Creates a configured DI container.
@@ -55,6 +56,11 @@ class ContainerFactory
         // Global config
         $builder->addDefinitions(PIWIK_USER_PATH . '/config/global.php');
 
+        // Development config
+        if (Development::isEnabled()) {
+            $builder->addDefinitions(PIWIK_USER_PATH . '/config/environment/dev.php');
+        }
+
         // User config
         if (file_exists(PIWIK_USER_PATH . '/config/config.php')) {
             $builder->addDefinitions(PIWIK_USER_PATH . '/config/config.php');