Merge branch 'MC-19238' of https://github.com/magento-tango/magento2ce into PR-2019-08-22

Author: Oleksandr Iegorov

app/code/Magento/Sales/Model/Rss/OrderStatus.php

@@ -217,11 +217,12 @@ protected function getEntries()
                 if ($type && $type != 'order') {
                     $urlAppend = $type;
                 }
-                $type = __(ucwords($type));
-                $title = __('Details for %1 #%2', $type, $result['increment_id']);
-                $description = '<p>' . __('Notified Date: %1', $this->localeDate->formatDate($result['created_at']))
+                $type = __(ucwords($type))->render();
+                $title = __('Details for %1 #%2', $type, $result['increment_id'])->render();
+                $description = '<p>'
+                    . __('Notified Date: %1', $this->localeDate->formatDate($result['created_at']))->render()
                     . '<br/>'
-                    . __('Comment: %1<br/>', $result['comment']) . '</p>';
+                    . __('Comment: %1<br/>', $result['comment'])->render() . '</p>';
                 $url = $this->urlBuilder->getUrl(
                     'sales/order/' . $urlAppend,
                     ['order_id' => $this->order->getId()]
@@ -233,10 +234,10 @@ protected function getEntries()
             'Order #%1 created at %2',
             $this->order->getIncrementId(),
             $this->localeDate->formatDate($this->order->getCreatedAt())
-        );
+        )->render();
         $url = $this->urlBuilder->getUrl('sales/order/view', ['order_id' => $this->order->getId()]);
-        $description = '<p>' . __('Current Status: %1<br/>', $this->order->getStatusLabel()) .
-            __('Total: %1<br/>', $this->order->formatPrice($this->order->getGrandTotal())) . '</p>';
+        $description = '<p>' . __('Current Status: %1<br/>', $this->order->getStatusLabel())->render() .
+            __('Total: %1<br/>', $this->order->formatPrice($this->order->getGrandTotal()))->render() . '</p>';
 
         $entries[] = ['title' => $title, 'link' => $url, 'description' => $description];
 
@@ -250,7 +251,7 @@ protected function getEntries()
      */
     protected function getHeader()
     {
-        $title = __('Order # %1 Notification(s)', $this->order->getIncrementId());
+        $title = __('Order # %1 Notification(s)', $this->order->getIncrementId())->render();
         $newUrl = $this->urlBuilder->getUrl('sales/order/view', ['order_id' => $this->order->getId()]);
 
         return ['title' => $title, 'description' => $title, 'link' => $newUrl, 'charset' => 'UTF-8'];