From cda54905d9b7e11ca10e0b17ed6828c58f4d20c6 Mon Sep 17 00:00:00 2001
From: Tobias Nyholm <tobias.nyholm@gmail.com>
Date: Tue, 22 May 2018 09:15:18 +0200
Subject: [PATCH] Make sure we got a locale before we start to translate

---
 Translator/FallbackTranslator.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Translator/FallbackTranslator.php b/Translator/FallbackTranslator.php
index a8a6446d..69da25ef 100644
--- a/Translator/FallbackTranslator.php
+++ b/Translator/FallbackTranslator.php
@@ -65,7 +65,7 @@ public function trans($id, array $parameters = [], $domain = null, $locale = nul
         }
 
         $locale = $catalogue->getLocale();
-        if ($locale === $this->defaultLocale) {
+        if (empty($locale) || $locale === $this->defaultLocale) {
             // we cant do anything...
             return $id;
         }