Fixed non translatable characters replace

ezsystems · Jul 18, 2018 · a1b6a04 · a1b6a04
1 parent 33f47c7
commit a1b6a04
Showing 1 changed file with 33 additions and 13 deletions.
diff --git a/lib/Encoder.php b/lib/Encoder.php
@@ -125,7 +125,7 @@ public function __construct(ContentTypeService $contentTypeService, ConfigResolv
             'ez_platform_automated_translation'
         );
 
-        $this->nonTranslatableTags              = ['ezembed'] + $tags;
+        $this->nonTranslatableTags              = ['ezvalue', 'ezconfig', 'ezembed'] + $tags;
         $this->nonTranslatableCharactersHashMap = ["\n" => 'XXXEOLXXX'] + $chars;
         $this->nonValidAttributeTags            = ['title'] + $attributes;
     }
@@ -211,12 +211,7 @@ private function richTextEncode(RichTextValue $value): string
     {
         $xmlString = (string) $value;
         $xmlString = substr($xmlString, strpos($xmlString, '>') + 1);
-        $xmlString = str_replace(
-            array_keys($this->nonTranslatableCharactersHashMap),
-            array_values($this->nonTranslatableCharactersHashMap),
-            $xmlString
-        );
-
+        $xmlString = $this->encodeNonTranslatableCharacters($xmlString);
         foreach ($this->nonTranslatableTags as $tag) {
             $xmlString = preg_replace_callback(
                 '#<' . $tag . '(.[^>]*)>(.*)</' . $tag . '>#Uuim',
@@ -253,12 +248,8 @@ function ($matches) use ($tag) {
      */
     private function richTextDecode(string $value): string
     {
-        $value = str_replace(
-            array_values($this->nonTranslatableCharactersHashMap),
-            array_keys($this->nonTranslatableCharactersHashMap),
-            $value
-        );
-        foreach ($this->nonTranslatableTags as $tag) {
+        $value = $this->decodeNonTranslatableCharacters($value);
+        foreach (array_reverse($this->nonTranslatableTags) as $tag) {
             $value = preg_replace_callback(
                 '#<' . $tag . '>(.*)</' . $tag . '>#Uuim',
                 function ($matches) {
@@ -277,7 +268,36 @@ function ($matches) {
             );
             $value = str_replace("</fake{$tag}>", "</{$tag}>", $value);
         }
+        $value = $this->decodeNonTranslatableCharacters($value);
 
         return $value;
     }
+
+    /**
+     * @param string $value
+     *
+     * @return string
+     */
+    private function encodeNonTranslatableCharacters(string $value): string
+    {
+        return str_replace(
+            array_keys($this->nonTranslatableCharactersHashMap),
+            array_values($this->nonTranslatableCharactersHashMap),
+            $value
+        );
+    }
+
+    /**
+     * @param string $value
+     *
+     * @return string
+     */
+    private function decodeNonTranslatableCharacters(string $value): string
+    {
+        return str_replace(
+            array_values($this->nonTranslatableCharactersHashMap),
+            array_keys($this->nonTranslatableCharactersHashMap),
+            $value
+        );
+    }
 }