Fix translation escaping

X-Coder264 · X-Coder264 · commit 0df21418c458 · 2018-10-01T22:02:53.000+02:00
diff --git a/src/Illuminate/Translation/Translator.php b/src/Illuminate/Translation/Translator.php
@@ -264,6 +264,7 @@ protected function makeReplacements($line, array $replace)
         $replace = $this->sortReplacements($replace);
 
         foreach ($replace as $key => $value) {
+            $value = e($value);
             $line = str_replace(
                 [':'.$key, ':'.Str::upper($key), ':'.Str::ucfirst($key)],
                 [$value, Str::upper($value), Str::ucfirst($value)],
diff --git a/src/Illuminate/View/Compilers/Concerns/CompilesTranslations.php b/src/Illuminate/View/Compilers/Concerns/CompilesTranslations.php
@@ -18,7 +18,7 @@ protected function compileLang($expression)
             return "<?php \$__env->startTranslation{$expression}; ?>";
         }
 
-        return "<?php echo e(app('translator')->getFromJson{$expression}); ?>";
+        return "<?php echo app('translator')->getFromJson{$expression}; ?>";
     }
 
     /**
@@ -28,7 +28,7 @@ protected function compileLang($expression)
      */
     protected function compileEndlang()
     {
-        return '<?php echo e($__env->renderTranslation()); ?>';
+        return '<?php echo $__env->renderTranslation(); ?>';
     }
 
     /**
@@ -39,6 +39,6 @@ protected function compileEndlang()
      */
     protected function compileChoice($expression)
     {
-        return "<?php echo e(app('translator')->choice{$expression}); ?>";
+        return "<?php echo app('translator')->choice{$expression}; ?>";
     }
 }
diff --git a/tests/Translation/TranslationTranslatorTest.php b/tests/Translation/TranslationTranslatorTest.php
@@ -49,6 +49,20 @@ public function testGetMethodProperlyLoadsAndRetrievesItem()
         $this->assertEquals('foo', $t->get('foo::bar.foo'));
     }
 
+    public function testTransMethodProperlyLoadsAndRetrievesItemWithHTMLReplacements()
+    {
+        $t = new \Illuminate\Translation\Translator($this->getLoader(), 'en');
+        $t->getLoader()->shouldReceive('load')->once()->with('en', 'foo', '*')->andReturn(['bar' => 'breeze :foo']);
+        $this->assertSame('breeze &lt;p&gt;test&lt;/p&gt;', $t->trans('foo.bar', ['foo' => '<p>test</p>'], 'en'));
+    }
+
+    public function testTransMethodProperlyLoadsAndRetrievesItemWithHTMLInTheMessage()
+    {
+        $t = new \Illuminate\Translation\Translator($this->getLoader(), 'en');
+        $t->getLoader()->shouldReceive('load')->once()->with('en', 'foo', '*')->andReturn(['bar' => 'breeze <p>test</p>']);
+        $this->assertSame('breeze <p>test</p>', $t->trans('foo.bar', [], 'en'));
+    }
+
     public function testGetMethodProperlyLoadsAndRetrievesItemWithCapitalization()
     {
         $t = $this->getMockBuilder('Illuminate\Translation\Translator')->setMethods(null)->setConstructorArgs([$this->getLoader(), 'en'])->getMock();
diff --git a/tests/View/Blade/BladeExpressionTest.php b/tests/View/Blade/BladeExpressionTest.php
@@ -6,13 +6,13 @@ class BladeExpressionTest extends AbstractBladeTestCase
 {
     public function testExpressionsOnTheSameLine()
     {
-        $this->assertEquals('<?php echo e(app(\'translator\')->getFromJson(foo(bar(baz(qux(breeze())))))); ?> space () <?php echo e(app(\'translator\')->getFromJson(foo(bar))); ?>', $this->compiler->compileString('@lang(foo(bar(baz(qux(breeze()))))) space () @lang(foo(bar))'));
+        $this->assertEquals('<?php echo app(\'translator\')->getFromJson(foo(bar(baz(qux(breeze()))))); ?> space () <?php echo app(\'translator\')->getFromJson(foo(bar)); ?>', $this->compiler->compileString('@lang(foo(bar(baz(qux(breeze()))))) space () @lang(foo(bar))'));
     }
 
     public function testExpressionWithinHTML()
     {
         $this->assertEquals('<html <?php echo e($foo); ?>>', $this->compiler->compileString('<html {{ $foo }}>'));
         $this->assertEquals('<html<?php echo e($foo); ?>>', $this->compiler->compileString('<html{{ $foo }}>'));
-        $this->assertEquals('<html <?php echo e($foo); ?> <?php echo e(app(\'translator\')->getFromJson(\'foo\')); ?>>', $this->compiler->compileString('<html {{ $foo }} @lang(\'foo\')>'));
+        $this->assertEquals('<html <?php echo e($foo); ?> <?php echo app(\'translator\')->getFromJson(\'foo\'); ?>>', $this->compiler->compileString('<html {{ $foo }} @lang(\'foo\')>'));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ protected function compileLang($expression)`
`18`	`18`	`return "<?php \$__env->startTranslation{$expression}; ?>";`
`19`	`19`	`}`
`20`	`20`
`21`		`- return "<?php echo e(app('translator')->getFromJson{$expression}); ?>";`
	`21`	`+ return "<?php echo app('translator')->getFromJson{$expression}; ?>";`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`/**`
`@@ -28,7 +28,7 @@ protected function compileLang($expression)`
`28`	`28`	`*/`
`29`	`29`	`protected function compileEndlang()`
`30`	`30`	`{`
`31`		`- return '<?php echo e($__env->renderTranslation()); ?>';`
	`31`	`+ return '<?php echo $__env->renderTranslation(); ?>';`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`/**`
`@@ -39,6 +39,6 @@ protected function compileEndlang()`
`39`	`39`	`*/`
`40`	`40`	`protected function compileChoice($expression)`
`41`	`41`	`{`
`42`		`- return "<?php echo e(app('translator')->choice{$expression}); ?>";`
	`42`	`+ return "<?php echo app('translator')->choice{$expression}; ?>";`
`43`	`43`	`}`
`44`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,13 +6,13 @@ class BladeExpressionTest extends AbstractBladeTestCase`
`6`	`6`	`{`
`7`	`7`	`public function testExpressionsOnTheSameLine()`
`8`	`8`	`{`
`9`		`- $this->assertEquals('<?php echo e(app(\'translator\')->getFromJson(foo(bar(baz(qux(breeze())))))); ?> space () <?php echo e(app(\'translator\')->getFromJson(foo(bar))); ?>', $this->compiler->compileString('@lang(foo(bar(baz(qux(breeze()))))) space () @lang(foo(bar))'));`
	`9`	`+ $this->assertEquals('<?php echo app(\'translator\')->getFromJson(foo(bar(baz(qux(breeze()))))); ?> space () <?php echo app(\'translator\')->getFromJson(foo(bar)); ?>', $this->compiler->compileString('@lang(foo(bar(baz(qux(breeze()))))) space () @lang(foo(bar))'));`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`public function testExpressionWithinHTML()`
`13`	`13`	`{`
`14`	`14`	`$this->assertEquals('<html <?php echo e($foo); ?>>', $this->compiler->compileString('<html {{ $foo }}>'));`
`15`	`15`	`$this->assertEquals('<html<?php echo e($foo); ?>>', $this->compiler->compileString('<html{{ $foo }}>'));`
`16`		`- $this->assertEquals('<html <?php echo e($foo); ?> <?php echo e(app(\'translator\')->getFromJson(\'foo\')); ?>>', $this->compiler->compileString('<html {{ $foo }} @lang(\'foo\')>'));`
	`16`	`+ $this->assertEquals('<html <?php echo e($foo); ?> <?php echo app(\'translator\')->getFromJson(\'foo\'); ?>>', $this->compiler->compileString('<html {{ $foo }} @lang(\'foo\')>'));`
`17`	`17`	`}`
`18`	`18`	`}`