If locale is null when creating a new instance use fallback.

vinkla · Oct 29, 2014 · 8972405 · 8972405
1 parent 78d5eb2
commit 8972405
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/src/Vinkla/Translator/TranslatorTrait.php b/src/Vinkla/Translator/TranslatorTrait.php
@@ -61,10 +61,8 @@ private function getTranslation($locale = null, $fallback = true)
 			$this->translatorInstance = new $this->translator();
 		}
 
-		$locale = $locale ?: $this->getLocale();
-
 		// Fetch the translation by their locale.
-		$translation = $this->getTranslationByLocale($locale);
+		$translation = $this->getTranslationByLocale($locale ?: $this->getLocale());
 
 		if ($translation)
 		{
@@ -79,7 +77,7 @@ private function getTranslation($locale = null, $fallback = true)
 
 		// If fallback is set to false, create a new instance.
 		return $this->newTranslatorInstance([
-			$this->getLocaleKey() => $locale
+			$this->getLocaleKey() => $this->getLocale() ?: $this->getFallback()
 		]);
 	}