Merge remote-tracking branch 'arcticfoxes/MAGETWO-98914' into 2.1.18-develop-pr

Author: Joan He

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

@@ -837,7 +837,7 @@ public function cssDirective($construction)
             return $css;
         } else {
             // Return CSS comment for debugging purposes
-            return '/* ' . sprintf(__('Contents of %s could not be loaded or is empty'), $file) . ' */';
+            return '/* ' . __('Contents of the specified CSS file could not be loaded or is empty') . ' */';
         }
     }
 

dev/tests/integration/testsuite/Magento/Email/Model/Template/FilterTest.php

@@ -266,7 +266,7 @@ public function cssDirectiveDataProvider()
             'Empty or missing file' => [
                 TemplateTypesInterface::TYPE_HTML,
                 'file="css/non-existent-file.css"',
-                '/* Contents of css/non-existent-file.css could not be loaded or is empty */'
+                '/* Contents of the specified CSS file could not be loaded or is empty */'
             ],
             'File with compilation error results in error message' => [
                 TemplateTypesInterface::TYPE_HTML,