Merge pull request #20 from AlexLombry/1.0

Send null instead of fallback locale in case of user doesn't have fallback set.
vinkla · Mar 2, 2015 · 0f6f0b0 · 0f6f0b0
2 parents 9796b39 + 1e4049d
commit 0f6f0b0
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/src/Vinkla/Translator/TranslatorTrait.php b/src/Vinkla/Translator/TranslatorTrait.php
@@ -201,13 +201,9 @@ private function getTranslationByLocaleId($localeId)
 	 */
 	private function getLocaleId($locale = null)
 	{
-		$existLocale = $this->getLocale($locale ?: App::getLocale());
-
-		if (is_null($existLocale)) {
-			return $this->getFallbackLocaleId();
-		}
-
-		return $this->getLocale($locale ?: App::getLocale())->id;
+		$exist = $this->getLocale($locale ?: App::getLocale());
+
+		return $exist ? $exist->id : null;
 	}
 
 	/**