From de06fd66ee7d01832ff08f13d58e21a9d7a510c7 Mon Sep 17 00:00:00 2001
From: Matthieu Napoli <matthieu@mnapoli.fr>
Date: Mon, 29 Dec 2014 20:03:26 +1300
Subject: 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.
---
 core/Translate.php | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

(limited to 'core/Translate.php')

diff --git a/core/Translate.php b/core/Translate.php
index 6bc846ab4b..70f795245b 100644
--- a/core/Translate.php
+++ b/core/Translate.php
@@ -26,22 +26,19 @@ class Translate
      */
     public static function clean($s)
     {
-        return self::getTranslator()->clean($s);
+        return html_entity_decode(trim($s), ENT_QUOTES, 'UTF-8');
     }
 
     public static function loadEnglishTranslation()
     {
-        self::getTranslator()->loadEnglishTranslation();
     }
 
     public static function unloadEnglishTranslation()
     {
-        self::getTranslator()->unloadEnglishTranslation();
     }
 
     public static function reloadLanguage($language = false)
     {
-        self::getTranslator()->reloadLanguage($language);
     }
 
     /**
@@ -52,12 +49,10 @@ class Translate
      */
     public static function loadCoreTranslation($language = false)
     {
-        self::getTranslator()->loadCoreTranslation($language);
     }
 
     public static function mergeTranslationArray($translation)
     {
-        self::getTranslator()->mergeTranslationArray($translation);
     }
 
     /**
@@ -66,13 +61,13 @@ class Translate
      */
     public static function getLanguageToLoad()
     {
-        return self::getTranslator()->getLanguageToLoad();
+        return self::getTranslator()->getCurrentLanguage();
     }
 
     /** Reset the cached language to load. Used in tests. */
     public static function reset()
     {
-        self::getTranslator()->reset();
+        self::getTranslator()->setCurrentLanguage(null);
     }
 
     /**
@@ -81,12 +76,12 @@ class Translate
      */
     public static function getLanguageLoaded()
     {
-        return self::getTranslator()->getLanguageLoaded();
+        return self::getTranslator()->getCurrentLanguage();
     }
 
     public static function getLanguageDefault()
     {
-        return self::getTranslator()->getLanguageDefault();
+        return self::getTranslator()->getDefaultLanguage();
     }
 
     /**
-- 
cgit v1.2.3