fix false entity decoding in translations

2 files changed, 17 insertions, 1 deletions

diff --git a/plugins/LanguagesManager/Commands/SetTranslations.php b/plugins/LanguagesManager/Commands/SetTranslations.php
index ef4ebdc22a..540471ce59 100644
--- a/plugins/LanguagesManager/Commands/SetTranslations.php
+++ b/plugins/LanguagesManager/Commands/SetTranslations.php
@@ -80,7 +80,7 @@ class SetTranslations extends TranslationBase
         $translationWriter->addFilter(new EmptyTranslations());
         $translationWriter->addFilter(new ByParameterCount($baseTranslations));
         $translationWriter->addFilter(new UnnecassaryWhitespaces($baseTranslations));
-        $translationWriter->addFilter(new EncodedEntities());
+        $translationWriter->addFilter(new EncodedEntities($baseTranslations));
 
         $translationData = file_get_contents($filename);
         $translations = json_decode($translationData, true);
diff --git a/plugins/LanguagesManager/TranslationWriter/Filter/EncodedEntities.php b/plugins/LanguagesManager/TranslationWriter/Filter/EncodedEntities.php
index 492ad6953a..ad5b0605a5 100644
--- a/plugins/LanguagesManager/TranslationWriter/Filter/EncodedEntities.php
+++ b/plugins/LanguagesManager/TranslationWriter/Filter/EncodedEntities.php
@@ -13,6 +13,18 @@ use Piwik\Translate;
 
 class EncodedEntities extends FilterAbstract
 {
+    protected $baseTranslations = array();
+
+    /**
+     * Sets base translations
+     *
+     * @param array $baseTranslations
+     */
+    public function __construct($baseTranslations = array())
+    {
+        $this->baseTranslations = $baseTranslations;
+    }
+
     /**
      * Decodes all encoded entities in the given translations
      *
@@ -25,6 +37,10 @@ class EncodedEntities extends FilterAbstract
         foreach ($translations as $pluginName => $pluginTranslations) {
             foreach ($pluginTranslations as $key => $translation) {
 
+                if ($this->baseTranslations[$pluginName][$key] != Translate::clean($this->baseTranslations[$pluginName][$key])) {
+                    continue; // skip if base translation already contains encoded entities
+                }
+
                 // remove encoded entities
                 $decoded = Translate::clean($translation);
                 if ($translation != $decoded) {