MAGETWO-66557: Make CMS directive filtering error be more generic #5362

vrann · vrann · commit b6e20669fbd6 · 2017-03-22T10:57:54.000-07:00
- Merge Pull Request #5362 from erikhansen/magento2:feature/widget-error-message
diff --git a/app/code/Magento/Email/Model/Template/Filter.php b/app/code/Magento/Email/Model/Template/Filter.php
@@ -1018,7 +1018,7 @@ public function filter($value)
             if ($this->_appState->getMode() == \Magento\Framework\App\State::MODE_DEVELOPER) {
                 $value = sprintf(__('Error filtering template: %s'), $e->getMessage());
             } else {
-                $value = __("We're sorry, an error has occurred while generating this email.");
+                $value = __("We're sorry, an error has occurred while generating this content.");
             }
             $this->_logger->critical($e);
         }

Original file line number	Diff line number	Diff line change
`@@ -1018,7 +1018,7 @@ public function filter($value)`
`1018`	`1018`	`if ($this->_appState->getMode() == \Magento\Framework\App\State::MODE_DEVELOPER) {`
`1019`	`1019`	`$value = sprintf(__('Error filtering template: %s'), $e->getMessage());`
`1020`	`1020`	`} else {`
`1021`		`- $value = __("We're sorry, an error has occurred while generating this email.");`
	`1021`	`+ $value = __("We're sorry, an error has occurred while generating this content.");`
`1022`	`1022`	`}`
`1023`	`1023`	`$this->_logger->critical($e);`
`1024`	`1024`	`}`