From e626ab32a4afec90f80641fbcd00e6b79d15cd3a Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Thu, 4 Oct 2018 09:41:04 -0500 Subject: [PATCH] revert --- src/Illuminate/Translation/Translator.php | 2 +- tests/Translation/TranslationTranslatorTest.php | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Illuminate/Translation/Translator.php b/src/Illuminate/Translation/Translator.php index 2d33af1757ef..1c0970bbbdd7 100755 --- a/src/Illuminate/Translation/Translator.php +++ b/src/Illuminate/Translation/Translator.php @@ -265,7 +265,7 @@ protected function makeReplacements($line, array $replace) $replace = $this->sortReplacements($replace); foreach ($replace as $key => $value) { - $value = $value instanceof HtmlString ? $value->toHtml() : e($value); + // $value = $value instanceof HtmlString ? $value->toHtml() : e($value); $line = str_replace( [':'.$key, ':'.Str::upper($key), ':'.Str::ucfirst($key)], diff --git a/tests/Translation/TranslationTranslatorTest.php b/tests/Translation/TranslationTranslatorTest.php index 7f242dbecac5..3f3bf9621efa 100755 --- a/tests/Translation/TranslationTranslatorTest.php +++ b/tests/Translation/TranslationTranslatorTest.php @@ -53,12 +53,12 @@ public function testGetMethodProperlyLoadsAndRetrievesItem() $this->assertEquals('foo', $t->get('foo::bar.foo')); } - public function testTransMethodProperlyLoadsAndRetrievesItemWithHTMLReplacements() - { - $t = new Translator($this->getLoader(), 'en'); - $t->getLoader()->shouldReceive('load')->once()->with('en', 'foo', '*')->andReturn(['bar' => 'breeze :foo']); - $this->assertSame('breeze <p>test</p>', $t->trans('foo.bar', ['foo' => '

test

'], 'en')); - } + // public function testTransMethodProperlyLoadsAndRetrievesItemWithHTMLReplacements() + // { + // $t = new Translator($this->getLoader(), 'en'); + // $t->getLoader()->shouldReceive('load')->once()->with('en', 'foo', '*')->andReturn(['bar' => 'breeze :foo']); + // $this->assertSame('breeze <p>test</p>', $t->trans('foo.bar', ['foo' => '

test

'], 'en')); + // } public function testTransMethodProperlyLoadsAndRetrievesItemWithHTMLInTheMessage() {