fixed attribution replacement (#78)

toooni · damienalexandre · commit c38bf3ea8d4e · 2017-02-09T16:29:40.000+01:00
* only match chars until next &lt;/x-trans occurence

* match when used in special links

if a translation is used as a link (localization)`&lt;a href="email:*localizedEmail*"&gt;` the regex wouldn't match.

* added EditInPlace tests

* leave additional strings in attribute

* try to add encoding to DomDocument

* cs

* convert encoding
diff --git a/EventListener/EditInPlaceResponseListener.php b/EventListener/EditInPlaceResponseListener.php
@@ -74,7 +74,7 @@ public function onKernelResponse(FilterResponseEvent $event)
             $content = $event->getResponse()->getContent();
 
             // Clean the content for malformed tags in attributes or encoded tags
-            $content = preg_replace("@=\\s*[\"']\\s*(<x-trans.+<\\/x-trans>)\\s*[\"']@mi", "=\"🚫 Can't be translated here. 🚫\"", $content);
+            $content = preg_replace("@=\\s*[\"']\\s*(.[a-zA-Z]+:|)(<x-trans.+?(?=<\\/x-trans)<\\/x-trans>)\\s*[\"']@mi", "=\"$1🚫 Can't be translated here. 🚫\"", $content);
             $content = preg_replace('@&lt;x-trans.+data-key=&quot;([^&]+)&quot;.+&lt;\\/x-trans&gt;@mi', '🚫 $1 🚫', $content);
 
             $html = sprintf(
diff --git a/Tests/Functional/EditInPlaceTest.php b/Tests/Functional/EditInPlaceTest.php
@@ -42,12 +42,21 @@ public function testActivatedTest()
         self::assertSame(200, $response->getStatusCode());
         self::assertContains('<!-- TranslationBundle -->', $response->getContent());
 
-        $dom = new \DOMDocument();
-        @$dom->loadHTML($response->getContent());
+        $dom = new \DOMDocument('1.0', 'utf-8');
+        @$dom->loadHTML(mb_convert_encoding($response->getContent(), 'HTML-ENTITIES', 'UTF-8'));
         $xpath = new \DomXpath($dom);
 
+        // Check number of x-trans tags
         $xtrans = $xpath->query('//x-trans');
+        self::assertEquals(6, $xtrans->length);
 
-        self::assertEquals(5, $xtrans->length);
+        // Check attribute with prefix (href="mailto:...")
+        $emailTag = $dom->getElementById('email');
+        self::assertEquals('mailto:'.'🚫 Can\'t be translated here. 🚫', $emailTag->getAttribute('href'));
+        self::assertEquals('localized.email', $emailTag->textContent);
+
+        // Check attribute
+        $attributeDiv = $dom->getElementById('attribute-div');
+        self::assertEquals('🚫 Can\'t be translated here. 🚫', $attributeDiv->getAttribute('data-value'));
     }
 }
diff --git a/Tests/Functional/app/Resources/views/translated.html.twig b/Tests/Functional/app/Resources/views/translated.html.twig
@@ -6,8 +6,11 @@
 </head>
 <body>
     <h1>{{ 'translated.heading'|transchoice(12) }}</h1>
-    <p>{{ 'translated.paragraph0'|trans }}</p>
-    <p>{% trans %}translated.paragraph1{% endtrans %}</p>
-    <p>{% transchoice 21 %}translated.paragraph2{% endtranschoice %}</p>
+    <p>{{ 'translated.paragraph0'|trans }}</p><p>{% trans %}translated.paragraph1{% endtrans %}</p><!-- two translation in same html line -->
+    <p>
+        {% transchoice 21 %}translated.paragraph2{% endtranschoice %}
+        <a id="email" href="mailto:{{ 'localized.email'|trans }}">{{ 'localized.email'|trans }}</a><!-- translation inside attribute with additional content -->
+    </p>
+    <div id="attribute-div" data-value="{{ 'translated.attribute'|trans }}"></div> <!-- translation inside html attribute -->
 </body>
 </html>
