MAGETWO-34955: [GITHUB]Email message containing non English character is displayed incorrectly on the receiver. #1086

fixed encoding and template processing

Author: Serhiy Shkolyarenko

app/code/Magento/Email/Model/Template.php

@@ -319,6 +319,16 @@ public function loadDefault($templateId)
         $modulesDirectory = $this->_filesystem->getDirectoryRead(DirectoryList::MODULES);
         $templateText = $modulesDirectory->readFile($modulesDirectory->getRelativePath($templateFile));
 
+        /**
+         * trim copyright message for text templates
+         */
+        if ('html' != $templateType
+            && preg_match('/^<!--[\w\W]+?-->/m', $templateText, $matches)
+            && strpos($matches[0], 'Copyright') > 0
+        ) {
+            $templateText = str_replace($matches[0], '', $templateText);
+        }
+
         if (preg_match('/<!--@subject\s*(.*?)\s*@-->/u', $templateText, $matches)) {
             $this->setTemplateSubject($matches[1]);
             $templateText = str_replace($matches[0], '', $templateText);
@@ -335,9 +345,9 @@ public function loadDefault($templateId)
         }
 
         /**
-         * Remove comment lines
+         * Remove comment lines and extra spaces
          */
-        $templateText = preg_replace('#\{\*.*\*\}#suU', '', $templateText);
+        $templateText = trim(preg_replace('#\{\*.*\*\}#suU', '', $templateText));
 
         $this->setTemplateText($templateText);
         $this->setId($templateId);

lib/internal/Magento/Framework/Mail/Message.php

@@ -9,6 +9,14 @@
 
 class Message extends \Zend_Mail implements MessageInterface
 {
+    /**
+     * @param string $charset
+     */
+    public function __construct($charset = 'utf-8')
+    {
+        parent::__construct($charset);
+    }
+
     /**
      * Message type
      *