moved clean method to Translate instead of TranslationWriter

2 files changed, 13 insertions, 2 deletions

diff --git a/core/Translate.php b/core/Translate.php
index 5348c1a1b3..09d9734da6 100644
--- a/core/Translate.php
+++ b/core/Translate.php
@@ -33,6 +33,17 @@ class Translate
         return self::$instance;
     }
 
+    /**
+     * Clean a string that may contain HTML special chars, single/double quotes, HTML entities, leading/trailing whitespace
+     *
+     * @param string $s
+     * @return string
+     */
+    static public function clean($s)
+    {
+        return html_entity_decode(trim($s), ENT_QUOTES, 'UTF-8');
+    }
+
     public function loadEnglishTranslation()
     {
         $this->loadCoreTranslationFile('en');
diff --git a/core/Translate/Filter/EncodedEntities.php b/core/Translate/Filter/EncodedEntities.php
index 5b0c4ee5c7..4a8b757c1f 100644
--- a/core/Translate/Filter/EncodedEntities.php
+++ b/core/Translate/Filter/EncodedEntities.php
@@ -12,7 +12,7 @@
 namespace Piwik\Translate\Filter;
 
 use Piwik\Translate\Filter\FilterAbstract;
-use Piwik\TranslationWriter;
+use Piwik\Translate;
 
 /**
  * @package Piwik
@@ -34,7 +34,7 @@ class EncodedEntities extends FilterAbstract
             foreach ($pluginTranslations AS $key => $translation) {
 
                 // remove encoded entities
-                $decoded = TranslationWriter::clean($translation);
+                $decoded = Translate::clean($translation);
                 if ($translation != $decoded) {
                     $this->_filteredData[$pluginName][$key] = $translation;
                     $translations[$pluginName][$key] = $decoded;