Merge remote-tracking branch 'origin/MAGETWO-53119' into BUGS

Author: slavvka

lib/internal/Magento/Framework/Phrase/Renderer/Translate.php

@@ -60,6 +60,6 @@ public function render(array $source, array $arguments)
             throw $e;
         }
 
-        return array_key_exists($text, $data) ? $data[$text] : $text;
+        return array_key_exists($text, $data) ? $data[$text] : end($source);
     }
 }

lib/internal/Magento/Framework/Phrase/Test/Unit/Renderer/TranslateTest.php

@@ -60,6 +60,15 @@ public function testRenderTextWithSingleQuotes()
         $this->assertEquals($translate, $this->_renderer->render([$translatedTextInput], []));
     }
 
+    public function testRenderWithoutTranslation()
+    {
+        $translate = "Text with quote \'";
+        $this->_translator->expects($this->once())
+            ->method('getData')
+            ->will($this->returnValue([]));
+        $this->assertEquals($translate, $this->_renderer->render([$translate], []));
+    }
+
     public function testRenderTextWithDoubleQuotes()
     {
         $translatedTextInDictionary = "That\"s translated text";