Do not throw error if no language

Warxcell · Aug 4, 2017 · c0e2669 · c0e2669
1 parent 2c78d47
commit c0e2669
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/CurrentTranslationLoader.php b/src/CurrentTranslationLoader.php
@@ -55,9 +55,14 @@ public function initializeCurrentTranslation(TranslatableInterface $entity)
         $translationService = $this->container->get('object_bg.translation.service.translation');
         /** @var Language $currentLanguage */
         $currentLanguage = $translationService->getCurrentLanguage();
-        $success = $this->initializeTranslation($entity, $currentLanguage);
 
-        $locale = $currentLanguage->getLocale();
+        $locale = null;
+        $success = false;
+
+        if ($currentLanguage) {
+            $success = $this->initializeTranslation($entity, $currentLanguage);
+            $locale = $currentLanguage->getLocale();
+        }
 
         if ($success == false) {
             $locale = $this->initializeFallbackTranslation($entity);