Fixed error messages in NotificationEventSubscriber

68publishers · Apr 30, 2022 · 0918085 · 0918085
1 parent b119a9a
commit 0918085
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/EventSubscriber/NotificationEventSubscriber.php b/src/EventSubscriber/NotificationEventSubscriber.php
@@ -256,8 +256,11 @@ private function createErrorNotificationBuilder(string $messageBase, ExceptionIn
 	{
 		$notifier = $this->getNotifier();
 
-		if ($e instanceof TranslatableException) {
-			return $notifier->error($messageBase . '.' . $e->getMessage(), $e->getArgs());
+		if ($e instanceof TranslatableException || $e->getPrevious() instanceof TranslatableException) {
+			$translatableException = $e instanceof TranslatableException ? $e : $e->getPrevious();
+			assert($translatableException instanceof TranslatableException);
+
+			return $notifier->error($messageBase . '.' . $translatableException->getMessage(), $translatableException->getArgs());
 		}
 
 		return $notifier->error($messageBase . '.default', [