From 93a6c6470781a4d3614faad5a46812baecdca533 Mon Sep 17 00:00:00 2001
From: Bozhidar Hristov <b.hristov@vm5.eu>
Date: Wed, 21 Dec 2016 12:17:06 +0200
Subject: [PATCH] Fix bug with fallback locales

---
 src/TranslationService.php | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/TranslationService.php b/src/TranslationService.php
index d7528b6..ed70417 100644
--- a/src/TranslationService.php
+++ b/src/TranslationService.php
@@ -72,7 +72,7 @@ public function __construct(Container $Container)
         $this->typeGuesser = $Container->get('form.registry')->getTypeGuesser();
         $this->managerRegistry = $Container->get('doctrine');
         $this->annotationReader = $Container->get('annotation_reader');
-        $this->translator = $Container->get('translator');
+        $this->translator = $Container->get('translator.default');
         $this->request = $Container->get('request');
         $this->propertyAccess = PropertyAccess::createPropertyAccessor();
     }
@@ -84,9 +84,9 @@ public function getTranslation($entity, $language)
         $translationService = $this;
         $PropertyAccess = $this->propertyAccess;
         $Translation = $Translations->filter(function($item) use ($translationService, $language, $PropertyAccess) {
-                    $TranslationLanguage = $PropertyAccess->getValue($item, $translationService->getLanguageField($item));
-                    return $language instanceof Language ? ($TranslationLanguage == $language) : ($TranslationLanguage->getLocale() == $language);
-                })->first();
+                $TranslationLanguage = $PropertyAccess->getValue($item, $translationService->getLanguageField($item));
+                return $language instanceof Language ? ($TranslationLanguage == $language) : ($TranslationLanguage->getLocale() == $language);
+            })->first();
 
         return $Translation;
     }
@@ -112,8 +112,8 @@ public function getCurrentLanguage()
             $CurrentLocale = $this->translator->getLocale();
         }
         return $this->getLanguages()->filter(function(Language $Lang) use ($CurrentLocale) {
-                    return $Lang->getLocale() == $CurrentLocale;
-                })->first();
+                return $Lang->getLocale() == $CurrentLocale;
+            })->first();
     }
 
     public function getFallbackLocales()
@@ -225,8 +225,8 @@ public function getCurrentTranslationField($translatableClass)
     public function getLanguageByLocale($locale)
     {
         return $this->getLanguages()->filter(function(Language $Lang) use ($locale) {
-                    return $Lang->getLocale() == $locale;
-                })->first();
+                return $Lang->getLocale() == $locale;
+            })->first();
     }
 
     /**
@@ -337,5 +337,4 @@ public function guessMissingFieldOptions($guesser, $class, $property, $options)
 
         return $options;
     }
-
 }